bep

aslilac · aslilac · commit d3ec782c0ad3 · 2024-04-25T18:48:33.000Z
diff --git a/site/src/pages/LoginPage/LoginPageView.stories.tsx b/site/src/pages/LoginPage/LoginPageView.stories.tsx
@@ -4,13 +4,17 @@ import {
   MockAuthMethodsExternal,
   MockAuthMethodsPasswordOnly,
   MockAuthMethodsPasswordTermsOfService,
+  MockBuildInfo,
   mockApiError,
 } from "testHelpers/entities";
 import { LoginPageView } from "./LoginPageView";
 
 const meta: Meta<typeof LoginPageView> = {
   title: "pages/LoginPage",
   component: LoginPageView,
+  args: {
+    buildInfo: MockBuildInfo,
+  },
 };
 
 export default meta;
diff --git a/site/src/pages/LoginPage/LoginPageView.tsx b/site/src/pages/LoginPage/LoginPageView.tsx
@@ -1,4 +1,5 @@
 import type { Interpolation, Theme } from "@emotion/react";
+import Link from "@mui/material/Link";
 import type { FC } from "react";
 import { useLocation } from "react-router-dom";
 import type { AuthMethods, BuildInfoResponse } from "api/typesGenerated";
@@ -70,6 +71,20 @@ export const LoginPageView: FC<LoginPageViewProps> = ({
             Copyright &copy; {new Date().getFullYear()} Coder Technologies, Inc.
           </div>
           <div>{buildInfo?.version}</div>
+
+          {authMethods?.terms_of_service_link && (
+            <div css={{ paddingTop: 12, fontSize: 12 }}>
+              By continuing, you agree to the{" "}
+              <Link
+                href={authMethods.terms_of_service_link}
+                target="_blank"
+                rel="noreferrer"
+              >
+                Terms of Service
+              </Link>
+              .
+            </div>
+          )}
         </footer>
       </div>
     </div>
diff --git a/site/src/pages/LoginPage/SignInForm.tsx b/site/src/pages/LoginPage/SignInForm.tsx
@@ -1,13 +1,11 @@
 import type { Interpolation, Theme } from "@emotion/react";
-import Checkbox from "@mui/material/Checkbox";
-import { type FC, type ReactNode, useState } from "react";
+import type { FC, ReactNode } from "react";
 import type { AuthMethods } from "api/typesGenerated";
 import { Alert } from "components/Alert/Alert";
 import { ErrorAlert } from "components/Alert/ErrorAlert";
 import { getApplicationName } from "utils/appearance";
 import { OAuthSignInForm } from "./OAuthSignInForm";
 import { PasswordSignInForm } from "./PasswordSignInForm";
-import { Link } from "@mui/material";
 
 export const Language = {
   emailLabel: "Email",
@@ -85,10 +83,6 @@ export const SignInForm: FC<SignInFormProps> = ({
   const passwordEnabled = authMethods?.password.enabled ?? true;
   const applicationName = getApplicationName();
 
-  const [tosAccepted, setTosAccepted] = useState(false);
-  const termsOfServiceAcceptanceRequired =
-    authMethods?.terms_of_service_link && !tosAccepted;
-
   return (
     <div css={styles.root}>
       <h1 css={styles.title}>{applicationName}</h1>
@@ -105,55 +99,30 @@ export const SignInForm: FC<SignInFormProps> = ({
         </div>
       )}
 
-      {!termsOfServiceAcceptanceRequired && (
-        <>
-          {oAuthEnabled && (
-            <OAuthSignInForm
-              isSigningIn={isSigningIn}
-              redirectTo={redirectTo}
-              authMethods={authMethods}
-            />
-          )}
-
-          {passwordEnabled && oAuthEnabled && (
-            <div css={styles.divider}>
-              <div css={styles.dividerLine} />
-              <div css={styles.dividerLabel}>or</div>
-              <div css={styles.dividerLine} />
-            </div>
-          )}
-
-          {passwordEnabled && (
-            <PasswordSignInForm
-              onSubmit={onSubmit}
-              autoFocus={!oAuthEnabled}
-              isSigningIn={isSigningIn}
-            />
-          )}
-        </>
+      {oAuthEnabled && (
+        <OAuthSignInForm
+          isSigningIn={isSigningIn}
+          redirectTo={redirectTo}
+          authMethods={authMethods}
+        />
       )}
 
-      {authMethods?.terms_of_service_link && (
-        <div css={{ paddingTop: 8, fontSize: 14 }}>
-          <label>
-            <Checkbox
-              size="small"
-              checked={tosAccepted}
-              onChange={(event) => setTosAccepted(event.target.checked)}
-            />
-            I agree to the{" "}
-            <Link
-              href={authMethods.terms_of_service_link}
-              target="_blank"
-              rel="noreferrer"
-            >
-              Terms of Service
-            </Link>
-            .
-          </label>
+      {passwordEnabled && oAuthEnabled && (
+        <div css={styles.divider}>
+          <div css={styles.dividerLine} />
+          <div css={styles.dividerLabel}>or</div>
+          <div css={styles.dividerLine} />
         </div>
       )}
 
+      {passwordEnabled && (
+        <PasswordSignInForm
+          onSubmit={onSubmit}
+          autoFocus={!oAuthEnabled}
+          isSigningIn={isSigningIn}
+        />
+      )}
+
       {!passwordEnabled && !oAuthEnabled && (
         <Alert severity="error">No authentication methods configured!</Alert>
       )}
