Skip to content

Commit

Permalink
oauth2: fix typo
Browse files Browse the repository at this point in the history 
Signed-off-by: Maxime Song <me@cppdo.com>
  • Loading branch information
@maximesong @arekkas
maximesong authored and arekkas committed Mar 30, 2017
1 parent 22e33c4 commit 4827507
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion cmd/server/handler_oauth2_factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func injectFositeStore(c *config.Config, clients client.Manager) {
con.CreateTableIfNotExists("hydra_oauth2_access_token")
con.CreateTableIfNotExists("hydra_oauth2_implicit")
con.CreateTableIfNotExists("hydra_oauth2_refresh_token")
m := &oauth2.FositeRehinkDBStore{
m := &oauth2.FositeRethinkDBStore{
Session: con.GetSession(),
Manager: clients,
AuthorizeCodesTable: r.Table("hydra_oauth2_authorize_code"),
Expand Down
46 changes: 23 additions & 23 deletions oauth2/fosite_store_rethinkdb.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (

type RDBItems map[string]*RdbSchema

type FositeRehinkDBStore struct {
type FositeRethinkDBStore struct {
Session *r.Session
sync.RWMutex

Expand Down Expand Up @@ -64,7 +64,7 @@ func requestFromRDB(s *RdbSchema, proto fosite.Session) (*fosite.Request, error)
return d, nil
}

func (m *FositeRehinkDBStore) ColdStart() error {
func (m *FositeRethinkDBStore) ColdStart() error {
if err := m.AccessTokens.coldStart(m.Session, &m.RWMutex, m.AccessTokensTable); err != nil {
return err
} else if err := m.AuthorizeCodes.coldStart(m.Session, &m.RWMutex, m.AuthorizeCodesTable); err != nil {
Expand All @@ -77,7 +77,7 @@ func (m *FositeRehinkDBStore) ColdStart() error {
return nil
}

func (s *FositeRehinkDBStore) publishInsert(table r.Term, id string, requester fosite.Requester) error {
func (s *FositeRethinkDBStore) publishInsert(table r.Term, id string, requester fosite.Requester) error {
sess, err := json.Marshal(requester.GetSession())
if err != nil {
return errors.WithStack(err)
Expand All @@ -98,14 +98,14 @@ func (s *FositeRehinkDBStore) publishInsert(table r.Term, id string, requester f
return nil
}

func (s *FositeRehinkDBStore) publishDelete(table r.Term, id string) error {
func (s *FositeRethinkDBStore) publishDelete(table r.Term, id string) error {
if _, err := table.Get(id).Delete().RunWrite(s.Session); err != nil {
return errors.WithStack(err)
}
return nil
}

func (s *FositeRehinkDBStore) waitFor(i RDBItems, id string) error {
func (s *FositeRethinkDBStore) waitFor(i RDBItems, id string) error {
c := make(chan bool)

go func() {
Expand Down Expand Up @@ -135,14 +135,14 @@ func (s *FositeRehinkDBStore) waitFor(i RDBItems, id string) error {
}
}

func (s *FositeRehinkDBStore) CreateOpenIDConnectSession(_ context.Context, authorizeCode string, requester fosite.Requester) error {
func (s *FositeRethinkDBStore) CreateOpenIDConnectSession(_ context.Context, authorizeCode string, requester fosite.Requester) error {
if err := s.publishInsert(s.IDSessionsTable, authorizeCode, requester); err != nil {
return err
}
return s.waitFor(s.IDSessions, authorizeCode)
}

func (s *FositeRehinkDBStore) GetOpenIDConnectSession(_ context.Context, authorizeCode string, requester fosite.Requester) (fosite.Requester, error) {
func (s *FositeRethinkDBStore) GetOpenIDConnectSession(_ context.Context, authorizeCode string, requester fosite.Requester) (fosite.Requester, error) {
s.RLock()
defer s.RUnlock()
cl, ok := s.IDSessions[authorizeCode]
Expand All @@ -152,18 +152,18 @@ func (s *FositeRehinkDBStore) GetOpenIDConnectSession(_ context.Context, authori
return requestFromRDB(cl, requester.GetSession())
}

func (s *FositeRehinkDBStore) DeleteOpenIDConnectSession(_ context.Context, authorizeCode string) error {
func (s *FositeRethinkDBStore) DeleteOpenIDConnectSession(_ context.Context, authorizeCode string) error {
return s.publishDelete(s.IDSessionsTable, authorizeCode)
}

func (s *FositeRehinkDBStore) CreateAuthorizeCodeSession(_ context.Context, code string, requester fosite.Requester) error {
func (s *FositeRethinkDBStore) CreateAuthorizeCodeSession(_ context.Context, code string, requester fosite.Requester) error {
if err := s.publishInsert(s.AuthorizeCodesTable, code, requester); err != nil {
return err
}
return s.waitFor(s.AuthorizeCodes, code)
}

func (s *FositeRehinkDBStore) GetAuthorizeCodeSession(_ context.Context, code string, sess fosite.Session) (fosite.Requester, error) {
func (s *FositeRethinkDBStore) GetAuthorizeCodeSession(_ context.Context, code string, sess fosite.Session) (fosite.Requester, error) {
s.RLock()
defer s.RUnlock()
rel, ok := s.AuthorizeCodes[code]
Expand All @@ -174,18 +174,18 @@ func (s *FositeRehinkDBStore) GetAuthorizeCodeSession(_ context.Context, code st
return requestFromRDB(rel, sess)
}

func (s *FositeRehinkDBStore) DeleteAuthorizeCodeSession(_ context.Context, code string) error {
func (s *FositeRethinkDBStore) DeleteAuthorizeCodeSession(_ context.Context, code string) error {
return s.publishDelete(s.AuthorizeCodesTable, code)
}

func (s *FositeRehinkDBStore) CreateAccessTokenSession(_ context.Context, signature string, requester fosite.Requester) error {
func (s *FositeRethinkDBStore) CreateAccessTokenSession(_ context.Context, signature string, requester fosite.Requester) error {
if err := s.publishInsert(s.AccessTokensTable, signature, requester); err != nil {
return err
}
return s.waitFor(s.AccessTokens, signature)
}

func (s *FositeRehinkDBStore) GetAccessTokenSession(_ context.Context, signature string, sess fosite.Session) (fosite.Requester, error) {
func (s *FositeRethinkDBStore) GetAccessTokenSession(_ context.Context, signature string, sess fosite.Session) (fosite.Requester, error) {
s.RLock()
defer s.RUnlock()
rel, ok := s.AccessTokens[signature]
Expand All @@ -196,18 +196,18 @@ func (s *FositeRehinkDBStore) GetAccessTokenSession(_ context.Context, signature
return requestFromRDB(rel, sess)
}

func (s *FositeRehinkDBStore) DeleteAccessTokenSession(_ context.Context, signature string) error {
func (s *FositeRethinkDBStore) DeleteAccessTokenSession(_ context.Context, signature string) error {
return s.publishDelete(s.AccessTokensTable, signature)
}

func (s *FositeRehinkDBStore) CreateRefreshTokenSession(_ context.Context, signature string, requester fosite.Requester) error {
func (s *FositeRethinkDBStore) CreateRefreshTokenSession(_ context.Context, signature string, requester fosite.Requester) error {
if err := s.publishInsert(s.RefreshTokensTable, signature, requester); err != nil {
return err
}
return s.waitFor(s.RefreshTokens, signature)
}

func (s *FositeRehinkDBStore) GetRefreshTokenSession(_ context.Context, signature string, sess fosite.Session) (fosite.Requester, error) {
func (s *FositeRethinkDBStore) GetRefreshTokenSession(_ context.Context, signature string, sess fosite.Session) (fosite.Requester, error) {
s.RLock()
defer s.RUnlock()
rel, ok := s.RefreshTokens[signature]
Expand All @@ -218,15 +218,15 @@ func (s *FositeRehinkDBStore) GetRefreshTokenSession(_ context.Context, signatur
return requestFromRDB(rel, sess)
}

func (s *FositeRehinkDBStore) DeleteRefreshTokenSession(_ context.Context, signature string) error {
func (s *FositeRethinkDBStore) DeleteRefreshTokenSession(_ context.Context, signature string) error {
return s.publishDelete(s.RefreshTokensTable, signature)
}

func (s *FositeRehinkDBStore) CreateImplicitAccessTokenSession(ctx context.Context, code string, req fosite.Requester) error {
func (s *FositeRethinkDBStore) CreateImplicitAccessTokenSession(ctx context.Context, code string, req fosite.Requester) error {
return s.CreateAccessTokenSession(ctx, code, req)
}

func (s *FositeRehinkDBStore) PersistAuthorizeCodeGrantSession(ctx context.Context, authorizeCode, accessSignature, refreshSignature string, request fosite.Requester) error {
func (s *FositeRethinkDBStore) PersistAuthorizeCodeGrantSession(ctx context.Context, authorizeCode, accessSignature, refreshSignature string, request fosite.Requester) error {
if err := s.DeleteAuthorizeCodeSession(ctx, authorizeCode); err != nil {
return err
} else if err := s.CreateAccessTokenSession(ctx, accessSignature, request); err != nil {
Expand All @@ -244,7 +244,7 @@ func (s *FositeRehinkDBStore) PersistAuthorizeCodeGrantSession(ctx context.Conte
return nil
}

func (s *FositeRehinkDBStore) PersistRefreshTokenGrantSession(ctx context.Context, originalRefreshSignature, accessSignature, refreshSignature string, request fosite.Requester) error {
func (s *FositeRethinkDBStore) PersistRefreshTokenGrantSession(ctx context.Context, originalRefreshSignature, accessSignature, refreshSignature string, request fosite.Requester) error {
if err := s.DeleteRefreshTokenSession(ctx, originalRefreshSignature); err != nil {
return err
} else if err := s.CreateAccessTokenSession(ctx, accessSignature, request); err != nil {
Expand All @@ -256,7 +256,7 @@ func (s *FositeRehinkDBStore) PersistRefreshTokenGrantSession(ctx context.Contex
return nil
}

func (m *FositeRehinkDBStore) Watch(ctx context.Context) {
func (m *FositeRethinkDBStore) Watch(ctx context.Context) {
m.AccessTokens.watch(ctx, m.Session, &m.RWMutex, m.AccessTokensTable)
m.AuthorizeCodes.watch(ctx, m.Session, &m.RWMutex, m.AuthorizeCodesTable)
m.IDSessions.watch(ctx, m.Session, &m.RWMutex, m.IDSessionsTable)
Expand Down Expand Up @@ -318,7 +318,7 @@ func (items RDBItems) watch(ctx context.Context, sess *r.Session, lock *sync.RWM
})
}

func (s *FositeRehinkDBStore) RevokeRefreshToken(ctx context.Context, id string) error {
func (s *FositeRethinkDBStore) RevokeRefreshToken(ctx context.Context, id string) error {
var found bool
for sig, token := range s.RefreshTokens {
if token.RequestID == id {
Expand All @@ -334,7 +334,7 @@ func (s *FositeRehinkDBStore) RevokeRefreshToken(ctx context.Context, id string)
return nil
}

func (s *FositeRehinkDBStore) RevokeAccessToken(ctx context.Context, id string) error {
func (s *FositeRethinkDBStore) RevokeAccessToken(ctx context.Context, id string) error {
var found bool
for sig, token := range s.AccessTokens {
if token.RequestID == id {
Expand Down
4 changes: 2 additions & 2 deletions oauth2/fosite_store_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
r "gopkg.in/dancannon/gorethink.v2"
)

var rethinkManager *FositeRehinkDBStore
var rethinkManager *FositeRethinkDBStore
var clientManagers = map[string]pkg.FositeStorer{}
var clientManager = &client.MemoryManager{
Clients: map[string]client.Client{"foobar": {ID: "foobar"}},
Expand Down Expand Up @@ -60,7 +60,7 @@ func connectToPG() {
func connectToRethinkDB() {
var session = integration.ConnectToRethinkDB("hydra", "hydra_authorize_code", "hydra_id_sessions", "hydra_access_token", "hydra_refresh_token")

rethinkManager = &FositeRehinkDBStore{
rethinkManager = &FositeRethinkDBStore{
Session: session,
AuthorizeCodesTable: r.Table("hydra_authorize_code"),
IDSessionsTable: r.Table("hydra_id_sessions"),
Expand Down

0 comments on commit 4827507

Please sign in to comment.