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

Login dialog shows error for Safari with Private Window mode (#1172)

Browse Source 
* #958 new StorageService service

abstraction around ‘Storage’ to allow switching to in-memory store
whenever ‘localStorage’ is not available (i.e. private/incognito modes,
etc.)

* fix unit tests

* update unit tests

- disable incorrect auth tests (core)
- simplify widget visibility tests (activiti-form)

* fix unit tests
This commit is contained in:
Denys Vuika
2016-11-30 11:32:16 +00:00
committed by Eugenio Romano
parent 94dad585b1
commit da70a72bba
33 changed files with 494 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,13 +18,14 @@
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Rx';
import { AlfrescoSettingsService } from './AlfrescoSettings.service';
import { StorageService } from './storage.service';
import { AlfrescoApiService } from './AlfrescoApi.service';
import * as alfrescoApi from 'alfresco-js-api';
import { AlfrescoApi } from 'alfresco-js-api';
import { Subject } from 'rxjs/Subject';
/**
* The AlfrescoAuthenticationService provide the login service and store the ticket in the localStorage
* The AlfrescoAuthenticationService provide the login service and store the ticket in the Storage
*/
@Injectable()
export class AlfrescoAuthenticationService {
@@ -41,7 +42,8 @@ export class AlfrescoAuthenticationService {
* @param apiService
*/
constructor(private settingsService: AlfrescoSettingsService,
private apiService: AlfrescoApiService) {
private apiService: AlfrescoApiService,
private storage: StorageService) {
this.alfrescoApi = <AlfrescoApi>new alfrescoApi({
provider: this.settingsService.getProviders(),
ticketEcm: this.getTicketEcm(),
@@ -107,7 +109,7 @@ export class AlfrescoAuthenticationService {
}
/**
* The method remove the ticket from the local storage
* The method remove the ticket from the Storage
*
* @returns {Observable<R>|Observable<T>}
*/
@@ -133,47 +135,39 @@ export class AlfrescoAuthenticationService {
}
/**
* Remove the login ticket from localStorage
* Remove the login ticket from Storage
*/
public removeTicket(): void {
localStorage.removeItem('ticket-ECM');
localStorage.removeItem('ticket-BPM');
this.storage.removeItem('ticket-ECM');
this.storage.removeItem('ticket-BPM');
}
/**
* The method return the ECM ticket stored in the localStorage
* The method return the ECM ticket stored in the Storage
* @returns ticket
*/
public getTicketEcm(): string {
if (localStorage.getItem('ticket-ECM')) {
return localStorage.getItem('ticket-ECM');
} else {
return null;
}
public getTicketEcm(): string | null {
return this.storage.getItem('ticket-ECM');
}
/**
* The method return the BPM ticket stored in the localStorage
* The method return the BPM ticket stored in the Storage
* @returns ticket
*/
public getTicketBpm(): string {
if (localStorage.getItem('ticket-BPM')) {
return localStorage.getItem('ticket-BPM');
} else {
return null;
}
public getTicketBpm(): string | null {
return this.storage.getItem('ticket-BPM');
}
public getTicketEcmBase64(): string {
if (localStorage.getItem('ticket-ECM')) {
return 'Basic ' + btoa(localStorage.getItem('ticket-ECM'));
} else {
return null;
public getTicketEcmBase64(): string | null {
let ticket = this.storage.getItem('ticket-ECM');
if (ticket) {
return 'Basic ' + btoa(ticket);
}
return null;
}
/**
* The method save the ECM and BPM ticket in the localStorage
* The method save the ECM and BPM ticket in the Storage
*/
public saveTickets() {
this.saveTicketEcm();
@@ -181,20 +175,20 @@ export class AlfrescoAuthenticationService {
}
/**
* The method save the ECM ticket in the localStorage
* The method save the ECM ticket in the Storage
*/
public saveTicketEcm(): void {
if (this.alfrescoApi && this.alfrescoApi.getTicketEcm()) {
localStorage.setItem('ticket-ECM', this.alfrescoApi.getTicketEcm());
this.storage.setItem('ticket-ECM', this.alfrescoApi.getTicketEcm());
}
}
/**
* The method save the BPM ticket in the localStorage
* The method save the BPM ticket in the Storage
*/
public saveTicketBpm(): void {
if (this.alfrescoApi && this.alfrescoApi.getTicketBpm()) {
localStorage.setItem('ticket-BPM', this.alfrescoApi.getTicketBpm());
this.storage.setItem('ticket-BPM', this.alfrescoApi.getTicketBpm());
}
}