1 files changed, 21 insertions, 4 deletions

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.ts
index 7bf5c649..8cfcdbe4 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/components/header/header.component.ts
@@ -38,9 +38,8 @@
 import { Component, OnInit } from '@angular/core';
 import { Router, NavigationEnd } from '@angular/router';
 import { HeaderService } from '../../../shared/services/header/header.service';
-import { UserService } from 'src/app/shared/services/user/user.service';
-import { User } from 'src/app/shared/services/user/user';
 import { CookieService } from 'ngx-cookie-service';
+import { environment } from 'src/environments/environment';
 
 @Component({
     selector: 'app-header',
@@ -57,9 +56,18 @@ export class HeaderComponent implements OnInit {
     userName;
     appName:string;
     showHeader:boolean = true;
+    logOutURL = environment.baseUrl;
 
 
-        constructor(public router: Router,public headerService: HeaderService,public cookieService: CookieService) {
+    constructor(public router: Router,public headerService: HeaderService,public cookieService: CookieService) {
+
+        if(window.location.pathname.split('/').length > 3) {
+            var portNum = ( window.location.port === '' || window.location.port === '0' ) ?  '' : ':'+ window.location.port;
+            this.logOutURL = window.location.protocol + "//" + window.location.hostname + portNum + window.location.pathname.substring(0, this.nthIndex(window.location.pathname, "/", 2) + 0) + '/logout.htm';
+        } else {
+            this.logOutURL = environment.baseUrl + 'logout.htm';                        
+        }
+        
 
         this.router.events.subscribe(val => {
             if (
@@ -78,7 +86,7 @@ export class HeaderComponent implements OnInit {
         } 
 
         this.pushRightClass = 'push-right';
-        this.appName= 'ONAP Portal' ;
+        this.appName= 'Portal SDK' ;
         let result = this.headerService.getTopMenuItems();
           result.subscribe(res => {
               this.response = res;
@@ -103,4 +111,13 @@ export class HeaderComponent implements OnInit {
     onLoggedout() {
         localStorage.removeItem('isLoggedin');
     }
+
+    nthIndex(str, pat, n) {
+        var L = str.length, i = -1;
+        while (n-- && i++ < L) {
+          i = str.indexOf(pat, i);
+          if (i < 0) break;
+        }
+        return i;
+    }
 }