From 6a2899d4802f908a042acd5aaabd713dbe1b84f3 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Thu, 28 Jul 2016 10:11:42 +0100 Subject: [PATCH] Fix authentication ticket for BPM - for now basic auth is used as a token --- .../ng2-activiti-form/src/services/form.service.ts | 4 +++- .../src/services/AlfrescoAuthenticationBPM.service.ts | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ng2-components/ng2-activiti-form/src/services/form.service.ts b/ng2-components/ng2-activiti-form/src/services/form.service.ts index 686a74743e..7942d71e3c 100644 --- a/ng2-components/ng2-activiti-form/src/services/form.service.ts +++ b/ng2-components/ng2-activiti-form/src/services/form.service.ts @@ -18,6 +18,7 @@ import { Injectable } from '@angular/core'; import { Response, Http, Headers, RequestOptions } from '@angular/http'; import { Observable } from 'rxjs/Rx'; +import { AlfrescoAuthenticationService } from 'ng2-alfresco-core'; import { FormValues } from './../components/widgets/widget.model'; import { AlfrescoSettingsService } from 'ng2-alfresco-core'; @@ -25,6 +26,7 @@ import { AlfrescoSettingsService } from 'ng2-alfresco-core'; export class FormService { constructor(private http: Http, + private authService: AlfrescoAuthenticationService, private alfrescoSettingsService: AlfrescoSettingsService) { } @@ -98,7 +100,7 @@ export class FormService { return new Headers({ 'Accept': 'application/json', 'Content-Type': 'application/json', - 'Authorization': 'Basic ' + btoa('admin' + ':' + 'admin') + 'Authorization': this.authService.getTicket('BPM') }); } diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationBPM.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationBPM.service.ts index 25572be09a..5c5a316fc6 100644 --- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationBPM.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationBPM.service.ts @@ -44,7 +44,10 @@ export class AlfrescoAuthenticationBPM extends AlfrescoAuthenticationBase implem login(username: string, password: string): Observable { return Observable.fromPromise(this.apiActivitiLogin(username, password)) .map((response: any) => { - return {type: this.TYPE, ticket: response.status}; + return { + type: this.TYPE, + ticket: 'Basic ' + btoa(`${username}:${password}`) + }; }) .catch(this.handleError); }