From b67504a564ae0ddbdb028dd29e2c770dd5886e24 Mon Sep 17 00:00:00 2001
From: maany <imptodefeat@gmail.com>
Date: Mon, 25 Nov 2024 16:06:46 +0100
Subject: [PATCH] login: make userpass login optional

---
 .../demos/01_0_Login_MultiVO.stories.ts       |  2 +
 .../demos/01_1_Login.stories.tsx              |  1 +
 .../demos/01_1_Login_OIDC.stories.ts          |  1 +
 .../01_2_Login_multi_account.stories.tsx      |  1 +
 .../pages/legacy/Login/Login.stories.tsx      |  1 +
 .../pages/legacy/Login/Login.tsx              | 98 ++++++++++---------
 src/lib/core/dto/login-config-dto.ts          |  1 +
 .../env-config-gateway-output-port.ts         |  5 +
 src/lib/core/use-case/login-config-usecase.ts |  4 +
 .../login-config-usecase-models.ts            |  2 +
 .../gateway/env-config-gateway.ts             |  8 ++
 .../presenter/login-config-presenter.ts       |  4 +-
 12 files changed, 79 insertions(+), 49 deletions(-)

diff --git a/src/component-library/demos/01_0_Login_MultiVO.stories.ts b/src/component-library/demos/01_0_Login_MultiVO.stories.ts
index 7a17b2f6b..afac2ba67 100644
--- a/src/component-library/demos/01_0_Login_MultiVO.stories.ts
+++ b/src/component-library/demos/01_0_Login_MultiVO.stories.ts
@@ -58,6 +58,7 @@ export const ABasicLogin: Story = {
     args: {
         loginViewModel: {
             status: 'success',
+            userpassEnabled: true,
             x509Enabled: false,
             oidcEnabled: false,
             oidcProviders: [cernOIDCProvider],
@@ -86,6 +87,7 @@ export const ABasicMultiVOLogin: Story = {
     args: {
         loginViewModel: {
             status: 'success',
+            userpassEnabled: true,
             x509Enabled: true,
             oidcEnabled: false,
             oidcProviders: [cernOIDCProvider],
diff --git a/src/component-library/demos/01_1_Login.stories.tsx b/src/component-library/demos/01_1_Login.stories.tsx
index 09dab7572..592ea64eb 100644
--- a/src/component-library/demos/01_1_Login.stories.tsx
+++ b/src/component-library/demos/01_1_Login.stories.tsx
@@ -51,6 +51,7 @@ export const Playbook_InitLogin: Story = {
     args: {
         loginViewModel: {
             status: 'success',
+            userpassEnabled: true,
             x509Enabled: true,
             oidcEnabled: true,
             oidcProviders: [cernOIDCProvider],
diff --git a/src/component-library/demos/01_1_Login_OIDC.stories.ts b/src/component-library/demos/01_1_Login_OIDC.stories.ts
index 993332b2d..5eb35f151 100644
--- a/src/component-library/demos/01_1_Login_OIDC.stories.ts
+++ b/src/component-library/demos/01_1_Login_OIDC.stories.ts
@@ -58,6 +58,7 @@ export const AMultiVOOIDCEnabledLogin: Story = {
     args: {
         loginViewModel: {
             status: 'success',
+            userpassEnabled: true,
             x509Enabled: true,
             oidcEnabled: true,
             oidcProviders: [cernOIDCProvider],
diff --git a/src/component-library/demos/01_2_Login_multi_account.stories.tsx b/src/component-library/demos/01_2_Login_multi_account.stories.tsx
index 5924f5a28..54c4bb16e 100644
--- a/src/component-library/demos/01_2_Login_multi_account.stories.tsx
+++ b/src/component-library/demos/01_2_Login_multi_account.stories.tsx
@@ -52,6 +52,7 @@ export const Playbook_Multi_Account: Story = {
     args: {
         loginViewModel: {
             status: 'success',
+            userpassEnabled: true,
             x509Enabled: true,
             oidcEnabled: true,
             oidcProviders: [cernOIDCProvider],
diff --git a/src/component-library/pages/legacy/Login/Login.stories.tsx b/src/component-library/pages/legacy/Login/Login.stories.tsx
index 3846fd03d..4a709ab86 100644
--- a/src/component-library/pages/legacy/Login/Login.stories.tsx
+++ b/src/component-library/pages/legacy/Login/Login.stories.tsx
@@ -51,6 +51,7 @@ export const LoginPage = Template.bind({});
 LoginPage.args = {
     loginViewModel: {
         status: 'success',
+        userpassEnabled: true,
         x509Enabled: true,
         oidcEnabled: true,
         oidcProviders: [cernOIDCProvider],
diff --git a/src/component-library/pages/legacy/Login/Login.tsx b/src/component-library/pages/legacy/Login/Login.tsx
index e2f4f6be8..d567c88e8 100644
--- a/src/component-library/pages/legacy/Login/Login.tsx
+++ b/src/component-library/pages/legacy/Login/Login.tsx
@@ -101,7 +101,6 @@ export const Login = ({
     oidcSubmitHandler: handleOIDCSubmit,
 }: LoginPageProps) => {
     const isLoggedIn = loginViewModel.isLoggedIn && loginViewModel.accountActive !== undefined;
-
     const [showUserPassLoginForm, setShowUserPassLoginForm] = useState<boolean>(false);
 
     const [selectedVOTab, setSelectedVOTab] = useState<number>(1);
@@ -226,59 +225,62 @@ export const Login = ({
                         )}
 
                         <Button label="x509" onClick={() => submitX509(inputAccount)} />
-
-                        <Button
-                            label="Userpass"
-                            onClick={() => {
-                                setShowUserPassLoginForm(!showUserPassLoginForm);
-                            }}
-                        />
-                        <form>
-                            <fieldset
-                                className={twMerge('flex flex-col space-y-2', 'mx-2 md:mx-10', showUserPassLoginForm ? '' : 'hidden')}
-                                aria-label="Userpass Login Fields"
-                                id="userpass-form"
-                            >
-                                <div className={twMerge('flex flex-col space-y-1')}>
-                                    <LabelledInput
-                                        label="Username"
-                                        idinput="username-input"
-                                        updateFunc={(data: string) => {
-                                            setUsername(data);
-                                        }}
-                                    />
-                                    <LabelledInput
-                                        label="Password"
-                                        idinput="password-input"
-                                        updateFunc={(data: string) => {
-                                            setPassword(data);
-                                        }}
-                                        password={true}
-                                    />
+                        {loginViewModel.userpassEnabled && (
+                            <div id="userpass-login">
+                                <Button
+                                    label="Userpass"
+                                    onClick={() => {
+                                        setShowUserPassLoginForm(!showUserPassLoginForm);
+                                    }}
+                                />
+                                <form>
+                                    <fieldset
+                                        className={twMerge('flex flex-col space-y-2', 'mx-2 md:mx-10', showUserPassLoginForm ? '' : 'hidden')}
+                                        aria-label="Userpass Login Fields"
+                                        id="userpass-form"
+                                    >
+                                        <div className={twMerge('flex flex-col space-y-1')}>
+                                            <LabelledInput
+                                                label="Username"
+                                                idinput="username-input"
+                                                updateFunc={(data: string) => {
+                                                    setUsername(data);
+                                                }}
+                                            />
+                                            <LabelledInput
+                                                label="Password"
+                                                idinput="password-input"
+                                                updateFunc={(data: string) => {
+                                                    setPassword(data);
+                                                }}
+                                                password={true}
+                                            />
+                                            <LabelledInput
+                                                label="Account"
+                                                idinput="account-input"
+                                                updateFunc={(data: string) => {
+                                                    setInputAccount(data);
+                                                }}
+                                            />
+                                        </div>
+                                        <Button label="Login" type="submit" role="button" onClick={() => submitUserPass(inputAccount)} />
+                                    </fieldset>
+                                </form>
+                                <fieldset
+                                    className={twMerge('mx-2 md:mx-10', !showUserPassLoginForm ? 'block' : 'hidden')}
+                                    aria-label="Choose Account Name"
+                                    id="all-accounts"
+                                >
                                     <LabelledInput
                                         label="Account"
-                                        idinput="account-input"
+                                        idinput="account-input-nouserpass"
                                         updateFunc={(data: string) => {
                                             setInputAccount(data);
                                         }}
                                     />
-                                </div>
-                                <Button label="Login" type="submit" role="button" onClick={() => submitUserPass(inputAccount)} />
-                            </fieldset>
-                        </form>
-                        <fieldset
-                            className={twMerge('mx-2 md:mx-10', !showUserPassLoginForm ? 'block' : 'hidden')}
-                            aria-label="Choose Account Name"
-                            id="all-accounts"
-                        >
-                            <LabelledInput
-                                label="Account"
-                                idinput="account-input-nouserpass"
-                                updateFunc={(data: string) => {
-                                    setInputAccount(data);
-                                }}
-                            />
-                        </fieldset>
+                                </fieldset>
+                            </div>
+                        )}
                     </div>
                 </div>
             </div>
diff --git a/src/lib/core/dto/login-config-dto.ts b/src/lib/core/dto/login-config-dto.ts
index 05a223018..32d5fce1d 100644
--- a/src/lib/core/dto/login-config-dto.ts
+++ b/src/lib/core/dto/login-config-dto.ts
@@ -2,6 +2,7 @@ import { BaseDTO } from '@/lib/sdk/dto';
 import { OIDCProvider, VO } from '@/lib/core/entity/auth-models';
 
 export interface LoginConfigDTO extends BaseDTO {
+    userpassEnabled: boolean;
     x509Enabled: boolean;
     oidcEnabled: boolean;
     multiVOEnabled: boolean;
diff --git a/src/lib/core/port/secondary/env-config-gateway-output-port.ts b/src/lib/core/port/secondary/env-config-gateway-output-port.ts
index bb844f8df..1a77ed21b 100644
--- a/src/lib/core/port/secondary/env-config-gateway-output-port.ts
+++ b/src/lib/core/port/secondary/env-config-gateway-output-port.ts
@@ -42,6 +42,11 @@ export default interface EnvConfigGatewayOutputPort {
      */
     x509Enabled(): Promise<boolean>;
 
+    /**
+     * @returns true if userpass is enabled, false otherwise.
+     */
+    userpassEnabled(): Promise<boolean>;
+    
     /**
      * @returns the URL of the Rucio Auth service
      * @throws {@link ConfigNotFound} if RUCIO_AUTH_HOST is not found
diff --git a/src/lib/core/use-case/login-config-usecase.ts b/src/lib/core/use-case/login-config-usecase.ts
index 083f4f739..e2f9d6106 100644
--- a/src/lib/core/use-case/login-config-usecase.ts
+++ b/src/lib/core/use-case/login-config-usecase.ts
@@ -29,6 +29,7 @@ class LoginConfigUseCase
                 this.envConfigGateway.voList(),
                 this.envConfigGateway.oidcProviders(),
                 this.envConfigGateway.rucioAuthHost(),
+                this.envConfigGateway.userpassEnabled(),
             ]);
             const responseModel: LoginConfigDTO = {
                 status: 'success',
@@ -38,6 +39,7 @@ class LoginConfigUseCase
                 voList: config[3],
                 oidcProviders: config[4],
                 rucioAuthHost: config[5],
+                userpassEnabled: config[6],
             };
             return responseModel;
         } catch (error) {
@@ -53,6 +55,7 @@ class LoginConfigUseCase
                 errorName: type,
                 x509Enabled: false,
                 oidcEnabled: false,
+                userpassEnabled: false,
                 multiVOEnabled: false,
                 voList: [],
                 oidcProviders: [],
@@ -95,6 +98,7 @@ class LoginConfigUseCase
             data: {
                 status: 'success',
                 x509Enabled: dto.x509Enabled,
+                userpassEnabled: dto.userpassEnabled,
                 oidcEnabled: dto.oidcEnabled,
                 multiVOEnabled: dto.multiVOEnabled,
                 voList: dto.voList,
diff --git a/src/lib/core/usecase-models/login-config-usecase-models.ts b/src/lib/core/usecase-models/login-config-usecase-models.ts
index 5a92bf347..1914d2a65 100644
--- a/src/lib/core/usecase-models/login-config-usecase-models.ts
+++ b/src/lib/core/usecase-models/login-config-usecase-models.ts
@@ -4,6 +4,7 @@ import { OIDCProvider, VO } from '../entity/auth-models';
 /**
  * Response Model for {@link LoginConfigOutputPort}
  * @property x509Enabled: true if x509 login is enabled
+ * @property userpassEnabled: true if userpass login is enabled
  * @property oidcEnabled: true if oidc login is enabled
  * @property oidcProviders: List of oidc providers
  * @property multiVOEnabled: true if multi vo login is enabled
@@ -11,6 +12,7 @@ import { OIDCProvider, VO } from '../entity/auth-models';
  */
 export interface LoginConfigResponse extends BaseResponseModel {
     x509Enabled: boolean;
+    userpassEnabled: boolean;
     oidcEnabled: boolean;
     oidcProviders: OIDCProvider[];
     multiVOEnabled: boolean;
diff --git a/src/lib/infrastructure/gateway/env-config-gateway.ts b/src/lib/infrastructure/gateway/env-config-gateway.ts
index 1c897c8cd..432c8fec4 100644
--- a/src/lib/infrastructure/gateway/env-config-gateway.ts
+++ b/src/lib/infrastructure/gateway/env-config-gateway.ts
@@ -154,6 +154,14 @@ class EnvConfigGateway implements EnvConfigGatewayOutputPort {
         return Promise.resolve(true);
     }
 
+    async userpassEnabled(): Promise<boolean> {
+        const value = await this.get('ENABLE_USERPASS_LOGIN');
+        if (value === 'true' || value === 'True' || value === 'TRUE') {
+            return Promise.resolve(true);
+        }
+        return Promise.resolve(false);
+    }
+    
     async ruleActivity(): Promise<string> {
         const value = await this.get('RULE_ACTIVITY');
         // Return a default value if the environmental variable is not specified
diff --git a/src/lib/infrastructure/presenter/login-config-presenter.ts b/src/lib/infrastructure/presenter/login-config-presenter.ts
index 8872e6db3..6e93f57a4 100644
--- a/src/lib/infrastructure/presenter/login-config-presenter.ts
+++ b/src/lib/infrastructure/presenter/login-config-presenter.ts
@@ -22,6 +22,7 @@ export default class LoginConfigPresenter
         }
         const viewModel: LoginViewModel = {
             status: 'success',
+            userpassEnabled: responseModel.userpassEnabled,
             x509Enabled: responseModel.x509Enabled,
             oidcEnabled: responseModel.oidcEnabled,
             multiVOEnabled: responseModel.multiVOEnabled,
@@ -38,7 +39,8 @@ export default class LoginConfigPresenter
     convertErrorModelToViewModel(errorModel: LoginConfigError): { viewModel: LoginViewModel; status: number } {
         const viewModel: LoginViewModel = {
             status: 'error',
-            x509Enabled: true,
+            userpassEnabled: false,
+            x509Enabled: false,
             oidcEnabled: false,
             multiVOEnabled: false,
             voList: [],