Merge branch 'master' of...

Merge branch 'master' of https://git.garr.it/eosc-pillar/ffds/ffds-register-front into feature/mapping

src/app/authentication/services/token-storage.service.ts

@@ -24,6 +24,9 @@ export class TokenStorageService {
   public getToken(): string {
     return window.sessionStorage.getItem(TOKEN_KEY);
   }
+  public getFDPToken(): string  {
+    return window.sessionStorage.getItem(F2DS_TOKEN_KEY);
+  }
 
   public saveUser(user): void {
     window.sessionStorage.removeItem(USER_KEY);

src/app/repository/services/publish-repository.service.ts

@@ -61,11 +61,11 @@ export class PublishRepositoryService {
   }
 
   async addUserCatalog(catId: string): Promise<any> {
-    const tokenResponse = await this.authService.getF2DSAuthToken().toPromise();
+    const tokenResponse = this.tokenService.getToken;
     const user = this.tokenService.getUser();
 
     return this.http.post(this.smartApiUrl + '/user/' + user.email + '/catalogs', catId,
-      { headers: { Authorization: 'Bearer ' + tokenResponse.token } })
+      { headers: { Authorization: 'Bearer ' + tokenResponse } })
       .toPromise();
   }
 

src/app/services/catalog.service.ts

-import { HttpClient } from '@angular/common/http';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { AppConfiguration } from '../AppConfiguration';
 import { environment } from 'src/environments/environment';
@@ -22,6 +22,17 @@ export interface FdpApiResponseItem {
 })
 export class CatalogService {
 
+  httpOptionsSmartHarvester = {
+    headers: new HttpHeaders({
+      'Authorization': 'Bearer '+ this.tokenService.getToken()
+    })
+  };
+  httpOptionsFDP = {
+    headers: new HttpHeaders({
+      'Authorization': 'Bearer '+ this.tokenService.getFDPToken()
+    })
+  };
+
   constructor(
     private appConfig: AppConfiguration,
     private tokenService: TokenStorageService,
@@ -34,10 +45,10 @@ export class CatalogService {
 
   getAllCatalogId() {
     const user = this.tokenService.getUser();
-    return this.http.get<{ catId: string, uuid: string }[]>(this.smartApiUrl + '/user/' + user.email + '/catalogs');
+    return this.http.get<{ catId: string, uuid: string }[]>(this.smartApiUrl + '/user/' + user.email + '/catalogs', this.httpOptionsSmartHarvester);
   }
 
   getCatalogContentById(catId: string) {
-    return this.http.get<FdpApiResponseItem[]>(this.appConfig.fdpurl + '/catalog/' + catId);
+    return this.http.get<FdpApiResponseItem[]>(this.appConfig.fdpurl + '/catalog/' + catId, this.httpOptionsFDP);
   }
 }