diff options
Diffstat (limited to 'src/app/shared')
4 files changed, 39 insertions, 16 deletions
diff --git a/src/app/shared/components/navigation/navigation.component.spec.ts b/src/app/shared/components/navigation/navigation.component.spec.ts index 2d4aafe..ead4b78 100644 --- a/src/app/shared/components/navigation/navigation.component.spec.ts +++ b/src/app/shared/components/navigation/navigation.component.spec.ts @@ -1,7 +1,7 @@ /* ============LICENSE_START========================================== =================================================================== -Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved. =================================================================== Unless otherwise specified, all software contained herein is licensed @@ -91,7 +91,7 @@ describe('NavigationComponent', () => { it('should go to /vnfs/list if url = vnfs and userId is not null or undefined', inject([Router],(router: Router) => { let navigateSpy = spyOn(router, 'navigate'); - localStorage['userId'] = 'testingId'; + sessionStorage['userId'] = 'testingId'; let testUrl = 'vnfs'; component.gotoDetail(testUrl); @@ -99,7 +99,7 @@ describe('NavigationComponent', () => { it('should go to /vnfs if url = vnfs and userId is null or undefined', inject([Router],(router: Router) => { let navigateSpy = spyOn(router, 'navigate'); - localStorage['userId'] = ''; + sessionStorage['userId'] = ''; let testUrl = 'vnfs'; component.gotoDetail(testUrl); diff --git a/src/app/shared/components/navigation/navigation.component.ts b/src/app/shared/components/navigation/navigation.component.ts index 7271bb1..424a002 100644 --- a/src/app/shared/components/navigation/navigation.component.ts +++ b/src/app/shared/components/navigation/navigation.component.ts @@ -1,7 +1,7 @@ /* ============LICENSE_START========================================== =================================================================== -Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved. Copyright (C) 2018 IBM Intellectual Property. All rights reserved. =================================================================== @@ -36,7 +36,7 @@ export class NavigationComponent implements OnInit { //@ViewChild(GoldenConfigurationComponent) goldenConfig: GoldenConfigurationComponent; @Input() id: string; userLoggedIn = false; - userId: string = localStorage['userId']; + userId: string = sessionStorage['userId']; subscription: Subscription; constructor(private router: Router) { @@ -49,7 +49,7 @@ export class NavigationComponent implements OnInit { if (value != null && value != '' && value != undefined && value != 'undefined') { this.userId = value; this.userLoggedIn = true; - localStorage['userId'] = this.userId; + sessionStorage['userId'] = this.userId; } else { this.logout(); } @@ -58,7 +58,7 @@ export class NavigationComponent implements OnInit { } ngOnInit() { - this.userId = localStorage['userId']; + this.userId = sessionStorage['userId']; if (this.userId != undefined && this.userId != '') { this.userLoggedIn = true; } @@ -99,7 +99,7 @@ export class NavigationComponent implements OnInit { gotoDetail(url) { if (url == 'vnfs') { - if (localStorage['userId'] != undefined && localStorage['userId'] != '' && localStorage['userId'] != null) { + if (sessionStorage['userId'] != undefined && sessionStorage['userId'] != '' && sessionStorage['userId'] != null) { this.router.navigate(['/vnfs/list']); } else { this.router.navigate(url); @@ -122,4 +122,4 @@ export class NavigationComponent implements OnInit { } -}
\ No newline at end of file +} diff --git a/src/app/shared/services/httpUtil/http-util.service.ts b/src/app/shared/services/httpUtil/http-util.service.ts index fc9c327..40c1518 100644 --- a/src/app/shared/services/httpUtil/http-util.service.ts +++ b/src/app/shared/services/httpUtil/http-util.service.ts @@ -1,7 +1,7 @@ /* ============LICENSE_START========================================== =================================================================== -Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved. =================================================================== Unless otherwise specified, all software contained herein is licensed @@ -54,5 +54,28 @@ export class HttpUtilService { .post(req.url, req.data, this.options) .map((res: Response) => res.json()) } + + postWithAuth(req) { + var authString = sessionStorage['auth']; + if(authString === undefined || authString === null || authString.length === 0){ + this.options = new RequestOptions({ + headers: new Headers({ + 'Content-Type': 'application/json' + }) + }); + } else { + this.options = new RequestOptions({ + headers: new Headers({ + 'Content-Type': 'application/json', + 'Authorization': 'Basic ' + authString + }) + }); + } + + return this + .http + .post(req.url, req.data, this.options) + .map((res: Response) => res.json()) + } } diff --git a/src/app/shared/services/utilityService/utility.service.ts b/src/app/shared/services/utilityService/utility.service.ts index 6b29a2e..54ea76b 100644 --- a/src/app/shared/services/utilityService/utility.service.ts +++ b/src/app/shared/services/utilityService/utility.service.ts @@ -1,7 +1,7 @@ /* ============LICENSE_START========================================== =================================================================== -Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved. =================================================================== Copyright (C) 2018 IBM. =================================================================== @@ -131,8 +131,8 @@ export class UtilityService { public createPayLoadForSave(artifactType,vnfType,action,fileName, versionNo, artifactContent) { - let userId=localStorage['userId']; - let apiToken=localStorage['apiToken'] + let userId=sessionStorage['userId']; + let apiToken=sessionStorage['apiToken'] let newPayload:any; switch(artifactType) { @@ -187,14 +187,14 @@ export class UtilityService { let payload:any; if(isReference) { payload=JSON.parse(sessionStorage.getItem('updateParams')); - payload['userID'] = localStorage['userId']; + payload['userID'] = sessionStorage['userId']; payload = JSON.stringify(payload); } - else payload = '{"userID": "' + localStorage['userId'] + '","action": "' + action + '", "vnf-type" : "' + vnfType + '", "artifact-type":"APPC-CONFIG", "artifact-name":"' + fileName + '"}'; + else payload = '{"userID": "' + sessionStorage['userId'] + '","action": "' + action + '", "vnf-type" : "' + vnfType + '", "artifact-type":"APPC-CONFIG", "artifact-name":"' + fileName + '"}'; let data = { 'input': { 'design-request': { - 'request-id': localStorage['apiToken'], + 'request-id': sessionStorage['apiToken'], 'action': 'getArtifact', 'payload': payload } |