#3527 fix - Added logout button and routing refactoring

rsanchez

2017-03-16 abaf75fb294a796fc6c99904ab3b47a2367a3792

#3527 fix - Added logout button and routing refactoring 

 securis/src/main/webapp/src/app/app.routes.ts
..
..
@@ -8,8 +8,10 @@
8
8
 import { LoginFormComponent } from './login.form.component';
9
9
 
10
10
 const routes: Routes = [
11
- // {path: '', redirectTo: '/packs', pathMatch: 'full'}, 
12
-  {path: 'menu', component: MenuComponent,
11
+  {path: 'public',  component: NoMenuComponent, children: [
12
+    {path: 'login', component: LoginFormComponent },
13
+  },
14
+  {path: '', component: MenuComponent,
13
15
     children: [
14
16
         {path: 'packs', children: [
15
17
           {path: '', component: PackListComponent },
..
..
@@ -17,11 +19,6 @@
17
19
         ]}
18
20
     ]
19
21
   },
20
-  {path: 'nomenu', component: NoMenuComponent,
21
-    children: [
22
-      {path: 'login', component: LoginFormComponent }
23
-    ]
24
-  }
25
22
 
26
23
 ];
27
24
 /*    {path: 'product', component: DashboardProductComponent, children: [
 securis/src/main/webapp/src/app/footer.component.html
..
..
@@ -1,7 +1,6 @@
1
-  <td-layout-footer>
2
1
 	<div layout="row" layout-align="start center" flex>
3
2
 		<div flex layout="row" layout-align="start center">v.  {{securisVersion}}</div>
4
3
 		<div flex layout="row" layout-align="center center"><a href="http://www.curistec.com/" target="_blank">CurisTec</a>&nbsp;©2017</div>
5
4
 		<div flex></div>
6
5
 	</div>
7
-  </td-layout-footer>
6
+  
 securis/src/main/webapp/src/app/home.component.ts
..
..
@@ -53,7 +53,6 @@
53
53
   }
54
54
 
55
55
   ngOnInit(): void {
56
-      this.router.navigateByUrl('nomenu/login');
57
56
   }
58
57
 
59
58
   ngAfterViewInit(): void {
 securis/src/main/webapp/src/app/license.list.component.html
..
..
@@ -66,7 +66,7 @@
66
66
         </div>
67
67
       </template>
68
68
     </td-data-table>
69
-    <td-paging-bar #pagingBar [pageSizes]="[10, 20, 40]" [total]="filteredTotal" (change)="page($event)" [hidden]="pagingBar.total <= pagingBar.pageSize" >
69
+    <td-paging-bar #pagingBar [pageSizes]="[10, 20, 40]" [total]="filteredTotal" (change)="page($event)" [hidden]="pagingBar.total <= 10" >
70
70
       <span i18n td-paging-bar-label hide-xs>Rows per page:</span> {{pagingBar.range}} <span hide-xs>of {{pagingBar.total}}</span>
71
71
     </td-paging-bar>
72
72
   </div>
 securis/src/main/webapp/src/app/login.form.component.ts
..
..
@@ -26,7 +26,7 @@
26
26
   public login() {
27
27
     this.userService.login(this.data.username, this.data.password).subscribe(
28
28
       token => {
29
-        this.router.navigateByUrl("menu/packs");
29
+        this.router.navigateByUrl("packs");
30
30
       },
31
31
       errMsg => this.toaster.error(errMsg, 'Login error'));
32
32
   }
 securis/src/main/webapp/src/app/menu.component.html
..
..
@@ -31,8 +31,16 @@
31
31
   </md-nav-list>
32
32
 
33
33
 <td-layout-nav toolbarTitle="SeCuris" logo="assets:logo-white">
34
+  <div td-toolbar-content layout="row" layout-align="start center" flex>
35
+    <span flex ></span>
36
+    <button md-icon-button (click)="logout()">
37
+        <md-icon color="white">exit_to_app</md-icon>
38
+    </button>
39
+  </div>
34
40
 	<router-outlet></router-outlet>
35
-  <app-footer></app-footer>
41
+  <td-layout-footer>
42
+    <app-footer></app-footer>
43
+  </td-layout-footer>
36
44
 </td-layout-nav>
37
45
 </td-layout>
38
46
 
 securis/src/main/webapp/src/app/menu.component.ts
..
..
@@ -22,10 +22,16 @@
22
22
       this.userService.isLoggedIn().subscribe(authOk => {
23
23
         let isLoggedIn = authOk.valueOf();
24
24
         if (!isLoggedIn) {
25
-          this.router.navigateByUrl('nomenu/login');
25
+          this.router.navigateByUrl('public/login');
26
+        } else {
27
+          this.router.navigate(['packs']);
26
28
         }
27
29
       }  , 
28
-      err => /* Show message */ this.router.navigateByUrl('nomenu/login'));  
30
+      err => /* Show message */ this.router.navigateByUrl('public/login'));  
31
+  }
32
+
33
+  public logout() {
34
+    this.userService.logout();
29
35
   }
30
36
 
31
37
   public closeMenu() {
 securis/src/main/webapp/src/app/nomenu.component.html
..
..
@@ -1,4 +1,6 @@
1
1
 <td-layout-nav toolbarTitle="SeCuris" logo="assets:logo-white">
2
2
 	<router-outlet></router-outlet>
3
-  <app-footer></app-footer>
3
+	<td-layout-footer>
4
+		<app-footer></app-footer>
5
+	</td-layout-footer>
4
6
 </td-layout-nav>
 securis/src/main/webapp/src/app/pack.list.component.html
..
..
@@ -49,7 +49,7 @@
49
49
         </div>
50
50
       </template>
51
51
     </td-data-table>
52
-    <td-paging-bar #pagingBar [pageSizes]="[10, 20, 40]" [total]="filteredTotal" (change)="page($event)" [hidden]="pagingBar.total <= pagingBar.pageSize">
52
+    <td-paging-bar #pagingBar [pageSizes]="[10, 20, 40]" [total]="filteredTotal" (change)="page($event)" [hidden]="pagingBar.total <= 10">
53
53
       <span td-paging-bar-label hide-xs>Rows per page:</span> {{pagingBar.range}} <span hide-xs>of {{pagingBar.total}}</span>
54
54
     </td-paging-bar>
55
55
   </div>
 securis/src/main/webapp/src/app/user.service.ts
..
..
@@ -27,14 +27,14 @@
27
27
     params.append('password', password);
28
28
     let options = new RequestOptions({ headers: new Headers({ "Content-Type": "application/x-www-form-urlencoded" })});
29
29
     return this.http.post('user/login', params.toString(), options)
30
-                    .map(this.mapLogin)
30
+                    .map((resp) => this.mapLogin(resp))
31
31
                     .catch(this.handleError);
32
32
   }
33
33
 
34
-  private mapLogin(res : Response) {
34
+  private mapLogin(res : Response) : string {
35
35
     let data = res.json();
36
-    //this.store.set('username', data.username);
37
-		//this.store.set('token', data.token);
36
+    this.store.set('username', data.username);
37
+		this.store.set('token', data.token);
38
38
     return <string>data.token;
39
39
   }    
40
40
 
..
..
@@ -45,16 +45,16 @@
45
45
     var token = this.store.get("token");
46
46
     let option = new RequestOptions({ headers: new Headers({ 'X-SECURIS-TOKEN': token }) });
47
47
     return this.http.get('check', option)
48
-                    .map(this.mapCheck)
48
+                    .map((resp) => this.mapCheck(resp))
49
49
                     .catch(this.handleError);
50
50
   }
51
51
 
52
-  private mapCheck(res : Response) {
53
-    let body = res.json();
54
-    if (body.valid) {
55
-      //this.store.set('user', body.user);
52
+  private mapCheck(res : Response) : boolean {
53
+    let data = res.json();
54
+    if (data.valid) {
55
+      this.store.set('user', data.user);
56
56
     }
57
-    return body.valid;
57
+    return data.valid;
58
58
   }  
59
59
 
60
60
   existsToken() : Boolean {
..
..
@@ -63,10 +63,8 @@
63
63
 
64
64
   logout() : void {
65
65
     this.store.remove('user', 'token');
66
-    this.router.navigate(['Login']);
66
+    this.router.navigate(['public/login']);
67
67
   }
68
-
69
-
70
68
 
71
69
 
72
70
   private handleError (error: Response | any) {