pull request for #17

SNIA · Mar 6, 2018 · 06763d2 · 06763d2
1 parent 6f2590c
commit 06763d2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/views/src/app/add-emulator/addEmulator.component.ts b/views/src/app/add-emulator/addEmulator.component.ts
@@ -59,8 +59,9 @@ export class AddEmulatorComponent implements OnInit{
         };
         this.homeService.setIpAddress( this.addForm.value['sysName']);
         this.homeService.getAuthToken(credentials).subscribe(res => {
-            this.homeService.setAuthHeader(res.headers.get('X-Auth-Token'),res.headers.get('Cookie-Headers'),res.headers.get('location'));
+            this.homeService.setAuthHeader(res.headers.get('X-Auth-Token'),res.headers.get('Cookie-Headers'),res.headers.get('Location'));
             sessionStorage.setItem(this.addForm.value['sysName'],res.headers.get('Cookie-Headers'));
+            sessionStorage.setItem(this.addForm.value['sysName']+'Location',res.headers.get('Location'));
             this.IPInfo.emit({'IPAddress': this.addForm.value['sysName'],'DomainName':this.addForm.value['domainName']});
         },
           (error) => {

diff --git a/views/src/app/home/home.component.ts b/views/src/app/home/home.component.ts
@@ -90,8 +90,9 @@ export class HomeComponent   {
     }
   }
   public clearSessions() {
-    sessionStorage.clear();
-    this.homeService.deleteSession().subscribe(res => {
+
+    this.homeService.deleteSession().subscribe(res => { 
+		sessionStorage.clear();
     });
   }
   IPInfo(data: any) {
@@ -199,12 +200,12 @@ export class HomeComponent   {
     this.breadCrumKey = new routeParamsPipe().transform(value);
   }
     logout() {
-       localStorage.removeItem('user-token');
-       sessionStorage.clear();
       this.homeService.deleteSession().subscribe(res => {
-
+        localStorage.removeItem('user-token');
+        sessionStorage.clear();
+        this.router.navigate(['']);
       });
-      this.router.navigate(['']);
+
     }
 
     onAddDevice() {

diff --git a/views/src/app/home/list-data.html b/views/src/app/home/list-data.html
@@ -102,15 +102,15 @@
 
 <div class="list-menu" *ngIf="addServices"  id="addChildServices" #addCollection >
   <div class="resContainer">
-    <label>Add Collection</label>
+    <label>Add  To Collection</label>
     <span class="glyphicon glyphicon-remove" style="float: right;top:10px;font-size:14px;cursor:pointer" (click)="addServices = false"></span>
   </div>
   <div class="main-menu">
     <div style="padding:10px">
       <div>
         <form class="form-horizontal" [formGroup]="addService">
           <div class="form-group">
-            <label  class="col-sm-5 control-label">Collection Name</label>
+            <label  class="col-sm-5 control-label">Name</label>
             <div class="col-sm-7">
               <input type="text" class="form-control"  formControlName="serviceName">
             </div>

diff --git a/views/src/app/home/shared/home.service.ts b/views/src/app/home/shared/home.service.ts
@@ -28,6 +28,7 @@ import 'rxjs/add/operator/map';
 import {Http, Response, Headers, RequestOptions} from '@angular/http';
 import {Observable} from "rxjs";
 
+
 @Injectable()
 export class HomeService {
     constructor(private http: Http) {
@@ -100,7 +101,8 @@ export class HomeService {
           .catch((error:any) => Observable.throw(error.json().error || 'Server error'));
     }
     deleteSession() {
-      return this.http.delete('/deleteSession?Ip='+this.locIp).catch((error:any) =>
+      var locationHeader = sessionStorage.getItem(this.DEVICE_URL.replace('http://','')+'Location');
+      return this.http.delete('/deleteSession?Ip='+locationHeader).catch((error:any) =>
       Observable.throw(error.json().error || 'Server error')
       );
     }