feat: display or sign in with (#749)

This commit is contained in:
Dmytro
2023-02-20 10:36:04 +02:00
committed by GitHub
parent 1f21a874b8
commit fe34acf314
2 changed files with 162 additions and 6 deletions

View File

@@ -170,12 +170,12 @@ class LoginPage extends React.Component {
return (
<>
{((!isEnterpriseLoginDisabled && isSocialAuthActive) || (isEnterpriseLoginDisabled && isInstitutionAuthActive))
&& (
<div className="mt-4 mb-3 h4">
{intl.formatMessage(messages['login.other.options.heading'])}
</div>
)}
{(isSocialAuthActive || (isEnterpriseLoginDisabled && isInstitutionAuthActive))
&& (
<div className="mt-4 mb-3 h4">
{intl.formatMessage(messages['login.other.options.heading'])}
</div>
)}
{(!isEnterpriseLoginDisabled && isSocialAuthActive) && (
<Hyperlink className="btn btn-link btn-sm text-body p-0 mb-4" destination={this.getEnterPriseLoginURL()}>

View File

@@ -236,6 +236,162 @@ describe('LoginPage', () => {
expect(loginPage.text().includes('Or sign in with:')).toBe(false);
});
it('should show sign-in header providers (ENABLE ENTERPRISE LOGIN)', () => {
mergeConfig({
DISABLE_ENTERPRISE_LOGIN: '',
});
store = mockStore({
...initialState,
commonComponents: {
...initialState.commonComponents,
thirdPartyAuthContext: {
...initialState.commonComponents.thirdPartyAuthContext,
providers: [{
...ssoProvider,
}],
},
},
});
const loginPage = mount(reduxWrapper(<IntlLoginPage {...props} />));
expect(loginPage.text().includes('Or sign in with:')).toBe(true);
expect(loginPage.text().includes('Company or school credentials')).toBe(true);
expect(loginPage.text().includes('Institution/campus credentials')).toBe(false);
});
it('should show sign-in header with providers (DISABLE ENTERPRISE LOGIN)', () => {
mergeConfig({
DISABLE_ENTERPRISE_LOGIN: true,
});
store = mockStore({
...initialState,
commonComponents: {
...initialState.commonComponents,
thirdPartyAuthContext: {
...initialState.commonComponents.thirdPartyAuthContext,
providers: [{
...ssoProvider,
}],
},
},
});
const loginPage = mount(reduxWrapper(<IntlLoginPage {...props} />));
expect(loginPage.text().includes('Or sign in with:')).toBe(true);
expect(loginPage.text().includes('Company or school credentials')).toBe(false);
expect(loginPage.text().includes('Institution/campus credentials')).toBe(false);
mergeConfig({
DISABLE_ENTERPRISE_LOGIN: '',
});
});
it('should not show sign-in header without Providers and secondary Providers (ENABLE ENTERPRISE LOGIN)', () => {
mergeConfig({
DISABLE_ENTERPRISE_LOGIN: '',
});
store = mockStore({
...initialState,
commonComponents: {
...initialState.commonComponents,
thirdPartyAuthContext: {
...initialState.commonComponents.thirdPartyAuthContext,
},
},
});
const loginPage = mount(reduxWrapper(<IntlLoginPage {...props} />));
expect(loginPage.text().includes('Or sign in with:')).toBe(false);
expect(loginPage.text().includes('Company or school credentials')).toBe(false);
expect(loginPage.text().includes('Institution/campus credentials')).toBe(false);
});
it('should not show sign-in header without Providers and secondary Providers (DISABLE ENTERPRISE LOGIN)', () => {
mergeConfig({
DISABLE_ENTERPRISE_LOGIN: true,
});
store = mockStore({
...initialState,
commonComponents: {
...initialState.commonComponents,
thirdPartyAuthContext: {
...initialState.commonComponents.thirdPartyAuthContext,
},
},
});
const loginPage = mount(reduxWrapper(<IntlLoginPage {...props} />));
expect(loginPage.text().includes('Or sign in with:')).toBe(false);
expect(loginPage.text().includes('Company or school credentials')).toBe(false);
expect(loginPage.text().includes('Institution/campus credentials')).toBe(false);
mergeConfig({
DISABLE_ENTERPRISE_LOGIN: '',
});
});
it('should show sign-in header with secondary Providers and without Providers', () => {
mergeConfig({
DISABLE_ENTERPRISE_LOGIN: true,
});
store = mockStore({
...initialState,
commonComponents: {
...initialState.commonComponents,
thirdPartyAuthContext: {
...initialState.commonComponents.thirdPartyAuthContext,
secondaryProviders: [{
...secondaryProviders,
}],
},
},
});
const loginPage = mount(reduxWrapper(<IntlLoginPage {...props} />));
expect(loginPage.text().includes('Or sign in with:')).toBe(true);
expect(loginPage.text().includes('Institution/campus credentials')).toBe(true);
mergeConfig({
DISABLE_ENTERPRISE_LOGIN: '',
});
});
it('should show sign-in header with Providers and secondary Providers', () => {
mergeConfig({
DISABLE_ENTERPRISE_LOGIN: true,
});
store = mockStore({
...initialState,
commonComponents: {
...initialState.commonComponents,
thirdPartyAuthContext: {
...initialState.commonComponents.thirdPartyAuthContext,
providers: [{
...ssoProvider,
}],
secondaryProviders: [{
...secondaryProviders,
}],
},
},
});
const loginPage = mount(reduxWrapper(<IntlLoginPage {...props} />));
expect(loginPage.text().includes('Or sign in with:')).toBe(true);
expect(loginPage.text().includes('Company or school credentials')).toBe(false);
expect(loginPage.text().includes('Institution/campus credentials')).toBe(true);
mergeConfig({
DISABLE_ENTERPRISE_LOGIN: '',
});
});
// ******** test alert messages ********
it('should match login error message', () => {