mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2026-09-09 18:03:21 +00:00
some fix for usernames
This commit is contained in:
@@ -300,11 +300,11 @@ export class BasicAlfrescoAuthService extends BaseAuthenticationService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getBpmUsername(): string {
|
getBpmUsername(): string {
|
||||||
return this.contentAuth.authentications.basicAuth.username;
|
return this.processAuth.getUsername();
|
||||||
}
|
}
|
||||||
|
|
||||||
getEcmUsername(): string {
|
getEcmUsername(): string {
|
||||||
return this.processAuth.authentications.basicAuth.username;
|
return this.contentAuth.getUsername();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -79,6 +79,10 @@ export class ContentAuth {
|
|||||||
this.storageService.setItem('ACS_USERNAME', username);
|
this.storageService.setItem('ACS_USERNAME', username);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getUsername() {
|
||||||
|
return this.storageService.getItem('ACS_USERNAME');
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* login Alfresco API
|
* login Alfresco API
|
||||||
* @param username: // Username to login
|
* @param username: // Username to login
|
||||||
|
|||||||
@@ -64,6 +64,10 @@ export class ProcessAuth {
|
|||||||
this.storageService.setItem('APS_USERNAME', username);
|
this.storageService.setItem('APS_USERNAME', username);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getUsername() {
|
||||||
|
return this.storageService.getItem('APS_USERNAME');
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* login Activiti API
|
* login Activiti API
|
||||||
* @param username: // Username to login
|
* @param username: // Username to login
|
||||||
@@ -166,7 +170,7 @@ export class ProcessAuth {
|
|||||||
* @param ticket
|
* @param ticket
|
||||||
* */
|
* */
|
||||||
setTicket(ticket: string) {
|
setTicket(ticket: string) {
|
||||||
if(ticket && ticket !=='null') {
|
if (ticket && ticket !== 'null') {
|
||||||
this.authentications.basicAuth.ticket = ticket;
|
this.authentications.basicAuth.ticket = ticket;
|
||||||
this.authentications.basicAuth.password = null;
|
this.authentications.basicAuth.password = null;
|
||||||
this.config.ticketBpm = ticket;
|
this.config.ticketBpm = ticket;
|
||||||
@@ -188,7 +192,7 @@ export class ProcessAuth {
|
|||||||
* Get the current Ticket
|
* Get the current Ticket
|
||||||
* */
|
* */
|
||||||
getToken(): string {
|
getToken(): string {
|
||||||
if(!this.ticket){
|
if (!this.ticket) {
|
||||||
this.onError.next('error');
|
this.onError.next('error');
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user