Strict done!!

overlord/src/app/auth/auth.service.ts

@@ -12,15 +12,15 @@ const JWT_USER = 'JWT_USER';
 
 @Injectable({ providedIn: 'root' })
 export class AuthService {
-  private currentUserSubject: BehaviorSubject<User>;
-  public currentUser: Observable<User>;
+  private currentUserSubject: BehaviorSubject<User | null> = new BehaviorSubject<User | null>(null);
+  public currentUser: Observable<User | null>;
 
   constructor(private http: HttpClient) {
     this.checkStorage();
     this.currentUser = this.currentUserSubject.asObservable();
   }
 
-  static parseJwt(token): User {
+  static parseJwt(token: string): User {
     const base64Url = token.split('.')[1];
     const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
     const jsonPayload = decodeURIComponent(
@@ -42,18 +42,22 @@ export class AuthService {
     });
   }
 
-  checkStorage(): User {
-    const existingToken: User = JSON.parse(localStorage.getItem(JWT_USER));
+  checkStorage(): User | null {
+    const storageToken = localStorage.getItem(JWT_USER);
+    let existingToken: User | null = null;
+    if (storageToken !== null) {
+      existingToken = JSON.parse(storageToken);
+    }
     if (existingToken === null || Date.now() > existingToken.exp * 1000) {
       localStorage.removeItem(JWT_USER);
-      this.currentUserSubject = new BehaviorSubject<User>(null);
+      this.currentUserSubject.next(null);
       return null;
     }
-    this.currentUserSubject = new BehaviorSubject<User>(existingToken);
+    this.currentUserSubject.next(existingToken);
     return existingToken;
   }
 
-  public get user(): User {
+  public get user(): User | null {
     let val = this.currentUserSubject.value;
     if (val == null) {
       return val;
@@ -63,7 +67,7 @@ export class AuthService {
       val = this.checkStorage();
     }
     if (val == null) {
-      return null;
+      return new User();
     }
     expired = Date.now() > val.exp * 1000;
     if (expired) {
@@ -94,7 +98,11 @@ export class AuthService {
   }
 
   needsRefreshing(): boolean {
-    return Date.now() > (this.user.exp - environment.ACCESS_TOKEN_REFRESH_MINUTES * 60) * 1000;
+    const { user } = this;
+    if (user === null) {
+      return true;
+    }
+    return Date.now() > (user.exp - environment.ACCESS_TOKEN_REFRESH_MINUTES * 60) * 1000;
   }
 
   logout() {
@@ -118,4 +126,12 @@ export class AuthService {
         }),
       );
   }
+
+  allowed(permission: string): boolean {
+    const { user } = this;
+    if (user == null || user.perms.indexOf(permission) === -1) {
+      return false;
+    }
+    return true;
+  }
 }

overlord/src/app/auth/login/login.component.ts

@@ -16,8 +16,8 @@ export class LoginComponent implements OnInit, AfterViewInit {
   form: FormGroup;
   hide: boolean;
   showOtp: boolean;
-  clientId: string;
-  private returnUrl: string;
+  clientId = '';
+  private returnUrl = '';
 
   constructor(
     private route: ActivatedRoute,
@@ -42,7 +42,7 @@ export class LoginComponent implements OnInit, AfterViewInit {
 
   ngAfterViewInit() {
     setTimeout(() => {
-      this.nameElement.nativeElement.focus();
+      if (this.nameElement) this.nameElement.nativeElement.focus();
     }, 0);
   }