HIPCMS-424 updated guards, updated menu

HiP-App · Aug 30, 2016 · 36acdc9 · 36acdc9
1 parent f70b157
commit 36acdc9
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 161 deletions.
diff --git a/app/app.routes.ts b/app/app.routes.ts
diff --git a/app/shared/auth/admin-guard.ts b/app/shared/auth/admin-guard.ts
@@ -7,51 +7,28 @@ import {
 } from '@angular/router';
 
 import { UserService } from './../user/user.service';
-import { User } from '../user/user.model';
-import { CmsApiService } from '../api/cms-api.service';
-import { Observable } from 'rxjs/Rx';
 
 @Injectable()
 export class AdminGuard implements CanActivate {
-  constructor(private cmsApiService: CmsApiService, private router: Router) {
+  constructor(private userService: UserService, private router: Router) {
   }
 
   canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
-    return this.cmsApiService.getUrl('/api/Users/Current', {})
-      .map(
-        value => {
-          if ((<User> value.json()).role === 'Administrator') {
-            return true;
-          } else {
-            this.router.navigate(['/dashboard']);
-            return false;
-          }
+    return this.userService.getCurrent().then(
+      user => {
+        if (user.role === 'Administrator') {
+          return true;
+        } else {
+          this.router.navigate(['/dashboard']);
+          return false;
         }
-      ).catch(this.handleError);
-    /*
-     this.userService.getCurrent().then(
-     user => {
-     if (user.role === 'Administrator') {
-     return true;
-     } else {
-     this.router.navigate(['/dashboard']);
-     return false;
-     }
-     }
-     ).catch(
-     error => {
-     console.log(error);
-     this.router.navigate(['/dashboard']);
-     return false;
-     }
-     ); */
-  }
-
-  handleError(error: any) {
-    console.log(error);
-    this.router.navigate(['/dashboard']);
-    let errMsg = (error.message) ? error.message :
-      error.status ? `${error.status} - ${error.statusText}` : 'Server error';
-    return Observable.throw(errMsg);
+      }
+    ).catch(
+      error => {
+        console.log(error);
+        this.router.navigate(['/dashboard']);
+        return false;
+      }
+    );
   }
 }
diff --git a/app/shared/auth/auth-guard.ts b/app/shared/auth/auth-guard.ts
@@ -13,7 +13,7 @@ export class AuthGuard implements CanActivate {
   constructor(private authService: AuthService, private router: Router) { }
 
   canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
-    if (!this.authService.loggedIn) {
+    if (!this.authService.isLoggedIn()) {
       this.router.navigate(['/login']);
       return false;
     }

diff --git a/app/shared/auth/supervisor-guard.ts b/app/shared/auth/supervisor-guard.ts
@@ -7,56 +7,28 @@ import {
 } from '@angular/router';
 
 import { UserService } from './../user/user.service';
-import { User } from '../user/user.model';
-import { CmsApiService } from '../api/cms-api.service';
-import { Observable } from 'rxjs/Rx';
 
 @Injectable()
 export class SupervisorGuard implements CanActivate {
-  constructor(private cmsApiService: CmsApiService, private router: Router) {
+  constructor(private userService: UserService, private router: Router) {
   }
 
   canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
-    return this.cmsApiService.getUrl('/api/Users/Current', {})
-      .map(
-        value => {
-          console.log(value.json());
-          if ((<User> value.json()).role === 'Supervisor' || (<User> value.json()).role === 'Administrator') {
-            return true;
-          } else {
-            this.router.navigate(['/dashboard']);
-            return false;
-          }
+    return this.userService.getCurrent().then(
+      user => {
+        if (user.role === 'Supervisor' || user.role === 'Administrator') {
+          return true;
+        } else {
+          this.router.navigate(['/dashboard']);
+          return false;
         }
-      ).catch(this.handleError);
-
-    // Use code below as soon we updated Angular
-    /*
-     this.userService.getCurrent().then(
-     user => {
-     if (user.role === 'Supervisor') {
-     return true;
-     } else {
-     console.log('ELSE');
-     this.router.navigate(['/dashboard']);
-     return false;
-     }
-     }
-     ).catch(
-     error => {
-     console.log(error);
-     this.router.navigate(['/dashboard']);
-     return false;
-     }
-     );
-     */
-  }
-
-  handleError(error: any) {
-    console.log(error);
-    this.router.navigate(['/dashboard']);
-    let errMsg = (error.message) ? error.message :
-      error.status ? `${error.status} - ${error.statusText}` : 'Server error';
-    return Observable.throw(errMsg);
+      }
+    ).catch(
+      error => {
+        console.log(error);
+        this.router.navigate(['/dashboard']);
+        return false;
+      }
+    );
   }
 }
diff --git a/app/shared/sidenav/sidenav.component.ts b/app/shared/sidenav/sidenav.component.ts
@@ -35,8 +35,10 @@ import { TranslateService } from '../translate/translate.service';
 export class SidenavComponent implements OnInit {
   opened = false;
   mode = 'side';
+  additionalMenuAdded = false;
 
-  navigation = [
+  navigation: any[] = [];
+  studentNavigation = [
     {
       'link': '/dashboard',
       'name': 'Dashboard'
@@ -65,14 +67,14 @@ export class SidenavComponent implements OnInit {
 
   ngOnInit() {
     this.isOpened();
-    this.addAdditionalMenu();
     window.onresize = (e) => {
       this.ngZone.run(() => {
         this.isOpened();
       });
     };
     this.router.events.subscribe(() => {
       this.isOpened();
+      this.addAdditionalMenu();
     });
   }
 
@@ -85,9 +87,18 @@ export class SidenavComponent implements OnInit {
   }
 
   addAdditionalMenu() {
+    if (!this.authService.isLoggedIn()) {
+      return;
+    }
     this.userService.getCurrent().then(
       user => {
-        if (user.role === 'Supervisor') {
+        this.navigation = [];
+        if (user.role === 'Student' || user.role === 'Supervisor' || user.role === 'Administrator') {
+          for (let element of this.studentNavigation) {
+            this.navigation.push(element);
+          }
+        }
+        if (user.role === 'Supervisor' || user.role === 'Administrator') {
           for (let element of this.supervisorNavigation) {
             this.navigation.push(element);
           }

diff --git a/app/topics/show-topic/show-topic.component.ts b/app/topics/show-topic/show-topic.component.ts
@@ -58,7 +58,7 @@ export class ShowTopicComponent implements OnInit {
     }
     this.userService.getCurrent().then(
       user => {
-        this.disableEditing = user.role !== 'Supervisor';
+        this.disableEditing = (user.role !== 'Supervisor' || user.role !== 'Administrator');
       }
     );
     console.log(this.topic);