inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-31 17:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

change ticket storing and remove is login check in the login

Browse Source
This commit is contained in:
Eugenio Romano
2016-08-18 16:50:40 +01:00
parent 6ef1fccf80
commit d9d7b27c64
3 changed files with 38 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts
View File

@@ -69,20 +69,12 @@ export class AlfrescoAuthenticationService {
* @returns {Observable<R>|Observable<T>}
*/
login(username: string, password: string) {
if (this.isLoggedIn()) {
return Observable.create((observer) => {
observer.next({type: this.alfrescoSetting.getProviders(), ticket: this.getTicket()});
observer.complete();
}).catch(this.handleError);
} else {
return Observable.fromPromise(this.callApiLogin(username, password))
.map((response: any) => {
this.saveTicket(response);
return {type: this.alfrescoSetting.getProviders(), ticket: response};
})
.catch(this.handleError);
}
return Observable.fromPromise(this.callApiLogin(username, password))
.map((response: any) => {
this.saveTicket(response);
return {type: this.alfrescoSetting.getProviders(), ticket: response};
})
.catch(this.handleError);
}
/**
@@ -110,13 +102,6 @@ export class AlfrescoAuthenticationService {
.catch(this.handleError);
}
/**
* Remove the login ticket from localStorage
*/
public removeTicket(): void {
localStorage.removeItem(`ticket-${this.alfrescoSetting.getProviders()}`);
}
/**
*
* @returns {*|Observable<string>|Observable<any>|Promise<T>}
@@ -127,12 +112,19 @@ export class AlfrescoAuthenticationService {
}
}
/**
* Remove the login ticket from localStorage
*/
public removeTicket(): void {
localStorage.removeItem('ticket');
}
/**
* The method return the ticket stored in the localStorage
* @returns ticket
*/
public getTicket(): string {
return localStorage.getItem(`ticket-${this.alfrescoSetting.getProviders()}`);
return localStorage.getItem('ticket');
}
/**
@@ -141,7 +133,7 @@ export class AlfrescoAuthenticationService {
*/
public saveTicket(ticket): void {
if (ticket) {
localStorage.setItem(`ticket-${this.alfrescoSetting.getProviders()}`, ticket);
localStorage.setItem('ticket', ticket);
}
}