mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-06-30 18:15:11 +00:00
Do redirect before implicit button (#6574)
* Do redirect before implicit * Add unit to implicit and silent * Keep the value as it was before
This commit is contained in:
parent
27f549d0ff
commit
419fc166c4
@ -609,14 +609,13 @@ describe('LoginComponent', () => {
|
|||||||
describe('implicitFlow ', () => {
|
describe('implicitFlow ', () => {
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
appConfigService.config.oauth2 = <OauthConfigModel> { implicitFlow: true };
|
appConfigService.config.oauth2 = <OauthConfigModel> { implicitFlow: true, silentLogin: false };
|
||||||
appConfigService.load();
|
appConfigService.load();
|
||||||
alfrescoApiService.reset();
|
alfrescoApiService.reset();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should not show login username and password if SSO implicit flow is active', async(() => {
|
it('should not show login username and password if SSO implicit flow is active', async(() => {
|
||||||
spyOn(authService, 'isOauth').and.returnValue(true);
|
spyOn(authService, 'isOauth').and.returnValue(true);
|
||||||
|
|
||||||
component.ngOnInit();
|
component.ngOnInit();
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
|
|
||||||
@ -628,6 +627,34 @@ describe('LoginComponent', () => {
|
|||||||
});
|
});
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
it('should not render the implicitFlow button in case silentLogin is enabled', async(() => {
|
||||||
|
spyOn(authService, 'isOauth').and.returnValue(true);
|
||||||
|
appConfigService.config.oauth2 = <OauthConfigModel> { implicitFlow: true, silentLogin: true };
|
||||||
|
|
||||||
|
spyOn(component, 'redirectToImplicitLogin').and.returnValue(Promise.resolve({}));
|
||||||
|
|
||||||
|
component.ngOnInit();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
fixture.whenStable().then(() => {
|
||||||
|
expect(component.implicitFlow).toBe(false);
|
||||||
|
expect(component.redirectToImplicitLogin).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
}));
|
||||||
|
|
||||||
|
it('should render the implicitFlow button in case silentLogin is disabled', async(() => {
|
||||||
|
spyOn(authService, 'isOauth').and.returnValue(true);
|
||||||
|
|
||||||
|
component.ngOnInit();
|
||||||
|
fixture.detectChanges();
|
||||||
|
|
||||||
|
fixture.whenStable().then(() => {
|
||||||
|
expect(component.implicitFlow).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
}));
|
||||||
|
|
||||||
it('should not show the login base auth button', async(() => {
|
it('should not show the login base auth button', async(() => {
|
||||||
spyOn(authService, 'isOauth').and.returnValue(true);
|
spyOn(authService, 'isOauth').and.returnValue(true);
|
||||||
|
|
||||||
|
@ -156,12 +156,10 @@ export class LoginComponent implements OnInit, OnDestroy {
|
|||||||
|
|
||||||
if (this.authService.isOauth()) {
|
if (this.authService.isOauth()) {
|
||||||
const oauth: OauthConfigModel = this.appConfig.get<OauthConfigModel>(AppConfigValues.OAUTHCONFIG, null);
|
const oauth: OauthConfigModel = this.appConfig.get<OauthConfigModel>(AppConfigValues.OAUTHCONFIG, null);
|
||||||
if (oauth && oauth.implicitFlow) {
|
|
||||||
this.implicitFlow = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (oauth && oauth.silentLogin) {
|
if (oauth && oauth.silentLogin) {
|
||||||
this.alfrescoApiService.getInstance().oauth2Auth.implicitLogin();
|
this.redirectToImplicitLogin();
|
||||||
|
} else if (oauth && oauth.implicitFlow) {
|
||||||
|
this.implicitFlow = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -191,6 +189,10 @@ export class LoginComponent implements OnInit, OnDestroy {
|
|||||||
this.onSubmit(this.form.value);
|
this.onSubmit(this.form.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
redirectToImplicitLogin() {
|
||||||
|
this.alfrescoApiService.getInstance().oauth2Auth.implicitLogin();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Method called on submit form
|
* Method called on submit form
|
||||||
* @param values
|
* @param values
|
||||||
|
Loading…
x
Reference in New Issue
Block a user