Refactor for PR

This commit is contained in:
Vito Albano
2016-10-13 18:18:50 +01:00
parent cc6a685bc4
commit 0a539e9fdd
11 changed files with 289 additions and 199 deletions

View File

@@ -37,26 +37,18 @@ export class BpmUserService {
* @param userName - the user name
*/
getCurrentUserInfo(): Observable<BpmUserModel> {
if (this.authService.isBpmLoggedIn()) {
return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.profileApi.getProfile())
.map(
(data) => <BpmUserModel> data
)
.catch(this.handleError);
}
return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.profileApi.getProfile())
.map((data) => <BpmUserModel> data)
.catch(this.handleError);
}
getCurrentUserProfileImage(): Observable<any> {
if (this.authService.isBpmLoggedIn()) {
return Observable.fromPromise(this.callGetProfilePictureApi())
.map(
(data) => data
)
.catch(this.handleError);
}
return Observable.fromPromise(this.callGetProfilePictureApi())
.map((data) => data)
.catch(this.handleError);
}
callGetProfilePictureApi() {
private callGetProfilePictureApi() {
return this.authService.getAlfrescoApi().activiti.profileApi.getProfilePicture();
}