Skip to content

Commit 3240b4f

Browse files
code-ashercode-asher
committed
Rename token hashed_secret to refresh_hash
1 parent 566fe63 commit 3240b4f

File tree

8 files changed

+114
-114
lines changed

8 files changed

+114
-114
lines changed

‎coderd/database/dbgen/dbgen.go

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

731731
func OAuth2ProviderAppToken(t testing.TB, db database.Store, seed database.OAuth2ProviderAppToken) database.OAuth2ProviderAppToken {
732732
token, err := db.InsertOAuth2ProviderAppToken(genCtx, database.InsertOAuth2ProviderAppTokenParams{
733-
ID: takeFirst(seed.ID, uuid.New()),
734-
CreatedAt: takeFirst(seed.CreatedAt, dbtime.Now()),
735-
ExpiresAt: takeFirst(seed.CreatedAt, dbtime.Now()),
736-
HashedSecret: takeFirstSlice(seed.HashedSecret, []byte("hashed-secret")),
737-
AppSecretID: takeFirst(seed.AppSecretID, uuid.New()),
738-
APIKeyID: takeFirst(seed.APIKeyID, uuid.New().String()),
733+
ID: takeFirst(seed.ID, uuid.New()),
734+
CreatedAt: takeFirst(seed.CreatedAt, dbtime.Now()),
735+
ExpiresAt: takeFirst(seed.CreatedAt, dbtime.Now()),
736+
RefreshHash: takeFirstSlice(seed.RefreshHash, []byte("hashed-secret")),
737+
AppSecretID: takeFirst(seed.AppSecretID, uuid.New()),
738+
APIKeyID: takeFirst(seed.APIKeyID, uuid.New().String()),
739739
})
740740
require.NoError(t, err, "insert oauth2 app token")
741741
return token

‎coderd/database/dbmem/dbmem.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5511,12 +5511,12 @@ func (q *FakeQuerier) InsertOAuth2ProviderAppToken(_ context.Context, arg databa
55115511
if secret.ID == arg.AppSecretID {
55125512
//nolint:gosimple // Go wants database.OAuth2ProviderAppToken(arg), but we cannot be sure the structs will remain identical.
55135513
token := database.OAuth2ProviderAppToken{
5514-
ID: arg.ID,
5515-
CreatedAt: arg.CreatedAt,
5516-
ExpiresAt: arg.ExpiresAt,
5517-
HashedSecret: arg.HashedSecret,
5518-
APIKeyID: arg.APIKeyID,
5519-
AppSecretID: arg.AppSecretID,
5514+
ID: arg.ID,
5515+
CreatedAt: arg.CreatedAt,
5516+
ExpiresAt: arg.ExpiresAt,
5517+
RefreshHash: arg.RefreshHash,
5518+
APIKeyID: arg.APIKeyID,
5519+
AppSecretID: arg.AppSecretID,
55205520
}
55215521
q.oauth2ProviderAppTokens = append(q.oauth2ProviderAppTokens, token)
55225522
return token, nil

‎coderd/database/dump.sql

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

‎coderd/database/migrations/000195_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 uuid NOT NULL,
1616
created_at timestamp with time zone NOT NULL,
1717
expires_at timestamp with time zone NOT NULL,
18-
hashed_secret bytea NOT NULL,
18+
refresh_hash bytea NOT NULL,
1919
app_secret_id uuid NOT NULL REFERENCES oauth2_provider_app_secrets (id) ON DELETE CASCADE,
2020
api_key_id text NOT NULL REFERENCES 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 ON TABLE oauth2_provider_app_tokens IS 'Refresh tokens both provide a way to refresh an access tokens (API keys) and a way to link API keys with the OAuth2 app and secret that generated them.';
25+
COMMENT ON COLUMN oauth2_provider_app_tokens.refresh_hash IS 'Refresh tokens provide a way to refresh an access token (API key). 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
CREATE FUNCTION delete_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 about customizing 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 about customizing 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)