Skip to content

Commit 159f12c

Browse files
EmyrkEmyrk
committed
Rename Oauth
1 parent 4cee518 commit 159f12c

File tree

10 files changed

+44
-44
lines changed

10 files changed

+44
-44
lines changed

‎cli/server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
674674

675675
// Read the oauth signing key from the database. Like the app security, generate a new one
676676
// if it is invalid for any reason.
677-
oauthSigningKeyStr, err := tx.GetOauthSigningKey(ctx)
677+
oauthSigningKeyStr, err := tx.GetOAuthSigningKey(ctx)
678678
if err != nil && !xerrors.Is(err, sql.ErrNoRows) {
679679
return xerrors.Errorf("get app oauth signing key: %w", err)
680680
}
@@ -686,7 +686,7 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
686686
}
687687

688688
oauthSigningKeyStr = hex.EncodeToString(b)
689-
err = tx.UpsertOauthSigningKey(ctx, oauthSigningKeyStr)
689+
err = tx.UpsertOAuthSigningKey(ctx, oauthSigningKeyStr)
690690
if err != nil {
691691
return xerrors.Errorf("insert freshly generated oauth signing key to database: %w", err)
692692
}

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,11 +1041,11 @@ func (q *querier) GetLogoURL(ctx context.Context) (string, error) {
10411041
return q.db.GetLogoURL(ctx)
10421042
}
10431043

1044-
func (q *querier) GetOauthSigningKey(ctx context.Context) (string, error) {
1044+
func (q *querier) GetOAuthSigningKey(ctx context.Context) (string, error) {
10451045
if err := q.authorizeContext(ctx, rbac.ActionUpdate, rbac.ResourceSystem); err != nil {
10461046
return "", err
10471047
}
1048-
return q.db.GetOauthSigningKey(ctx)
1048+
return q.db.GetOAuthSigningKey(ctx)
10491049
}
10501050

10511051
func (q *querier) GetOrganizationByID(ctx context.Context, id uuid.UUID) (database.Organization, error) {
@@ -2608,11 +2608,11 @@ func (q *querier) UpsertLogoURL(ctx context.Context, value string) error {
26082608
return q.db.UpsertLogoURL(ctx, value)
26092609
}
26102610

2611-
func (q *querier) UpsertOauthSigningKey(ctx context.Context, value string) error {
2611+
func (q *querier) UpsertOAuthSigningKey(ctx context.Context, value string) error {
26122612
if err := q.authorizeContext(ctx, rbac.ActionUpdate, rbac.ResourceSystem); err != nil {
26132613
return err
26142614
}
2615-
return q.db.UpsertOauthSigningKey(ctx, value)
2615+
return q.db.UpsertOAuthSigningKey(ctx, value)
26162616
}
26172617

26182618
func (q *querier) UpsertServiceBanner(ctx context.Context, value string) error {

‎coderd/database/dbfake/dbfake.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1868,7 +1868,7 @@ func (q *fakeQuerier) GetLogoURL(_ context.Context) (string, error) {
18681868
return q.logoURL, nil
18691869
}
18701870

1871-
func (q *fakeQuerier) GetOauthSigningKey(_ context.Context) (string, error) {
1871+
func (q *fakeQuerier) GetOAuthSigningKey(_ context.Context) (string, error) {
18721872
q.mutex.RLock()
18731873
defer q.mutex.RUnlock()
18741874

@@ -5355,7 +5355,7 @@ func (q *fakeQuerier) UpsertLogoURL(_ context.Context, data string) error {
53555355
return nil
53565356
}
53575357

5358-
func (q *fakeQuerier) UpsertOauthSigningKey(_ context.Context, value string) error {
5358+
func (q *fakeQuerier) UpsertOAuthSigningKey(_ context.Context, value string) error {
53595359
q.mutex.Lock()
53605360
defer q.mutex.Unlock()
53615361

‎coderd/database/dbmetrics/dbmetrics.go

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

‎coderd/database/dbmock/dbmock.go

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

‎coderd/database/querier.go

Lines changed: 2 additions & 2 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: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/siteconfig.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ SELECT value FROM site_configs WHERE key = 'app_signing_key';
5757
INSERT INTO site_configs (key, value) VALUES ('app_signing_key', $1)
5858
ON CONFLICT (key) DO UPDATE set value = $1 WHERE site_configs.key = 'app_signing_key';
5959

60-
-- name: GetOauthSigningKey :one
60+
-- name: GetOAuthSigningKey :one
6161
SELECT value FROM site_configs WHERE key = 'oauth_signing_key';
6262

63-
-- name: UpsertOauthSigningKey :exec
63+
-- name: UpsertOAuthSigningKey :exec
6464
INSERT INTO site_configs (key, value) VALUES ('oauth_signing_key', $1)
6565
ON CONFLICT (key) DO UPDATE set value = $1 WHERE site_configs.key = 'oauth_signing_key';

‎coderd/userauth.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ type OAuthConvertStateClaims struct {
5959
// @Produce json
6060
// @Tags Authorization
6161
// @Param request body codersdk.ConvertLoginRequest true "Convert request"
62-
// @Success 201 {object} codersdk.OauthConversionResponse
62+
// @Success 201 {object} codersdk.OAuthConversionResponse
6363
// @Router /users/convert-login [post]
6464
func (api *API) postConvertLoginType(rw http.ResponseWriter, r *http.Request) {
6565
if !api.Options.DeploymentValues.EnableOauthAccountConversion.Value() {
@@ -185,7 +185,7 @@ func (api *API) postConvertLoginType(rw http.ResponseWriter, r *http.Request) {
185185
HttpOnly: true,
186186
SameSite: http.SameSiteStrictMode,
187187
})
188-
httpapi.Write(ctx, rw, http.StatusCreated, codersdk.OauthConversionResponse{
188+
httpapi.Write(ctx, rw, http.StatusCreated, codersdk.OAuthConversionResponse{
189189
StateString: stateString,
190190
ExpiresAt: claims.ExpiresAt.Time,
191191
ToLoginType: claims.ToLoginType,

‎codersdk/users.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ type LoginWithPasswordResponse struct {
110110
SessionToken string `json:"session_token" validate:"required"`
111111
}
112112

113-
type OauthConversionResponse struct {
113+
type OAuthConversionResponse struct {
114114
StateString string `json:"state_string"`
115115
ExpiresAt time.Time `json:"expires_at" format:"date-time"`
116116
ToLoginType LoginType `json:"to_login_type"`
@@ -320,19 +320,19 @@ func (c *Client) LoginWithPassword(ctx context.Context, req LoginWithPasswordReq
320320
// ConvertToOAuthLogin will send a request to convert the user from password
321321
// based authentication to oauth based. The response has the oauth state code
322322
// to use in the oauth flow.
323-
func (c *Client) ConvertToOAuthLogin(ctx context.Context, req ConvertLoginRequest) (OauthConversionResponse, error) {
323+
func (c *Client) ConvertToOAuthLogin(ctx context.Context, req ConvertLoginRequest) (OAuthConversionResponse, error) {
324324
res, err := c.Request(ctx, http.MethodPost, "/api/v2/users/convert-login", req)
325325
if err != nil {
326-
return OauthConversionResponse{}, err
326+
return OAuthConversionResponse{}, err
327327
}
328328
defer res.Body.Close()
329329
if res.StatusCode != http.StatusCreated {
330-
return OauthConversionResponse{}, ReadBodyAsError(res)
330+
return OAuthConversionResponse{}, ReadBodyAsError(res)
331331
}
332-
var resp OauthConversionResponse
332+
var resp OAuthConversionResponse
333333
err = json.NewDecoder(res.Body).Decode(&resp)
334334
if err != nil {
335-
return OauthConversionResponse{}, err
335+
return OAuthConversionResponse{}, err
336336
}
337337
return resp, nil
338338
}

0 commit comments

Comments
 (0)