From f9cf79c81fe92272b517ae9a6be1adedaa4355e2 Mon Sep 17 00:00:00 2001
From: Jordan Doyle <jordan@doyle.la>
Date: Thu, 01 Sep 2022 02:23:54 +0100
Subject: [PATCH] Hide login form if password-based authentication is disabled

---
 chartered-frontend/src/pages/Login.tsx             | 108 ++++++++++++++++++++++++++++++++++++++++++++------------------------------------
 chartered-web/src/endpoints/web_api/auth/openid.rs |   3 +++
 2 files changed, 60 insertions(+), 51 deletions(-)

diff --git a/chartered-frontend/src/pages/Login.tsx b/chartered-frontend/src/pages/Login.tsx
index b02030a..3c1e2ae 100644
--- a/chartered-frontend/src/pages/Login.tsx
+++ a/chartered-frontend/src/pages/Login.tsx
@@ -20,6 +20,7 @@
 import { PersonPlus } from "react-bootstrap-icons";
 
 interface OAuthProviders {
+  password: boolean;
   providers: string[];
 }
 
@@ -110,60 +111,62 @@
               />
             </div>
 
-            <form onSubmit={handleSubmit}>
-              <div className="form-floating">
-                <input
-                  type="text"
-                  className="form-control"
-                  placeholder="john.smith"
-                  id="username"
-                  disabled={!!loading}
-                  value={username}
-                  onChange={(e) => setUsername(e.target.value)}
-                />
+            {oauthProviders?.password ?? true ? <>
+              <form onSubmit={handleSubmit}>
+                <div className="form-floating">
+                  <input
+                      type="text"
+                      className="form-control"
+                      placeholder="john.smith"
+                      id="username"
+                      disabled={!!loading}
+                      value={username}
+                      onChange={(e) => setUsername(e.target.value)}
+                  />
 
-                <label htmlFor="email" className="form-label">
-                  Username
-                </label>
-              </div>
-
-              <div className="form-floating mt-2">
-                <input
-                  type="password"
-                  className="form-control"
-                  placeholder="&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;"
-                  id="password"
-                  disabled={!!loading}
-                  value={password}
-                  onChange={(e) => setPassword(e.target.value)}
-                />
+                  <label htmlFor="email" className="form-label">
+                    Username
+                  </label>
+                </div>
+
+                <div className="form-floating mt-2">
+                  <input
+                      type="password"
+                      className="form-control"
+                      placeholder="&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;"
+                      id="password"
+                      disabled={!!loading}
+                      value={password}
+                      onChange={(e) => setPassword(e.target.value)}
+                  />
 
-                <label htmlFor="password" className="form-label">
-                  Password
-                </label>
-              </div>
-
-              <ButtonOrSpinner
-                type="submit"
-                variant="primary"
-                disabled={!!loading}
-                showSpinner={loading === "password"}
-                text={`Login`}
-                icon={faSignInAlt}
-                onClick={handleSubmit}
-              />
-            </form>
-
-            <Link
-              to="/register"
-              className="btn btn-lg w-100 btn-outline-primary mt-2"
-            >
-              <PersonPlus /> Register
-            </Link>
+                  <label htmlFor="password" className="form-label">
+                    Password
+                  </label>
+                </div>
+
+                <ButtonOrSpinner
+                    type="submit"
+                    variant="primary"
+                    disabled={!!loading}
+                    showSpinner={loading === "password"}
+                    text={`Login`}
+                    icon={faSignInAlt}
+                    onClick={handleSubmit}
+                />
+              </form>
+
+              <Link
+                  to="/register"
+                  className="btn btn-lg w-100 btn-outline-primary mt-2"
+              >
+                <PersonPlus /> Register
+              </Link>
+            </> : <></>}
 
             {oauthProviders?.providers.length > 0 ? (
               <>
-                <div className="side-lines mt-2">or</div>
+                {oauthProviders?.password ? <div className="side-lines mt-2">or</div> : <></>}
 
                 {oauthProviders.providers.map((v, i) => (
                   <ButtonOrSpinner
@@ -181,6 +184,7 @@
                       evt.preventDefault();
                       handleOAuthLogin(v);
                     }}
+                    noPadding={i == 0 && !oauthProviders?.password}
                   />
                 ))}
               </>
@@ -214,6 +218,7 @@
   icon,
   background,
   onClick,
+  noPadding,
 }: {
   type: "button" | "submit";
   variant: string;
@@ -223,11 +228,12 @@
   icon?: IconDefinition;
   background?: string;
   onClick: MouseEventHandler<HTMLButtonElement>;
+  noPadding?: boolean;
 }) {
   if (showSpinner) {
     return (
       <div
-        className="spinner-border text-primary mt-3 m-auto d-block"
+        className={`spinner-border text-primary ${noPadding ? '' : 'mt-3'} m-auto d-block`}
         role="status"
       >
         <span className="visually-hidden">Logging in...</span>
@@ -241,7 +247,7 @@
         type={type}
         disabled={disabled}
         onClick={onClick}
-        className={`btn btn-lg mt-2 btn-${variant} w-100`}
+        className={`btn btn-lg ${noPadding ? '' : 'mt-2'} btn-${variant} w-100`}
         style={{ background, borderColor: background }}
       >
         {icon ? <FontAwesomeIcon icon={icon} className="me-2" /> : <></>}
diff --git a/chartered-web/src/endpoints/web_api/auth/openid.rs b/chartered-web/src/endpoints/web_api/auth/openid.rs
index 07fdb74..4f87eb3 100644
--- a/chartered-web/src/endpoints/web_api/auth/openid.rs
+++ a/chartered-web/src/endpoints/web_api/auth/openid.rs
@@ -21,9 +21,11 @@
 /// Lists all the available and enabled providers that the user can authenticate with.
 #[allow(clippy::unused_async)]
 pub async fn list_providers(
+    extract::Extension(config): extract::Extension<Arc<Config>>,
     extract::Extension(oidc_clients): extract::Extension<Arc<OidcClients>>,
 ) -> Json<ListProvidersResponse> {
     Json(ListProvidersResponse {
+        password: config.auth.password.enabled,
         providers: oidc_clients
             .keys()
             .into_iter()
@@ -226,6 +228,7 @@
 
 #[derive(Serialize)]
 pub struct ListProvidersResponse {
+    password: bool,
     providers: Vec<String>,
 }
 
--
rgit 0.1.3