Skip to content

feat: add oauth2 codes and tokens to database #11779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

feat: add oauth2 codes and tokens to database #11779

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d54e56a
Add OAuth2 provider codes and tokens to database
code-asher Jan 9, 2024
7b118ac
Check indexes in dbmem
code-asher Jan 24, 2024
b0df965
minor dbauthz changes
Emyrk Jan 24, 2024
cc366f6
use model struct over rbac.ResourceXX
Emyrk Jan 24, 2024
be2ad57
Rename token hashed_secret to refresh_hash
code-asher Jan 24, 2024
8368548
Bump migration number
code-asher Jan 24, 2024
29a9e26
Format oauth2.sql
code-asher Jan 24, 2024
c15f851
fixup! Rename token hashed_secret to refresh_hash
code-asher Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Check indexes in dbmem 
Might have no match, and a -1 will panic.
  • Loading branch information
@code-asher
code-asher committed Jan 24, 2024
commit 7b118ac8d3ebb7294d10ae15efaf5b1c7104396d
5 changes: 3 additions & 2 deletions coderd/database/dbmem/dbmem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1310,7 +1310,8 @@ func (q *FakeQuerier) DeleteOAuth2ProviderAppTokensByAppAndUserID(_ context.Cont
keyIdx := slices.IndexFunc(q.apiKeys, func(key database.APIKey) bool {
return key.ID == token.APIKeyID
})
if q.oauth2ProviderAppSecrets[secretIdx].AppID == arg.AppID && q.apiKeys[keyIdx].UserID == arg.UserID {
if secretIdx != -1 && q.oauth2ProviderAppSecrets[secretIdx].AppID == arg.AppID &&
keyIdx != -1 && q.apiKeys[keyIdx].UserID == arg.UserID {
keyIDsToDelete = append(keyIDsToDelete, token.APIKeyID)
} else {
tokens = append(tokens, token)
Expand Down Expand Up @@ -2312,7 +2313,7 @@ func (q *FakeQuerier) GetOAuth2ProviderAppsByUserID(_ context.Context, userID uu
keyIdx := slices.IndexFunc(q.apiKeys, func(key database.APIKey) bool {
return key.ID == token.APIKeyID
})
if q.apiKeys[keyIdx].UserID == userID {
if keyIdx != -1 && q.apiKeys[keyIdx].UserID == userID {
tokens = append(tokens, token)
}
}
Expand Down