inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-26 17:24:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

modify rebase

Browse Source
This commit is contained in:
Eugenio Romano 2016-07-13 00:47:59 +01:00
parent 543d928ec2
commit 0ad32d945d
2 changed files with 35 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationService.service.spec.ts
View File

@ -36,7 +36,7 @@ describe('AlfrescoAuthentication', () => {
resolve({ resolve({
entry: { entry: {
userId: 'fake-username', userId: 'fake-username',
id: 'fake-post-token-ECM' id: 'fake-post-ticket-ECM'
} }
}); });
reject({ reject({
@ -48,7 +48,7 @@ describe('AlfrescoAuthentication', () => {
fakePromiseBPM = new Promise(function (resolve, reject) { fakePromiseBPM = new Promise(function (resolve, reject) {
resolve({ resolve({
status: 'fake-post-token-BPM' status: 'fake-post-ticket-BPM'
}); });
reject({ reject({
response: { response: {
@ -109,7 +109,7 @@ describe('AlfrescoAuthentication', () => {
); );
}); });
it('should return an ECM token after the login done', (done) => { it('should return an ECM ticket after the login done', (done) => {
let providers = ['ECM']; let providers = ['ECM'];
let alfSetting = injector.get(AlfrescoSettingsService); let alfSetting = injector.get(AlfrescoSettingsService);
alfSetting.providers = providers; alfSetting.providers = providers;
@ -120,13 +120,13 @@ describe('AlfrescoAuthentication', () => {
service.login('fake-username', 'fake-password', providers) service.login('fake-username', 'fake-password', providers)
.subscribe(() => { .subscribe(() => {
expect(service.isLoggedIn(providers[0])).toBe(true); expect(service.isLoggedIn(providers[0])).toBe(true);
expect(service.getToken(providers[0])).toEqual('fake-post-token-ECM'); expect(service.getTicket(providers[0])).toEqual('fake-post-ticket-ECM');
done(); done();
} }
); );
}); });
it('should return token undefined when the credentials are wrong', (done) => { it('should return ticket undefined when the credentials are wrong', (done) => {
let providers = ['ECM']; let providers = ['ECM'];
let alfSetting = injector.get(AlfrescoSettingsService); let alfSetting = injector.get(AlfrescoSettingsService);
alfSetting.providers = providers; alfSetting.providers = providers;
@ -142,7 +142,7 @@ describe('AlfrescoAuthentication', () => {
}, },
(err: any) => { (err: any) => {
expect(service.isLoggedIn(providers[0])).toBe(false); expect(service.isLoggedIn(providers[0])).toBe(false);
expect(service.getToken(providers[0])).toBeUndefined(); expect(service.getTicket(providers[0])).toBeUndefined();
done(); done();
} }
); );
@ -186,21 +186,21 @@ describe('AlfrescoAuthentication', () => {
); );
}); });
it('should return a token undefined after logout', (done) => { it('should return a ticket undefined after logout', (done) => {
let providers = ['ECM']; let providers = ['ECM'];
let alfSetting = injector.get(AlfrescoSettingsService); let alfSetting = injector.get(AlfrescoSettingsService);
alfSetting.providers = providers; alfSetting.providers = providers;
service = injector.get(AlfrescoAuthenticationService); service = injector.get(AlfrescoAuthenticationService);
localStorage.setItem('token-ECM', 'fake-post-token-ECM'); localStorage.setItem('ticket-ECM', 'fake-post-ticket-ECM');
service.createProviderInstance(providers); service.createProviderInstance(providers);
spyOn(AlfrescoAuthenticationECM.prototype, 'getDeleteTicketPromise').and.returnValue(fakePromiseECM); spyOn(AlfrescoAuthenticationECM.prototype, 'getDeleteTicketPromise').and.returnValue(fakePromiseECM);
service.logout() service.logout()
.subscribe(() => { .subscribe(() => {
expect(service.isLoggedIn(providers[0])).toBe(false); expect(service.isLoggedIn(providers[0])).toBe(false);
expect(service.getToken(providers[0])).toBeUndefined(); expect(service.getTicket(providers[0])).toBeUndefined();
expect(localStorage.getItem('token-ECM')).toBeUndefined(); expect(localStorage.getItem('ticket-ECM')).toBeUndefined();
done(); done();
} }
); );
@ -252,7 +252,7 @@ describe('AlfrescoAuthentication', () => {
); );
}); });
it('should return an BPM token after the login done', (done) => { it('should return an BPM ticket after the login done', (done) => {
let providers = ['BPM']; let providers = ['BPM'];
let alfSetting = injector.get(AlfrescoSettingsService); let alfSetting = injector.get(AlfrescoSettingsService);
alfSetting.providers = providers; alfSetting.providers = providers;
@ -263,13 +263,13 @@ describe('AlfrescoAuthentication', () => {
service.login('fake-username', 'fake-password', providers) service.login('fake-username', 'fake-password', providers)
.subscribe(() => { .subscribe(() => {
expect(service.isLoggedIn(providers[0])).toBe(true); expect(service.isLoggedIn(providers[0])).toBe(true);
expect(service.getToken(providers[0])).toEqual('fake-post-token-BPM'); expect(service.getTicket(providers[0])).toEqual('fake-post-ticket-BPM');
done(); done();
} }
); );
}); });
it('should return token undefined when the credentials are wrong', (done) => { it('should return ticket undefined when the credentials are wrong', (done) => {
let providers = ['BPM']; let providers = ['BPM'];
let alfSetting = injector.get(AlfrescoSettingsService); let alfSetting = injector.get(AlfrescoSettingsService);
alfSetting.providers = providers; alfSetting.providers = providers;
@ -284,27 +284,27 @@ describe('AlfrescoAuthentication', () => {
}, },
(err: any) => { (err: any) => {
expect(service.isLoggedIn(providers[0])).toBe(false); expect(service.isLoggedIn(providers[0])).toBe(false);
expect(service.getToken(providers[0])).toBeUndefined(); expect(service.getTicket(providers[0])).toBeUndefined();
done(); done();
} }
); );
}); });
it('should return a token undefined after logout', (done) => { it('should return a ticket undefined after logout', (done) => {
let providers = ['BPM']; let providers = ['BPM'];
let alfSetting = injector.get(AlfrescoSettingsService); let alfSetting = injector.get(AlfrescoSettingsService);
alfSetting.providers = providers; alfSetting.providers = providers;
service = injector.get(AlfrescoAuthenticationService); service = injector.get(AlfrescoAuthenticationService);
localStorage.setItem('token-BPM', 'fake-post-token-BPM'); localStorage.setItem('ticket-BPM', 'fake-post-ticket-BPM');
service.createProviderInstance(providers); service.createProviderInstance(providers);
spyOn(AlfrescoAuthenticationBPM.prototype, 'apiActivitiLogout').and.returnValue(fakePromiseBPM); spyOn(AlfrescoAuthenticationBPM.prototype, 'apiActivitiLogout').and.returnValue(fakePromiseBPM);
service.logout() service.logout()
.subscribe(() => { .subscribe(() => {
expect(service.isLoggedIn(providers[0])).toBe(false); expect(service.isLoggedIn(providers[0])).toBe(false);
expect(service.getToken(providers[0])).toBeUndefined(); expect(service.getTicket(providers[0])).toBeUndefined();
expect(localStorage.getItem('token-BPM')).toBeUndefined(); expect(localStorage.getItem('ticket-BPM')).toBeUndefined();
done(); done();
} }
); );
@ -316,7 +316,7 @@ describe('AlfrescoAuthentication', () => {
alfSetting.providers = providers; alfSetting.providers = providers;
service = injector.get(AlfrescoAuthenticationService); service = injector.get(AlfrescoAuthenticationService);
localStorage.setItem('token-BPM', 'fake-post-token-BPM'); localStorage.setItem('ticket-BPM', 'fake-post-ticket-BPM');
service.createProviderInstance(providers); service.createProviderInstance(providers);
spyOn(AlfrescoAuthenticationBPM.prototype, 'apiActivitiLogout').and.returnValue(Promise.reject('fake logout error')); spyOn(AlfrescoAuthenticationBPM.prototype, 'apiActivitiLogout').and.returnValue(Promise.reject('fake logout error'));
@ -328,7 +328,7 @@ describe('AlfrescoAuthentication', () => {
(err: any) => { (err: any) => {
expect(err).toBeDefined(); expect(err).toBeDefined();
expect(err.message).toEqual('fake logout error'); expect(err.message).toEqual('fake logout error');
expect(localStorage.getItem('token-BPM')).toEqual('fake-post-token-BPM'); expect(localStorage.getItem('ticket-BPM')).toEqual('fake-post-ticket-BPM');
done(); done();
} }
); );
@ -361,7 +361,7 @@ describe('AlfrescoAuthentication', () => {
); );
}); });
it('should return both ECM and BPM tokens after the login done', (done) => { it('should return both ECM and BPM tickets after the login done', (done) => {
let providers = ['ECM', 'BPM']; let providers = ['ECM', 'BPM'];
let alfSetting = injector.get(AlfrescoSettingsService); let alfSetting = injector.get(AlfrescoSettingsService);
alfSetting.providers = providers; alfSetting.providers = providers;
@ -374,14 +374,14 @@ describe('AlfrescoAuthentication', () => {
.subscribe(() => { .subscribe(() => {
expect(service.isLoggedIn(providers[0])).toBe(true); expect(service.isLoggedIn(providers[0])).toBe(true);
expect(service.isLoggedIn(providers[1])).toBe(true); expect(service.isLoggedIn(providers[1])).toBe(true);
expect(service.getToken(providers[0])).toEqual('fake-post-token-ECM'); expect(service.getTicket(providers[0])).toEqual('fake-post-ticket-ECM');
expect(service.getToken(providers[1])).toEqual('fake-post-token-BPM'); expect(service.getTicket(providers[1])).toEqual('fake-post-ticket-BPM');
done(); done();
} }
); );
}); });
it('should return token undefined when the credentials are correct for the ECM login but wrong for the BPM login', (done) => { it('should return ticket undefined when the credentials are correct for the ECM login but wrong for the BPM login', (done) => {
let providers = ['ECM', 'BPM']; let providers = ['ECM', 'BPM'];
let alfSetting = injector.get(AlfrescoSettingsService); let alfSetting = injector.get(AlfrescoSettingsService);
alfSetting.providers = providers; alfSetting.providers = providers;
@ -397,15 +397,15 @@ describe('AlfrescoAuthentication', () => {
}, },
(err: any) => { (err: any) => {
expect(service.isLoggedIn(providers[0])).toBe(false); expect(service.isLoggedIn(providers[0])).toBe(false);
expect(service.getToken(providers[0])).toBeUndefined(); expect(service.getTicket(providers[0])).toBeUndefined();
expect(service.isLoggedIn(providers[1])).toBe(false); expect(service.isLoggedIn(providers[1])).toBe(false);
expect(service.getToken(providers[1])).toBeUndefined(); expect(service.getTicket(providers[1])).toBeUndefined();
done(); done();
} }
); );
}); });
it('should return token undefined when the credentials are correct for the BPM login but wrong for the ECM login', (done) => { it('should return ticket undefined when the credentials are correct for the BPM login but wrong for the ECM login', (done) => {
let providers = ['ECM', 'BPM']; let providers = ['ECM', 'BPM'];
let alfSetting = injector.get(AlfrescoSettingsService); let alfSetting = injector.get(AlfrescoSettingsService);
alfSetting.providers = providers; alfSetting.providers = providers;
@ -422,9 +422,9 @@ describe('AlfrescoAuthentication', () => {
}, },
(err: any) => { (err: any) => {
expect(service.isLoggedIn(providers[0])).toBe(false); expect(service.isLoggedIn(providers[0])).toBe(false);
expect(service.getToken(providers[0])).toBeUndefined(); expect(service.getTicket(providers[0])).toBeUndefined();
expect(service.isLoggedIn(providers[1])).toBe(false); expect(service.isLoggedIn(providers[1])).toBe(false);
expect(service.getToken(providers[1])).toBeUndefined(); expect(service.getTicket(providers[1])).toBeUndefined();
done(); done();
} }
); );

40
ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationService.service.ts
View File

@ -26,7 +26,7 @@ import { AlfrescoAuthenticationBase } from './AlfrescoAuthenticationBase.service
declare let AlfrescoApi: any; declare let AlfrescoApi: any;
/** /**
* The AlfrescoAuthenticationService provide the login service and store the token in the localStorage * The AlfrescoAuthenticationService provide the login service and store the ticket in the localStorage
*/ */
@Injectable() @Injectable()
export class AlfrescoAuthenticationService extends AlfrescoAuthenticationBase { export class AlfrescoAuthenticationService extends AlfrescoAuthenticationBase {
@ -78,10 +78,6 @@ export class AlfrescoAuthenticationService extends AlfrescoAuthenticationBase {
return Observable.create(observer => { return Observable.create(observer => {
Observable.forkJoin(observableBatch).subscribe( Observable.forkJoin(observableBatch).subscribe(
(response: any[]) => { (response: any[]) => {
this.performeSaveToken();
/*response.forEach((res) => {
this.performeSaveToken(res.name, res.token);
});*/
observer.next(response); observer.next(response);
}, },
(err: any) => { (err: any) => {
@ -90,14 +86,6 @@ export class AlfrescoAuthenticationService extends AlfrescoAuthenticationBase {
}); });
} }
getAlfrescoApi(): any {
return this.alfrescoApi;
}
getToken(): any {
return this.alfrescoApi.getToeken();
}
/** /**
* The method return true if the user is logged in * The method return true if the user is logged in
* @returns {boolean} * @returns {boolean}
@ -115,35 +103,19 @@ export class AlfrescoAuthenticationService extends AlfrescoAuthenticationBase {
} }
/** /**
* Return the token stored in the localStorage of the specific provider type * Return the ticket stored in the localStorage of the specific provider type
* @param token * @param ticket
*/ */
public getToken(type: string = 'ECM'): string { public getTicket(type: string = 'ECM'): string {
let auth: AbstractAuthentication = this.findProviderInstance(type); let auth: AbstractAuthentication = this.findProviderInstance(type);
if (auth) { if (auth) {
return auth.getToken(); return auth.getTicket();
} }
return ''; return '';
} }
/** /**
* Save the token calling the method of the specific provider type * The method remove the ticket from the local storage
* @param providerName
* @param token
*/
private performeSaveToken() {
/* let auth: AbstractAuthentication = this.findProviderInstance(type);
if (auth) {
auth.saveToken();
}
*/
this.providersInstance.forEach((authInstance) => {
authInstance.saveToken();
});
}
/**
* The method remove the token from the local storage
* @returns {Observable<T>} * @returns {Observable<T>}
*/ */
public logout(): Observable<string> { public logout(): Observable<string> {