go/scs
1
0
Fork 0
mirror of https://github.com/alexedwards/scs.git synced 2025-07-13 01:00:17 +02:00
Code Issues Releases Activity

Merge pull request #120 from joesonw/master

Browse Source 
allow pass context.Context to Store methods without breaking changes
This commit is contained in:
Alex Edwards
2021-11-22 10:21:25 +01:00
committed by GitHub
parent 8ed4f471bf a138e2cc42
commit 0a88ba0710
1 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
data.go
View File

@ -59,7 +59,7 @@ func (s *SessionManager) Load(ctx context.Context, token string) (context.Contex
return s.addSessionDataToContext(ctx, newSessionData(s.Lifetime)), nil return s.addSessionDataToContext(ctx, newSessionData(s.Lifetime)), nil
} }
b, found, err := s.Store.Find(token) b, found, err := s.doStoreFind(ctx, token)
if err != nil { if err != nil {
return nil, err return nil, err
} else if !found { } else if !found {
@ -115,7 +115,7 @@ func (s *SessionManager) Commit(ctx context.Context) (string, time.Time, error)
} }
} }
if err := s.Store.Commit(sd.token, b, expiry); err != nil { if err := s.doStoreCommit(ctx, sd.token, b, expiry); err != nil {
return "", time.Time{}, err return "", time.Time{}, err
} }
@ -131,7 +131,7 @@ func (s *SessionManager) Destroy(ctx context.Context) error {
sd.mu.Lock() sd.mu.Lock()
defer sd.mu.Unlock() defer sd.mu.Unlock()
err := s.Store.Delete(sd.token) err := s.doStoreDelete(ctx, sd.token)
if err != nil { if err != nil {
return err return err
} }
@ -284,7 +284,7 @@ func (s *SessionManager) RenewToken(ctx context.Context) error {
sd.mu.Lock() sd.mu.Lock()
defer sd.mu.Unlock() defer sd.mu.Unlock()
err := s.Store.Delete(sd.token) err := s.doStoreDelete(ctx, sd.token)
if err != nil { if err != nil {
return err return err
} }
@ -590,3 +590,33 @@ func generateContextKey() contextKey {
atomic.AddUint64(&contextKeyID, 1) atomic.AddUint64(&contextKeyID, 1)
return contextKey(fmt.Sprintf("session.%d", contextKeyID)) return contextKey(fmt.Sprintf("session.%d", contextKeyID))
} }
func (s *SessionManager) doStoreDelete(ctx context.Context, token string) (err error) {
c, ok := s.Store.(interface {
DeleteCtx(context.Context, string) error
})
if ok {
return c.DeleteCtx(ctx, token)
}
return s.Store.Delete(token)
}
func (s *SessionManager) doStoreFind(ctx context.Context, token string) (b []byte, found bool, err error) {
c, ok := s.Store.(interface {
FindCtx(context.Context, string) ([]byte, bool, error)
})
if ok {
return c.FindCtx(ctx, token)
}
return s.Store.Find(token)
}
func (s *SessionManager) doStoreCommit(ctx context.Context, token string, b []byte, expiry time.Time) (err error) {
c, ok := s.Store.(interface {
CommitCtx(context.Context, string, []byte, time.Time) error
})
if ok {
return c.CommitCtx(ctx, token, b, expiry)
}
return s.Store.Commit(token, b, expiry)
}