Skip to content

Commit a2510a2

Browse files
EmyrkEmyrk
committed
Rename state_string to state
1 parent f3bce86 commit a2510a2

File tree

10 files changed

+22
-24
lines changed

10 files changed

+22
-24
lines changed

‎coderd/coderd.go

-2
Original file line numberDiff line numberDiff line change
@@ -395,8 +395,6 @@ func New(options *Options) *API {
395395
Optional: true,
396396
})
397397

398-
allowOauthConversion := options.DeploymentValues.EnableOauthAccountConversion.Value()
399-
400398
// API rate limit middleware. The counter is local and not shared between
401399
// replicas or instances of this middleware.
402400
apiRateLimiter := httpmw.RateLimit(options.APIRateLimit, time.Minute)

‎coderd/database/dbfake/dbfake.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2655,7 +2655,7 @@ func (q *fakeQuerier) GetUserOauthMergeState(_ context.Context, arg database.Get
26552655
defer q.mutex.RUnlock()
26562656

26572657
for _, s := range q.oauthMergeStates {
2658-
if s.StateString == arg.StateString && s.UserID == arg.UserID {
2658+
if s.State == arg.StateString && s.UserID == arg.UserID {
26592659
return s, nil
26602660
}
26612661
}
@@ -4092,7 +4092,7 @@ func (q *fakeQuerier) InsertUserOauthMergeState(_ context.Context, arg database.
40924092
}
40934093

40944094
s := database.OauthMergeState{
4095-
StateString: arg.StateString,
4095+
State: arg.State,
40964096
CreatedAt: arg.CreatedAt,
40974097
ExpiresAt: arg.ExpiresAt,
40984098
FromLoginType: arg.FromLoginType,

‎coderd/database/dump.sql

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/migrations/000131_merge_oidc_account.up.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
BEGIN;
22

33
CREATE TABLE IF NOT EXISTS oauth_merge_state (
4-
state_string text NOT NULL,
4+
state text NOT NULL,
55
created_at timestamptz NOT NULL,
66
expires_at timestamptz NOT NULL,
77
from_login_type login_type NOT NULL,
88
to_login_type login_type NOT NULL,
99
user_id uuid NOT NULL
1010
REFERENCES users (id) ON DELETE CASCADE,
11-
PRIMARY KEY (state_string)
11+
PRIMARY KEY (state)
1212
);
1313

1414
COMMENT ON TABLE oauth_merge_state IS 'Stores the state string for Oauth merge requests. If an Oauth state string is found in this table, '

‎coderd/database/models.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/users.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ FROM
55
oauth_merge_state
66
WHERE
77
user_id = @user_id AND
8-
state_string = @state_string;
8+
state = @state_string;
99

1010
-- name: InsertUserOauthMergeState :one
1111
INSERT INTO
1212
oauth_merge_state (
1313
user_id,
14-
state_string,
14+
state,
1515
from_login_type,
1616
to_login_type,
1717
created_at,

‎coderd/userauth.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func (api *API) postConvertLoginType(rw http.ResponseWriter, r *http.Request) {
134134

135135
mergeState, err = store.InsertUserOauthMergeState(ctx, database.InsertUserOauthMergeStateParams{
136136
UserID: user.ID,
137-
StateString: stateString,
137+
State: stateString,
138138
FromLoginType: user.LoginType,
139139
ToLoginType: database.LoginType(req.ToLoginType),
140140
CreatedAt: now,
@@ -156,7 +156,7 @@ func (api *API) postConvertLoginType(rw http.ResponseWriter, r *http.Request) {
156156

157157
aReq.New = mergeState
158158
httpapi.Write(ctx, rw, http.StatusCreated, codersdk.OauthConversionResponse{
159-
StateString: mergeState.StateString,
159+
StateString: mergeState.State,
160160
ExpiresAt: mergeState.ExpiresAt,
161161
ToLoginType: codersdk.LoginType(mergeState.ToLoginType),
162162
UserID: mergeState.UserID,

‎docs/admin/audit-logs.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ We track the following resources:
1515
| Group<br><i>create, write, delete</i> | <table><thead><tr><th>Field</th><th>Tracked</th></tr></thead><tbody><tr><td>avatar_url</td><td>true</td></tr><tr><td>id</td><td>true</td></tr><tr><td>members</td><td>true</td></tr><tr><td>name</td><td>true</td></tr><tr><td>organization_id</td><td>false</td></tr><tr><td>quota_allowance</td><td>true</td></tr></tbody></table> |
1616
| GitSSHKey<br><i>create</i> | <table><thead><tr><th>Field</th><th>Tracked</th></tr></thead><tbody><tr><td>created_at</td><td>false</td></tr><tr><td>private_key</td><td>true</td></tr><tr><td>public_key</td><td>true</td></tr><tr><td>updated_at</td><td>false</td></tr><tr><td>user_id</td><td>true</td></tr></tbody></table> |
1717
| License<br><i>create, delete</i> | <table><thead><tr><th>Field</th><th>Tracked</th></tr></thead><tbody><tr><td>exp</td><td>true</td></tr><tr><td>id</td><td>false</td></tr><tr><td>jwt</td><td>false</td></tr><tr><td>uploaded_at</td><td>true</td></tr><tr><td>uuid</td><td>true</td></tr></tbody></table> |
18-
| OauthMergeState<br><i></i> | <table><thead><tr><th>Field</th><th>Tracked</th></tr></thead><tbody><tr><td>created_at</td><td>true</td></tr><tr><td>expires_at</td><td>true</td></tr><tr><td>from_login_type</td><td>true</td></tr><tr><td>state_string</td><td>true</td></tr><tr><td>to_login_type</td><td>true</td></tr><tr><td>user_id</td><td>true</td></tr></tbody></table> |
18+
| OauthMergeState<br><i></i> | <table><thead><tr><th>Field</th><th>Tracked</th></tr></thead><tbody><tr><td>created_at</td><td>true</td></tr><tr><td>expires_at</td><td>true</td></tr><tr><td>from_login_type</td><td>true</td></tr><tr><td>state</td><td>true</td></tr><tr><td>to_login_type</td><td>true</td></tr><tr><td>user_id</td><td>true</td></tr></tbody></table> |
1919
| Template<br><i>write, delete</i> | <table><thead><tr><th>Field</th><th>Tracked</th></tr></thead><tbody><tr><td>active_version_id</td><td>true</td></tr><tr><td>allow_user_autostart</td><td>true</td></tr><tr><td>allow_user_autostop</td><td>true</td></tr><tr><td>allow_user_cancel_workspace_jobs</td><td>true</td></tr><tr><td>created_at</td><td>false</td></tr><tr><td>created_by</td><td>true</td></tr><tr><td>default_ttl</td><td>true</td></tr><tr><td>deleted</td><td>false</td></tr><tr><td>description</td><td>true</td></tr><tr><td>display_name</td><td>true</td></tr><tr><td>failure_ttl</td><td>true</td></tr><tr><td>group_acl</td><td>true</td></tr><tr><td>icon</td><td>true</td></tr><tr><td>id</td><td>true</td></tr><tr><td>inactivity_ttl</td><td>true</td></tr><tr><td>locked_ttl</td><td>true</td></tr><tr><td>max_ttl</td><td>true</td></tr><tr><td>name</td><td>true</td></tr><tr><td>organization_id</td><td>false</td></tr><tr><td>provisioner</td><td>true</td></tr><tr><td>updated_at</td><td>false</td></tr><tr><td>user_acl</td><td>true</td></tr></tbody></table> |
2020
| TemplateVersion<br><i>create, write</i> | <table><thead><tr><th>Field</th><th>Tracked</th></tr></thead><tbody><tr><td>created_at</td><td>false</td></tr><tr><td>created_by</td><td>true</td></tr><tr><td>git_auth_providers</td><td>false</td></tr><tr><td>id</td><td>true</td></tr><tr><td>job_id</td><td>false</td></tr><tr><td>name</td><td>true</td></tr><tr><td>organization_id</td><td>false</td></tr><tr><td>readme</td><td>true</td></tr><tr><td>template_id</td><td>true</td></tr><tr><td>updated_at</td><td>false</td></tr></tbody></table> |
2121
| User<br><i>create, write, delete</i> | <table><thead><tr><th>Field</th><th>Tracked</th></tr></thead><tbody><tr><td>avatar_url</td><td>false</td></tr><tr><td>created_at</td><td>false</td></tr><tr><td>deleted</td><td>true</td></tr><tr><td>email</td><td>true</td></tr><tr><td>hashed_password</td><td>true</td></tr><tr><td>id</td><td>true</td></tr><tr><td>last_seen_at</td><td>false</td></tr><tr><td>login_type</td><td>false</td></tr><tr><td>rbac_roles</td><td>true</td></tr><tr><td>status</td><td>true</td></tr><tr><td>updated_at</td><td>false</td></tr><tr><td>username</td><td>true</td></tr></tbody></table> |

‎enterprise/audit/table.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ var auditableResourcesTypes = map[any]map[string]Action{
157157
"token_name": ActionIgnore,
158158
},
159159
&database.OauthMergeState{}: {
160-
"state_string": ActionSecret,
160+
"state": ActionSecret,
161161
"created_at": ActionTrack,
162162
"expires_at": ActionTrack,
163163
"from_login_type": ActionTrack,

0 commit comments

Comments
 (0)