Change the UI flow

BrunoQuaresma · BrunoQuaresma · commit 75d7865871bc · 2023-06-22T14:00:14.000Z
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -108,33 +108,12 @@ export const login = async (
   return response.data
 }
 
-export const convertToOauth = async (
-  email: string,
-  password: string,
-  to_login_type: string,
-): Promise<TypesGen.OauthConversionResponse | undefined> => {
-  const payload = JSON.stringify({
-    email,
-    password,
-    to_login_type,
-  })
-
-  try {
-    const response = await axios.post<TypesGen.OauthConversionResponse>(
-      "/api/v2/users/convert-login",
-      payload,
-      {
-        headers: { ...CONTENT_TYPE_JSON },
-      },
-    )
-    return response.data
-  } catch (error) {
-    if (axios.isAxiosError(error) && error.response?.status === 401) {
-      return undefined
-    }
-
-    throw error
-  }
+export const convertToOAUTH = async (request: TypesGen.ConvertLoginRequest) => {
+  const response = await axios.post<TypesGen.OauthConversionResponse>(
+    "/api/v2/users/convert-login",
+    request,
+  )
+  return response.data
 }
 
 export const logout = async (): Promise<void> => {
diff --git a/site/src/components/SettingsAccountForm/SettingsAccountForm.test.tsx b/site/src/components/SettingsAccountForm/SettingsAccountForm.test.tsx
@@ -24,9 +24,6 @@ describe("AccountForm", () => {
           onSubmit={() => {
             return
           }}
-          onChangeToOIDCAuth={() => {
-            return
-          }}
         />,
       )
 
@@ -57,9 +54,6 @@ describe("AccountForm", () => {
           onSubmit={() => {
             return
           }}
-          onChangeToOIDCAuth={() => {
-            return
-          }}
         />,
       )
 
diff --git a/site/src/components/SettingsAccountForm/SettingsAccountForm.tsx b/site/src/components/SettingsAccountForm/SettingsAccountForm.tsx
@@ -10,8 +10,6 @@ import {
 import { LoadingButton } from "../LoadingButton/LoadingButton"
 import { ErrorAlert } from "components/Alert/ErrorAlert"
 import { Form, FormFields } from "components/Form/Form"
-import { Stack } from "components/Stack/Stack"
-import Button from "@mui/material/Button"
 
 export interface AccountFormValues {
   username: string
@@ -36,7 +34,6 @@ export interface AccountFormProps {
   updateProfileError?: Error | unknown
   // initialTouched is only used for testing the error state of the form.
   initialTouched?: FormikTouched<AccountFormValues>
-  onChangeToOIDCAuth: () => void
 }
 
 export const AccountForm: FC<React.PropsWithChildren<AccountFormProps>> = ({
@@ -47,7 +44,6 @@ export const AccountForm: FC<React.PropsWithChildren<AccountFormProps>> = ({
   initialValues,
   updateProfileError,
   initialTouched,
-  onChangeToOIDCAuth
 }) => {
   const form: FormikContextType<AccountFormValues> =
     useFormik<AccountFormValues>({
@@ -84,7 +80,7 @@ export const AccountForm: FC<React.PropsWithChildren<AccountFormProps>> = ({
             label={Language.usernameLabel}
           />
 
-          <Stack direction="row">
+          <div>
             <LoadingButton
               loading={isLoading}
               aria-disabled={!editable}
@@ -94,9 +90,7 @@ export const AccountForm: FC<React.PropsWithChildren<AccountFormProps>> = ({
             >
               {isLoading ? "" : Language.updateSettings}
             </LoadingButton>
-
-            <Button type="button" onClick={onChangeToOIDCAuth}>Use OIDC to authenticate</Button>
-          </Stack>
+          </div>
         </FormFields>
       </Form>
     </>
diff --git a/site/src/pages/UserSettingsPage/AccountPage/AccountPage.tsx b/site/src/pages/UserSettingsPage/AccountPage/AccountPage.tsx
