Merge branch 'main' into oauth

coder · kylecarbs · Apr 23, 2022 · Apr 15, 2022 · Apr 17, 2022 · Apr 17, 2022
commit 9c3d81e67d62005b374b8990e8fc591cfc0393d0
diff --git a/cli/start.go b/cli/start.go
@@ -70,6 +70,7 @@ func start() *cobra.Command {
 		traceDatadog                     bool
 		secureAuthCookie                 bool
 		sshKeygenAlgorithmRaw            string
+		spooky                           bool
 	)
 
 	root := &cobra.Command{

diff --git a/site/src/components/SignInForm/SignInForm.tsx b/site/src/components/SignInForm/SignInForm.tsx
@@ -6,10 +6,10 @@ import TextField from "@material-ui/core/TextField"
 import { FormikContextType, useFormik } from "formik"
 import React from "react"
 import * as Yup from "yup"
-import { AuthMethods } from "../../api/types"
-import { LoadingButton } from "../Button"
-import { getFormHelpers, onChangeTrimmed } from "../Form"
-import { Welcome } from "./Welcome"
+import { AuthMethods } from "../../api/typesGenerated"
+import { getFormHelpers, onChangeTrimmed } from "../../util/formUtils"
+import { Welcome } from "../Welcome/Welcome"
+import { LoadingButton } from "./../LoadingButton/LoadingButton"
 
 /**
  * BuiltInAuthFormValues describes a form using built-in (email/password)

diff --git a/site/src/pages/LoginPage/LoginPage.test.tsx b/site/src/pages/LoginPage/LoginPage.test.tsx
@@ -61,7 +61,7 @@ describe("LoginPage", () => {
     )
 
     // When
-    render(<SignInPage />)
+    render(<LoginPage />)
 
     // Then
     const errorMessage = await screen.findByText(Language.methodsErrorMessage)
@@ -83,7 +83,7 @@ describe("LoginPage", () => {
     )
 
     // When
-    render(<SignInPage />)
+    render(<LoginPage />)
 
     // Then
     await screen.findByText(Language.passwordSignIn)

diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -1,5 +1,4 @@
 import {
-  AuthMethods,
   BuildInfoResponse,
   Organization,
   Pager,
@@ -10,6 +9,7 @@ import {
   Workspace,
   WorkspaceAutostartRequest,
 } from "../api/types"
+import { AuthMethods } from "../api/typesGenerated"
 
 export const MockSessionToken = { session_token: "my-session-token" }
 

diff --git a/site/src/xServices/auth/authXService.ts b/site/src/xServices/auth/authXService.ts
@@ -1,6 +1,7 @@
 import { assign, createMachine } from "xstate"
 import * as API from "../../api"
 import * as Types from "../../api/types"
+import * as TypesGen from "../../api/typesGenerated"
 import { displaySuccess } from "../../components/GlobalSnackbar/utils"
 
 export const Language = {
@@ -13,7 +14,7 @@ export interface AuthContext {
   authError?: Error | unknown
   updateProfileError?: Error | unknown
   me?: Types.UserResponse
-  methods?: Types.AuthMethods
+  methods?: TypesGen.AuthMethods
 }
 
 export type AuthEvent =
@@ -42,7 +43,7 @@ export const authMachine =
             data: Types.UserResponse
           }
           getMethods: {
-            data: Types.AuthMethods
+            data: TypesGen.AuthMethods
           }
           signIn: {
             data: Types.LoginResponse