Fix issues

BrunoQuaresma · Emyrk · commit e8f5220ac0ca · 2023-06-26T09:08:23.000-05:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -211,5 +211,5 @@
   "go.testFlags": ["-short", "-coverpkg=./..."],
   // We often use a version of TypeScript that's ahead of the version shipped
   // with VS Code.
-  "typescript.tsdk": "./site/node_modules/typescript/lib",
+  "typescript.tsdk": "./site/node_modules/typescript/lib"
 }
diff --git a/coderd/userauth.go b/coderd/userauth.go
@@ -833,7 +833,7 @@ func (api *API) userOIDC(rw http.ResponseWriter, r *http.Request) {
 			// Convert the []interface{} we get to a []string.
 			groupsInterface, ok := groupsRaw.([]interface{})
 			if ok {
-				logger.Debug(ctx, "groups returned in oidc claims",
+				api.Logger.Debug(ctx, "groups returned in oidc claims",
 					slog.F("len", len(groupsInterface)),
 					slog.F("groups", groupsInterface),
 				)
@@ -854,7 +854,7 @@ func (api *API) userOIDC(rw http.ResponseWriter, r *http.Request) {
 					groups = append(groups, group)
 				}
 			} else {
-				logger.Debug(ctx, "groups field was an unknown type",
+				api.Logger.Debug(ctx, "groups field was an unknown type",
 					slog.F("type", fmt.Sprintf("%T", groupsRaw)),
 				)
 			}
diff --git a/site/src/components/SettingsAccountForm/SettingsAccountForm.test.tsx b/site/src/components/SettingsAccountForm/SettingsAccountForm.test.tsx
@@ -31,7 +31,7 @@ describe("AccountForm", () => {
       const el = await screen.findByLabelText("Username")
       expect(el).toBeEnabled()
       const btn = await screen.findByRole("button", {
-        name: /Update settings/i,
+        name: /Update account/i,
       })
       expect(btn).toBeEnabled()
     })
@@ -61,7 +61,7 @@ describe("AccountForm", () => {
       const el = await screen.findByLabelText("Username")
       expect(el).toBeDisabled()
       const btn = await screen.findByRole("button", {
-        name: /Update settings/i,
+        name: /Update account/i,
       })
       expect(btn).toBeDisabled()
     })
diff --git a/site/src/components/SettingsSecurityForm/SettingsSecurityForm.tsx b/site/src/components/SettingsSecurityForm/SettingsSecurityForm.tsx
@@ -64,10 +64,7 @@ export const SecurityForm: FC<SecurityFormProps> = ({
       validationSchema,
       onSubmit,
     })
-  const getFieldHelpers = getFormHelpers<SecurityFormValues>(
-    form,
-    error,
-  )
+  const getFieldHelpers = getFormHelpers<SecurityFormValues>(form, error)
 
   if (disabled) {
     return (
@@ -81,9 +78,7 @@ export const SecurityForm: FC<SecurityFormProps> = ({
     <>
       <Form onSubmit={form.handleSubmit}>
         <FormFields>
-          {Boolean(error) && (
-            <ErrorAlert error={error} />
-          )}
+          {Boolean(error) && <ErrorAlert error={error} />}
           <TextField
             {...getFieldHelpers("old_password")}
             autoComplete="old_password"

Original file line number	Diff line number	Diff line change
`@@ -211,5 +211,5 @@`
`211`	`211`	`"go.testFlags": ["-short", "-coverpkg=./..."],`
`212`	`212`	`// We often use a version of TypeScript that's ahead of the version shipped`
`213`	`213`	`// with VS Code.`
`214`		`- "typescript.tsdk": "./site/node_modules/typescript/lib",`
	`214`	`+ "typescript.tsdk": "./site/node_modules/typescript/lib"`
`215`	`215`	`}`
Original file line number	Diff line number	Diff line change
`@@ -833,7 +833,7 @@ func (api API) userOIDC(rw http.ResponseWriter, r http.Request) {`
`833`	`833`	`// Convert the []interface{} we get to a []string.`
`834`	`834`	`groupsInterface, ok := groupsRaw.([]interface{})`
`835`	`835`	`if ok {`
`836`		`- logger.Debug(ctx, "groups returned in oidc claims",`
	`836`	`+ api.Logger.Debug(ctx, "groups returned in oidc claims",`
`837`	`837`	`slog.F("len", len(groupsInterface)),`
`838`	`838`	`slog.F("groups", groupsInterface),`
`839`	`839`	`)`
`@@ -854,7 +854,7 @@ func (api API) userOIDC(rw http.ResponseWriter, r http.Request) {`
`854`	`854`	`groups = append(groups, group)`
`855`	`855`	`}`
`856`	`856`	`} else {`
`857`		`- logger.Debug(ctx, "groups field was an unknown type",`
	`857`	`+ api.Logger.Debug(ctx, "groups field was an unknown type",`
`858`	`858`	`slog.F("type", fmt.Sprintf("%T", groupsRaw)),`
`859`	`859`	`)`
`860`	`860`	`}`