inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-19 17:14:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #435 from Alfresco/dev-denys-430

Browse Source 
Fix ContentService
This commit is contained in:
Maurizio Vitale 2016-07-15 10:52:26 +01:00 committed by GitHub
commit ab2b3778ef
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationECM.service.ts
View File

@ -28,9 +28,11 @@ export class AlfrescoAuthenticationECM extends AlfrescoAuthenticationBase implem
TYPE: string = 'ECM'; TYPE: string = 'ECM';
alfrescoApi: any; alfrescoApi: any;
/** /**
* Constructor * Constructor
* @param alfrescoSettingsService * @param alfrescoSettingsService
* @param http
*/ */
constructor(private alfrescoSettingsService: AlfrescoSettingsService, constructor(private alfrescoSettingsService: AlfrescoSettingsService,
private http: Http) { private http: Http) {

11
ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationService.service.ts
View File

@ -36,6 +36,7 @@ export class AlfrescoAuthenticationService extends AlfrescoAuthenticationBase {
/** /**
* Constructor * Constructor
* @param alfrescoSettingsService * @param alfrescoSettingsService
* @param http
*/ */
constructor(private alfrescoSettingsService: AlfrescoSettingsService, constructor(private alfrescoSettingsService: AlfrescoSettingsService,
private http: Http) { private http: Http) {
@ -47,6 +48,7 @@ export class AlfrescoAuthenticationService extends AlfrescoAuthenticationBase {
* Method to delegate to POST login * Method to delegate to POST login
* @param username * @param username
* @param password * @param password
* @param providers
* @returns {Observable<R>|Observable<T>} * @returns {Observable<R>|Observable<T>}
*/ */
login(username: string, password: string, providers: string []): Observable<string> { login(username: string, password: string, providers: string []): Observable<string> {
@ -63,6 +65,7 @@ export class AlfrescoAuthenticationService extends AlfrescoAuthenticationBase {
* *
* @param username * @param username
* @param password * @param password
* @param providers
* @returns {Observable<R>|Observable<T>} * @returns {Observable<R>|Observable<T>}
*/ */
private performeLogin(username: string, password: string, providers: string []): Observable<any> { private performeLogin(username: string, password: string, providers: string []): Observable<any> {
@ -104,7 +107,7 @@ export class AlfrescoAuthenticationService extends AlfrescoAuthenticationBase {
/** /**
* Return the ticket stored in the localStorage of the specific provider type * Return the ticket stored in the localStorage of the specific provider type
* @param ticket * @param type
*/ */
public getTicket(type: string = 'ECM'): string { public getTicket(type: string = 'ECM'): string {
let auth: AbstractAuthentication = this.findProviderInstance(type); let auth: AbstractAuthentication = this.findProviderInstance(type);
@ -122,18 +125,16 @@ export class AlfrescoAuthenticationService extends AlfrescoAuthenticationBase {
if (this.providersInstance.length === 0) { if (this.providersInstance.length === 0) {
return Observable.throw('No providers defined'); return Observable.throw('No providers defined');
} else { } else {
return this.performeLogout(); return this.performLogout();
} }
} }
/** /**
* Perform a logout on behalf of the user for the different provider instance * Perform a logout on behalf of the user for the different provider instance
* *
* @param username
* @param password
* @returns {Observable<R>|Observable<T>} * @returns {Observable<R>|Observable<T>}
*/ */
private performeLogout(): Observable<any> { private performLogout(): Observable<any> {
let observableBatch = []; let observableBatch = [];
this.providersInstance.forEach((authInstance) => { this.providersInstance.forEach((authInstance) => {
observableBatch.push(authInstance.logout()); observableBatch.push(authInstance.logout());

4
ng2-components/ng2-alfresco-core/src/services/AlfrescoContentService.service.ts
View File

@ -31,7 +31,7 @@ export class AlfrescoContentService {
* @returns {string} URL address. * @returns {string} URL address.
*/ */
getDocumentThumbnailUrl(document: any): string { getDocumentThumbnailUrl(document: any): string {
return this.authService.alfrescoApi.content.getDocumentThumbnailUrl(document.entry.id); return this.authService.getAlfrescoApi().content.getDocumentThumbnailUrl(document.entry.id);
} }
/** /**
@ -40,6 +40,6 @@ export class AlfrescoContentService {
* @returns {string} URL address. * @returns {string} URL address.
*/ */
getContentUrl(document: any): string { getContentUrl(document: any): string {
return this.authService.alfrescoApi.content.getContentUrl(document.entry.id); return this.authService.getAlfrescoApi().content.getContentUrl(document.entry.id);
} }
} }