Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbe2ad57

Browse files
committed
Rename token hashed_secret to refresh_hash
1 parentcc366f6 commitbe2ad57

File tree

8 files changed

+111
-111
lines changed

8 files changed

+111
-111
lines changed

‎coderd/database/dbgen/dbgen.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -719,12 +719,12 @@ func OAuth2ProviderAppCode(t testing.TB, db database.Store, seed database.OAuth2
719719

720720
funcOAuth2ProviderAppToken(t testing.TB,db database.Store,seed database.OAuth2ProviderAppToken) database.OAuth2ProviderAppToken {
721721
token,err:=db.InsertOAuth2ProviderAppToken(genCtx, database.InsertOAuth2ProviderAppTokenParams{
722-
ID:takeFirst(seed.ID,uuid.New()),
723-
CreatedAt:takeFirst(seed.CreatedAt,dbtime.Now()),
724-
ExpiresAt:takeFirst(seed.CreatedAt,dbtime.Now()),
725-
HashedSecret:takeFirstSlice(seed.HashedSecret, []byte("hashed-secret")),
726-
AppSecretID:takeFirst(seed.AppSecretID,uuid.New()),
727-
APIKeyID:takeFirst(seed.APIKeyID,uuid.New().String()),
722+
ID:takeFirst(seed.ID,uuid.New()),
723+
CreatedAt:takeFirst(seed.CreatedAt,dbtime.Now()),
724+
ExpiresAt:takeFirst(seed.CreatedAt,dbtime.Now()),
725+
RefreshHash:takeFirstSlice(seed.RefreshHash, []byte("hashed-secret")),
726+
AppSecretID:takeFirst(seed.AppSecretID,uuid.New()),
727+
APIKeyID:takeFirst(seed.APIKeyID,uuid.New().String()),
728728
})
729729
require.NoError(t,err,"insert oauth2 app token")
730730
returntoken

‎coderd/database/dbmem/dbmem.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5372,12 +5372,12 @@ func (q *FakeQuerier) InsertOAuth2ProviderAppToken(_ context.Context, arg databa
53725372
ifsecret.ID==arg.AppSecretID {
53735373
//nolint:gosimple // Go wants database.OAuth2ProviderAppToken(arg), but we cannot be sure the structs will remain identical.
53745374
token:= database.OAuth2ProviderAppToken{
5375-
ID:arg.ID,
5376-
CreatedAt:arg.CreatedAt,
5377-
ExpiresAt:arg.ExpiresAt,
5378-
HashedSecret:arg.HashedSecret,
5379-
APIKeyID:arg.APIKeyID,
5380-
AppSecretID:arg.AppSecretID,
5375+
ID:arg.ID,
5376+
CreatedAt:arg.CreatedAt,
5377+
ExpiresAt:arg.ExpiresAt,
5378+
RefreshHash:arg.RefreshHash,
5379+
APIKeyID:arg.APIKeyID,
5380+
AppSecretID:arg.AppSecretID,
53815381
}
53825382
q.oauth2ProviderAppTokens=append(q.oauth2ProviderAppTokens,token)
53835383
returntoken,nil

‎coderd/database/dump.sql

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/migrations/000186_oauth2_provider_codes.up.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ CREATE TABLE oauth2_provider_app_tokens (
1515
id uuidNOT NULL,
1616
created_attimestamp with time zoneNOT NULL,
1717
expires_attimestamp with time zoneNOT NULL,
18-
hashed_secretbyteaNOT NULL,
18+
refresh_hashbyteaNOT NULL,
1919
app_secret_id uuidNOT NULLREFERENCES oauth2_provider_app_secrets (id)ON DELETE CASCADE,
2020
api_key_idtextNOT NULLREFERENCES api_keys (id)ON DELETE CASCADE,
2121
PRIMARY KEY (id),
22-
UNIQUE(app_secret_id,hashed_secret)
22+
UNIQUE(app_secret_id,refresh_hash)
2323
);
2424

25-
COMMENT ONTABLE oauth2_provider_app_tokens IS'Refresh tokensbothprovide a way to refresh an accesstokens (APIkeys) and a way to link API keys with the OAuth2 app and secret that generated them.';
25+
COMMENT ONCOLUMN oauth2_provider_app_tokens.refresh_hash IS'Refresh tokens provide a way to refresh an accesstoken (APIkey). An expired API key can be refreshed if this token is not yet expired, meaning this expiry can outlive an API key.';
2626

2727
-- When we delete a token, delete the API key associated with it.
2828
CREATEFUNCTIONdelete_deleted_oauth2_provider_app_token_api_key() RETURNS trigger

‎coderd/database/models.go

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/queries/oauth2.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ INSERT INTO oauth2_provider_app_tokens (
9898
id,
9999
created_at,
100100
expires_at,
101-
hashed_secret,
101+
refresh_hash,
102102
app_secret_id,
103103
api_key_id
104104
)VALUES(

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp