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

take ip from settings

Browse Source
This commit is contained in:
Mario Romano
2016-06-01 16:50:20 +01:00
parent bf63eace1b
commit 0e4076f268
4 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ng2-components/ng2-alfresco-core/ng2-alfresco-core.ts
View File

@@ -19,14 +19,14 @@ import {AlfrescoSettingsService} from './src/services/AlfrescoSettingsService.se
import { AlfrescoTranslationLoader } from './src/services/AlfrescoTranslationLoader.service'; import { AlfrescoTranslationLoader } from './src/services/AlfrescoTranslationLoader.service';
import { AlfrescoTranslationService } from './src/services/AlfrescoTranslationService.service'; import { AlfrescoTranslationService } from './src/services/AlfrescoTranslationService.service';
import { AlfrescoPipeTranslate } from './src/services/AlfrescoPipeTranslate.service'; import { AlfrescoPipeTranslate } from './src/services/AlfrescoPipeTranslate.service';
import { AlfrescoAuthenticationService } from './src/services/alfresco-authentication.service'; import { AlfrescoAuthenticationService } from './src/services/AlfrescoAuthenticationService.service';
export * from './src/services/AlfrescoSettingsService.service'; export * from './src/services/AlfrescoSettingsService.service';
export * from './src/services/AlfrescoTranslationLoader.service'; export * from './src/services/AlfrescoTranslationLoader.service';
export * from './src/services/AlfrescoTranslationService.service'; export * from './src/services/AlfrescoTranslationService.service';
export * from './src/services/AlfrescoPipeTranslate.service'; export * from './src/services/AlfrescoPipeTranslate.service';
export * from './src/material/MaterialDesignLiteUpgradeElement'; export * from './src/material/MaterialDesignLiteUpgradeElement';
export * from './src/services/alfresco-authentication.service'; export * from './src/services/AlfrescoAuthenticationService.service';
export const ALFRESCO_CORE_PROVIDERS: [any] = [ export const ALFRESCO_CORE_PROVIDERS: [any] = [
AlfrescoAuthenticationService, AlfrescoAuthenticationService,

3
ng2-components/ng2-alfresco-core/src/services/alfresco-authentication.service.spec.ts → ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationService.service.spec.ts
View File

@@ -19,7 +19,7 @@ import { it, describe, beforeEach } from 'angular2/testing';
import { provide, Injector } from 'angular2/core'; import { provide, Injector } from 'angular2/core';
import { Http, HTTP_PROVIDERS, XHRBackend, Response, ResponseOptions } from 'angular2/http'; import { Http, HTTP_PROVIDERS, XHRBackend, Response, ResponseOptions } from 'angular2/http';
import { MockBackend } from 'angular2/http/testing'; import { MockBackend } from 'angular2/http/testing';
import { AlfrescoAuthenticationService } from './alfresco-authentication.service'; import { AlfrescoAuthenticationService } from './AlfrescoAuthenticationService.service';
describe('AlfrescoAuthentication', () => { describe('AlfrescoAuthentication', () => {
@@ -115,4 +115,3 @@ describe('AlfrescoAuthentication', () => {
}); });
}); });

16
ng2-components/ng2-alfresco-core/src/services/alfresco-authentication.service.ts → ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationService.service.ts
View File

@@ -18,6 +18,7 @@
import { Injectable } from 'angular2/core'; import { Injectable } from 'angular2/core';
import { Observable } from 'rxjs/Rx'; import { Observable } from 'rxjs/Rx';
import { Http, Headers, Response } from 'angular2/http'; import { Http, Headers, Response } from 'angular2/http';
import { AlfrescoSettingsService } from './AlfrescoSettingsService.service';
/** /**
* The AlfrescoAuthenticationService provide the login service and store the token in the localStorage * The AlfrescoAuthenticationService provide the login service and store the token in the localStorage
@@ -26,22 +27,25 @@ import { Http, Headers, Response } from 'angular2/http';
export class AlfrescoAuthenticationService { export class AlfrescoAuthenticationService {
token: string; token: string;
private _host: string = 'http://192.168.99.100:8080'; private _authUrl: string = '/alfresco/api/-default-/public/authentication/versions/1';
private _baseUrl: string = this._host + '/alfresco/api/-default-/public/authentication/versions/1';
/** /**
* Constructor * Constructor
* @param http * @param http
*/ */
constructor(public http: Http) { constructor(public http: Http, private alfrescoSettingsService: AlfrescoSettingsService) {
this.token = localStorage.getItem('token'); this.token = localStorage.getItem('token');
} }
getBaseUrl(): string {
return this.alfrescoSettingsService.host + this._authUrl;
}
/** /**
* The method return tru if the user is logged in * The method return tru if the user is logged in
* @returns {boolean} * @returns {boolean}
*/ */
isLoggedIn() { isLoggedIn(): boolean {
return !!localStorage.getItem('token'); return !!localStorage.getItem('token');
} }
@@ -68,7 +72,7 @@ export class AlfrescoAuthenticationService {
headers.append('Content-Type', 'application/json'); headers.append('Content-Type', 'application/json');
headers.append('Accept', 'application/json'); headers.append('Accept', 'application/json');
return this.http.post(this._baseUrl + '/tickets', credentials, { return this.http.post(this.getBaseUrl() + '/tickets', credentials, {
headers: headers headers: headers
}) })
.map((res: any) => { .map((res: any) => {
@@ -90,7 +94,7 @@ export class AlfrescoAuthenticationService {
headers.append('Content-Type', 'application/json'); headers.append('Content-Type', 'application/json');
headers.append('Authorization', 'Basic ' + btoa(this.token)); headers.append('Authorization', 'Basic ' + btoa(this.token));
return this.http.delete(this._baseUrl + '/tickets/-me-', { return this.http.delete(this.getBaseUrl() + '/tickets/-me-', {
headers: headers headers: headers
}) })
.map((res: any) => { .map((res: any) => {