alt/zot-wo-auth
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove --or-- divider if social login is not enabled (#418)

Browse Source 
Signed-off-by: Andreea-Lupu <andreealupu1470@yahoo.com>
This commit is contained in:
Andreea Lupu 2024-01-30 10:11:38 +02:00 committed by GitHub
parent 5bf7d5652c
commit 9358539e0c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/__tests__/LoginPage/SignIn.test.js
View File

@ -7,7 +7,7 @@ import userEvent from '@testing-library/user-event';
const mockMgmtResponse = { const mockMgmtResponse = {
distSpecVersion: '1.1.0-dev', distSpecVersion: '1.1.0-dev',
binaryType: '-apikey-lint-metrics-mgmt-scrub-search-sync-ui-userprefs', binaryType: '-apikey-lint-metrics-mgmt-scrub-search-sync-ui-userprefs',
http: { auth: { htpasswd: {} } } http: { auth: { htpasswd: {}, openid: { providers: { github: {} } } } }
}; };
// useNavigate mock // useNavigate mock
@ -55,6 +55,7 @@ describe('Sign in form', () => {
fireEvent.change(passwordInput, { target: { value: 'test' } }); fireEvent.change(passwordInput, { target: { value: 'test' } });
expect(usernameInput).toHaveValue('test'); expect(usernameInput).toHaveValue('test');
expect(passwordInput).toHaveValue('test'); expect(passwordInput).toHaveValue('test');
expect(screen.getByTestId('openid-divider')).toBeInTheDocument();
}); });
it('should display error if username and password values are empty after change', async () => { it('should display error if username and password values are empty after change', async () => {

8
src/components/Login/SignIn.jsx
View File

@ -312,7 +312,13 @@ export default function SignIn({ isLoggedIn, setIsLoggedIn, wrapperSetLoading =
Welcome back! Please login. Welcome back! Please login.
</Typography> </Typography>
{renderThirdPartyLoginMethods()} {renderThirdPartyLoginMethods()}
{Object.keys(authMethods).length > 1 && <Divider className={classes.divider}>or</Divider>} {Object.keys(authMethods).length > 1 &&
Object.keys(authMethods).includes('openid') &&
Object.keys(authMethods.openid.providers).length > 0 && (
<Divider className={classes.divider} data-testId="openid-divider">
or
</Divider>
)}
{Object.keys(authMethods).includes('htpasswd') && ( {Object.keys(authMethods).includes('htpasswd') && (
<Box component="form" onSubmit={null} noValidate autoComplete="off"> <Box component="form" onSubmit={null} noValidate autoComplete="off">
<TextField <TextField