From 36170aa56427661d4efac59b041e56fbeb7830fc Mon Sep 17 00:00:00 2001
From: mistahj67 <26472282+mistahj67@users.noreply.github.com>
Date: Wed, 6 Nov 2024 10:07:30 -0700
Subject: [PATCH] BED-4978 feat: add instant redirect if only 1 sso provider is
 configured (#932)

---
 cmd/ui/src/views/Login.tsx                    | 11 +--
 .../components/LoginForm/LoginForm.test.tsx   |  2 +-
 .../src/components/LoginForm/LoginForm.tsx    |  0
 .../src/components/LoginForm/index.ts         |  0
 .../LoginViaSSOForm/LoginViaSSOForm.test.tsx  |  2 +-
 .../LoginViaSSOForm/LoginViaSSOForm.tsx       | 16 ++---
 .../bh-shared-ui/src/components/index.ts      | 71 ++++++++++---------
 7 files changed, 54 insertions(+), 48 deletions(-)
 rename {cmd/ui => packages/javascript/bh-shared-ui}/src/components/LoginForm/LoginForm.test.tsx (98%)
 rename {cmd/ui => packages/javascript/bh-shared-ui}/src/components/LoginForm/LoginForm.tsx (100%)
 rename {cmd/ui => packages/javascript/bh-shared-ui}/src/components/LoginForm/index.ts (100%)

diff --git a/cmd/ui/src/views/Login.tsx b/cmd/ui/src/views/Login.tsx
index a7c831872a..ee9a978e59 100644
--- a/cmd/ui/src/views/Login.tsx
+++ b/cmd/ui/src/views/Login.tsx
@@ -16,11 +16,10 @@
 
 import React, { useEffect, useState } from 'react';
 import { Navigate } from 'react-router-dom';
-import LoginForm from 'src/components/LoginForm';
 import LoginPage from 'src/components/LoginPage';
 import { useQuery, useQueryClient } from 'react-query';
 import { Box, CircularProgress } from '@mui/material';
-import { OneTimePasscodeForm, LoginViaSSOForm, apiClient } from 'bh-shared-ui';
+import { OneTimePasscodeForm, LoginViaSSOForm, LoginForm, apiClient } from 'bh-shared-ui';
 
 import { login as loginAction, logout } from 'src/ducks/auth/authSlice';
 import { ROUTE_HOME, ROUTE_USER_DISABLED } from 'src/ducks/global/routes';
@@ -67,8 +66,8 @@ const Login: React.FC = () => {
         dispatch(loginAction({ username: lastUsername, password: lastPassword, otp }));
     };
 
-    const handleSubmitLoginViaSSOForm = (redirectURL: string) => {
-        window.location.assign(redirectURL);
+    const handleSubmitLoginViaSSOForm = (providerSlug: string) => {
+        window.location.assign(`/api/v2/sso/${providerSlug}/login`);
     };
 
     /* Implementation */
@@ -113,6 +112,10 @@ const Login: React.FC = () => {
     }
 
     if (useSSO) {
+        if (listSSOProvidersQuery.data?.length === 1) {
+            handleSubmitLoginViaSSOForm(listSSOProvidersQuery.data[0].slug);
+            return;
+        }
         return (
             <LoginPage>
                 <LoginViaSSOForm
diff --git a/cmd/ui/src/components/LoginForm/LoginForm.test.tsx b/packages/javascript/bh-shared-ui/src/components/LoginForm/LoginForm.test.tsx
similarity index 98%
rename from cmd/ui/src/components/LoginForm/LoginForm.test.tsx
rename to packages/javascript/bh-shared-ui/src/components/LoginForm/LoginForm.test.tsx
index 02a363e155..e64b7e9b42 100644
--- a/cmd/ui/src/components/LoginForm/LoginForm.test.tsx
+++ b/packages/javascript/bh-shared-ui/src/components/LoginForm/LoginForm.test.tsx
@@ -15,7 +15,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import userEvent from '@testing-library/user-event';
-import { render, screen } from 'src/test-utils';
+import { render, screen } from '../../test-utils';
 
 import LoginForm from './LoginForm';
 
diff --git a/cmd/ui/src/components/LoginForm/LoginForm.tsx b/packages/javascript/bh-shared-ui/src/components/LoginForm/LoginForm.tsx
similarity index 100%
rename from cmd/ui/src/components/LoginForm/LoginForm.tsx
rename to packages/javascript/bh-shared-ui/src/components/LoginForm/LoginForm.tsx
diff --git a/cmd/ui/src/components/LoginForm/index.ts b/packages/javascript/bh-shared-ui/src/components/LoginForm/index.ts
similarity index 100%
rename from cmd/ui/src/components/LoginForm/index.ts
rename to packages/javascript/bh-shared-ui/src/components/LoginForm/index.ts
diff --git a/packages/javascript/bh-shared-ui/src/components/LoginViaSSOForm/LoginViaSSOForm.test.tsx b/packages/javascript/bh-shared-ui/src/components/LoginViaSSOForm/LoginViaSSOForm.test.tsx
index 9d1e0cc302..42be06a211 100644
--- a/packages/javascript/bh-shared-ui/src/components/LoginViaSSOForm/LoginViaSSOForm.test.tsx
+++ b/packages/javascript/bh-shared-ui/src/components/LoginViaSSOForm/LoginViaSSOForm.test.tsx
@@ -110,7 +110,7 @@ describe('LoginViaSSOForm', () => {
         await user.click(screen.getByText(testSSOProviders[0].name));
         expect(screen.getByRole('button', { name: /continue$/i })).not.toBeDisabled();
         await user.click(screen.getByRole('button', { name: /continue$/i }));
-        expect(testOnSubmit).toHaveBeenCalledWith(`/api/v2/sso/${testSSOProviders[0].slug}/login`);
+        expect(testOnSubmit).toHaveBeenCalledWith(testSSOProviders[0].slug);
     });
 
     it('should call onCancel when cancel button clicked', async () => {
diff --git a/packages/javascript/bh-shared-ui/src/components/LoginViaSSOForm/LoginViaSSOForm.tsx b/packages/javascript/bh-shared-ui/src/components/LoginViaSSOForm/LoginViaSSOForm.tsx
index 3865ddbefb..3027ad35cf 100644
--- a/packages/javascript/bh-shared-ui/src/components/LoginViaSSOForm/LoginViaSSOForm.tsx
+++ b/packages/javascript/bh-shared-ui/src/components/LoginViaSSOForm/LoginViaSSOForm.tsx
@@ -21,23 +21,23 @@ import { SSOProvider } from 'js-client-library';
 
 interface LoginViaSSOFormProps {
     providers: SSOProvider[] | undefined;
-    onSubmit: (redirectURL: string) => void;
+    onSubmit: (providerSlug: string) => void;
     onCancel: () => void;
 }
 
 const LoginViaSSOForm: React.FC<LoginViaSSOFormProps> = ({ providers, onSubmit, onCancel }) => {
     /* Hooks */
-    const [redirectURL, setRedirectURL] = React.useState('');
+    const [selectedProviderSlug, setSelectedProviderSlug] = React.useState('');
 
     /* Event Handlers */
     const handleSubmit: React.FormEventHandler<HTMLFormElement> = (e) => {
         e.preventDefault();
 
-        if (redirectURL === null) {
+        if (selectedProviderSlug === null) {
             return;
         }
 
-        onSubmit(redirectURL);
+        onSubmit(selectedProviderSlug);
     };
 
     /* Implementation */
@@ -50,12 +50,12 @@ const LoginViaSSOForm: React.FC<LoginViaSSOFormProps> = ({ providers, onSubmit,
                         <Select
                             labelId='selected-saml-provider-label'
                             id='selected-saml-provider'
-                            value={redirectURL}
+                            value={selectedProviderSlug}
                             label='Choose your SSO Provider'
-                            onChange={(e) => setRedirectURL(e.target.value as string)}
+                            onChange={(e) => setSelectedProviderSlug(e.target.value as string)}
                             fullWidth>
                             {providers?.map((provider) => (
-                                <MenuItem key={provider.id} value={`/api/v2/sso/${provider.slug}/login`}>
+                                <MenuItem key={provider.id} value={provider.slug}>
                                     {provider.name}
                                 </MenuItem>
                             ))}
@@ -63,7 +63,7 @@ const LoginViaSSOForm: React.FC<LoginViaSSOFormProps> = ({ providers, onSubmit,
                     </FormControl>
                 </Grid>
                 <Grid item xs={8}>
-                    <Button size='large' type='submit' className='w-full' disabled={redirectURL === ''}>
+                    <Button size='large' type='submit' className='w-full' disabled={selectedProviderSlug === ''}>
                         CONTINUE
                     </Button>
                     <Box mt={2}>
diff --git a/packages/javascript/bh-shared-ui/src/components/index.ts b/packages/javascript/bh-shared-ui/src/components/index.ts
index b5da950d2e..38bb788996 100644
--- a/packages/javascript/bh-shared-ui/src/components/index.ts
+++ b/packages/javascript/bh-shared-ui/src/components/index.ts
@@ -14,9 +14,17 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
+export { default as ApiVersion } from './ApiVersion';
+
 export * from './AppNotifications';
 export { default as AppNotifications } from './AppNotifications';
 
+export * from './AssetGroupEdit';
+export { default as AssetGroupEdit } from './AssetGroupEdit';
+
+export * from './AssetGroupMemberList';
+export { default as AssetGroupMemberList } from './AssetGroupMemberList';
+
 export * from './CardWithSwitch';
 export { default as CardWithSwitch } from './CardWithSwitch';
 
@@ -47,12 +55,26 @@ export { default as CreateSAMLProviderDialog } from './CreateSAMLProviderDialog'
 export * from './CreateSAMLProviderForm';
 export { default as CreateSAMLProviderForm } from './CreateSAMLProviderForm';
 
+export * from './CreateUserForm';
+export { default as CreateUserForm } from './CreateUserForm';
+
+export * from './CreateUserDialog';
+export { default as CreateUserDialog } from './CreateUserDialog';
+
 export * from './DataTable';
 export { default as DataTable } from './DataTable';
 
 export * from './Disable2FADialog';
 export { default as Disable2FADialog } from './Disable2FADialog';
 
+export * from './DocumentationLinks';
+export { default as DocumentationLinks } from './DocumentationLinks';
+
+export * from './DropdownSelector';
+export { default as DropdownSelector } from './DropdownSelector';
+
+export { default as EdgeInfoComponents } from './HelpTexts/index';
+
 export * from './Enable2FADialog';
 export { default as Enable2FADialog } from './Enable2FADialog';
 
@@ -62,6 +84,9 @@ export { default as EnterpriseIcon } from './EnterpriseIcon';
 export * from './FeatureFlag';
 export { default as FeatureFlag } from './FeatureFlag';
 
+export * from './FileIngest';
+export { default as FileIngest } from './FileIngest';
+
 export * from './FileUploadDialog';
 export { default as FileUploadDialog } from './FileUploadDialog';
 
@@ -80,7 +105,8 @@ export { default as GraphMenu } from './GraphMenu';
 export * from './GraphProgress';
 export { default as GraphProgress } from './GraphProgress';
 
-export { default as EdgeInfoComponents } from './HelpTexts/index';
+export * from './GroupManagementContent';
+export { default as GroupManagementContent } from './GroupManagementContent';
 
 export * from './HighlightedText';
 export { default as HighlightedText } from './HighlightedText';
@@ -97,6 +123,12 @@ export { default as LabelWithCopy } from './LabelWithCopy';
 export * from './LoadingOverlay';
 export { default as LoadingOverlay } from './LoadingOverlay';
 
+export * from './LoginViaSSOForm';
+export { default as LoginViaSSOForm } from './LoginViaSSOForm';
+
+export * from './LoginForm';
+export { default as LoginForm } from './LoginForm';
+
 export * from './MenuItem';
 export { default as MenuItem } from './MenuItem';
 
@@ -138,43 +170,14 @@ export { default as SetupKeyDialog } from './SetupKeyDialog';
 export * from './TextWithFallback';
 export { default as TextWithFallback } from './TextWithFallback';
 
-export * from './UserTokenManagementDialog';
-export { default as UserTokenManagementDialog } from './UserTokenManagementDialog';
-
-export * from './AssetGroupMemberList';
-export { default as AssetGroupMemberList } from './AssetGroupMemberList';
-
-export * from './DropdownSelector';
-export { default as DropdownSelector } from './DropdownSelector';
-
-export * from './AssetGroupEdit';
-export { default as AssetGroupEdit } from './AssetGroupEdit';
-
-export * from './GroupManagementContent';
-export { default as GroupManagementContent } from './GroupManagementContent';
-
-export * from './FileIngest';
-export { default as FileIngest } from './FileIngest';
-
-export * from './WebGLDisabledAlert';
-export { default as WebGLDisabledAlert } from './WebGLDisabledAlert';
-
-export * from './DocumentationLinks';
-export { default as DocumentationLinks } from './DocumentationLinks';
-
 export * from './UpdateUserDialog';
 export { default as UpdateUserDialog } from './UpdateUserDialog';
 
 export * from './UpdateUserForm';
 export { default as UpdateUserForm } from './UpdateUserForm';
 
-export * from './LoginViaSSOForm';
-export { default as LoginViaSSOForm } from './LoginViaSSOForm';
-
-export * from './CreateUserForm';
-export { default as CreateUserForm } from './CreateUserForm';
-
-export * from './CreateUserDialog';
-export { default as CreateUserDialog } from './CreateUserDialog';
+export * from './UserTokenManagementDialog';
+export { default as UserTokenManagementDialog } from './UserTokenManagementDialog';
 
-export { default as ApiVersion } from './ApiVersion';
+export * from './WebGLDisabledAlert';
+export { default as WebGLDisabledAlert } from './WebGLDisabledAlert';