Skip to content

Commit 4827507

Browse files
maximesongarekkas
maximesong
authored and
arekkas
committed
oauth2: fix typo
Signed-off-by: Maxime Song <me@cppdo.com>
1 parent 22e33c4 commit 4827507

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

‎cmd/server/handler_oauth2_factory.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func injectFositeStore(c *config.Config, clients client.Manager) {
5050
con.CreateTableIfNotExists("hydra_oauth2_access_token")
5151
con.CreateTableIfNotExists("hydra_oauth2_implicit")
5252
con.CreateTableIfNotExists("hydra_oauth2_refresh_token")
53-
m := &oauth2.FositeRehinkDBStore{
53+
m := &oauth2.FositeRethinkDBStore{
5454
Session: con.GetSession(),
5555
Manager: clients,
5656
AuthorizeCodesTable: r.Table("hydra_oauth2_authorize_code"),

‎oauth2/fosite_store_rethinkdb.go‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717

1818
type RDBItems map[string]*RdbSchema
1919

20-
type FositeRehinkDBStore struct {
20+
type FositeRethinkDBStore struct {
2121
Session *r.Session
2222
sync.RWMutex
2323

@@ -64,7 +64,7 @@ func requestFromRDB(s *RdbSchema, proto fosite.Session) (*fosite.Request, error)
6464
return d, nil
6565
}
6666

67-
func (m *FositeRehinkDBStore) ColdStart() error {
67+
func (m *FositeRethinkDBStore) ColdStart() error {
6868
if err := m.AccessTokens.coldStart(m.Session, &m.RWMutex, m.AccessTokensTable); err != nil {
6969
return err
7070
} else if err := m.AuthorizeCodes.coldStart(m.Session, &m.RWMutex, m.AuthorizeCodesTable); err != nil {
@@ -77,7 +77,7 @@ func (m *FositeRehinkDBStore) ColdStart() error {
7777
return nil
7878
}
7979

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

101-
func (s *FositeRehinkDBStore) publishDelete(table r.Term, id string) error {
101+
func (s *FositeRethinkDBStore) publishDelete(table r.Term, id string) error {
102102
if _, err := table.Get(id).Delete().RunWrite(s.Session); err != nil {
103103
return errors.WithStack(err)
104104
}
105105
return nil
106106
}
107107

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

111111
go func() {
@@ -135,14 +135,14 @@ func (s *FositeRehinkDBStore) waitFor(i RDBItems, id string) error {
135135
}
136136
}
137137

138-
func (s *FositeRehinkDBStore) CreateOpenIDConnectSession(_ context.Context, authorizeCode string, requester fosite.Requester) error {
138+
func (s *FositeRethinkDBStore) CreateOpenIDConnectSession(_ context.Context, authorizeCode string, requester fosite.Requester) error {
139139
if err := s.publishInsert(s.IDSessionsTable, authorizeCode, requester); err != nil {
140140
return err
141141
}
142142
return s.waitFor(s.IDSessions, authorizeCode)
143143
}
144144

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

155-
func (s *FositeRehinkDBStore) DeleteOpenIDConnectSession(_ context.Context, authorizeCode string) error {
155+
func (s *FositeRethinkDBStore) DeleteOpenIDConnectSession(_ context.Context, authorizeCode string) error {
156156
return s.publishDelete(s.IDSessionsTable, authorizeCode)
157157
}
158158

159-
func (s *FositeRehinkDBStore) CreateAuthorizeCodeSession(_ context.Context, code string, requester fosite.Requester) error {
159+
func (s *FositeRethinkDBStore) CreateAuthorizeCodeSession(_ context.Context, code string, requester fosite.Requester) error {
160160
if err := s.publishInsert(s.AuthorizeCodesTable, code, requester); err != nil {
161161
return err
162162
}
163163
return s.waitFor(s.AuthorizeCodes, code)
164164
}
165165

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

177-
func (s *FositeRehinkDBStore) DeleteAuthorizeCodeSession(_ context.Context, code string) error {
177+
func (s *FositeRethinkDBStore) DeleteAuthorizeCodeSession(_ context.Context, code string) error {
178178
return s.publishDelete(s.AuthorizeCodesTable, code)
179179
}
180180

181-
func (s *FositeRehinkDBStore) CreateAccessTokenSession(_ context.Context, signature string, requester fosite.Requester) error {
181+
func (s *FositeRethinkDBStore) CreateAccessTokenSession(_ context.Context, signature string, requester fosite.Requester) error {
182182
if err := s.publishInsert(s.AccessTokensTable, signature, requester); err != nil {
183183
return err
184184
}
185185
return s.waitFor(s.AccessTokens, signature)
186186
}
187187

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

199-
func (s *FositeRehinkDBStore) DeleteAccessTokenSession(_ context.Context, signature string) error {
199+
func (s *FositeRethinkDBStore) DeleteAccessTokenSession(_ context.Context, signature string) error {
200200
return s.publishDelete(s.AccessTokensTable, signature)
201201
}
202202

203-
func (s *FositeRehinkDBStore) CreateRefreshTokenSession(_ context.Context, signature string, requester fosite.Requester) error {
203+
func (s *FositeRethinkDBStore) CreateRefreshTokenSession(_ context.Context, signature string, requester fosite.Requester) error {
204204
if err := s.publishInsert(s.RefreshTokensTable, signature, requester); err != nil {
205205
return err
206206
}
207207
return s.waitFor(s.RefreshTokens, signature)
208208
}
209209

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

221-
func (s *FositeRehinkDBStore) DeleteRefreshTokenSession(_ context.Context, signature string) error {
221+
func (s *FositeRethinkDBStore) DeleteRefreshTokenSession(_ context.Context, signature string) error {
222222
return s.publishDelete(s.RefreshTokensTable, signature)
223223
}
224224

225-
func (s *FositeRehinkDBStore) CreateImplicitAccessTokenSession(ctx context.Context, code string, req fosite.Requester) error {
225+
func (s *FositeRethinkDBStore) CreateImplicitAccessTokenSession(ctx context.Context, code string, req fosite.Requester) error {
226226
return s.CreateAccessTokenSession(ctx, code, req)
227227
}
228228

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

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

259-
func (m *FositeRehinkDBStore) Watch(ctx context.Context) {
259+
func (m *FositeRethinkDBStore) Watch(ctx context.Context) {
260260
m.AccessTokens.watch(ctx, m.Session, &m.RWMutex, m.AccessTokensTable)
261261
m.AuthorizeCodes.watch(ctx, m.Session, &m.RWMutex, m.AuthorizeCodesTable)
262262
m.IDSessions.watch(ctx, m.Session, &m.RWMutex, m.IDSessionsTable)
@@ -318,7 +318,7 @@ func (items RDBItems) watch(ctx context.Context, sess *r.Session, lock *sync.RWM
318318
})
319319
}
320320

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

337-
func (s *FositeRehinkDBStore) RevokeAccessToken(ctx context.Context, id string) error {
337+
func (s *FositeRethinkDBStore) RevokeAccessToken(ctx context.Context, id string) error {
338338
var found bool
339339
for sig, token := range s.AccessTokens {
340340
if token.RequestID == id {

‎oauth2/fosite_store_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
r "gopkg.in/dancannon/gorethink.v2"
2121
)
2222

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

63-
rethinkManager = &FositeRehinkDBStore{
63+
rethinkManager = &FositeRethinkDBStore{
6464
Session: session,
6565
AuthorizeCodesTable: r.Table("hydra_authorize_code"),
6666
IDSessionsTable: r.Table("hydra_id_sessions"),

0 commit comments

Comments
 (0)