1 files changed, 93 insertions, 87 deletions

diff --git a/client/src/app/core/auth/auth-user.model.ts b/client/src/app/core/auth/auth-user.model.ts
index 1a31a7834..65c37bcfa 100644
--- a/client/src/app/core/auth/auth-user.model.ts
+++ b/client/src/app/core/auth/auth-user.model.ts
@@ -1,6 +1,66 @@
 // Do not use the barrel (dependency loop)
 import { UserRole } from '../../../../../shared/models/user.model'
-import { User } from '../../shared/users/user.model';
+import { User } from '../../shared/users/user.model'
+
+export type TokenOptions = {
+  accessToken: string
+  refreshToken: string
+  tokenType: string
+}
+
+// Private class only used by User
+class Tokens {
+  private static KEYS = {
+    ACCESS_TOKEN: 'access_token',
+    REFRESH_TOKEN: 'refresh_token',
+    TOKEN_TYPE: 'token_type'
+  }
+
+  accessToken: string
+  refreshToken: string
+  tokenType: string
+
+  static load () {
+    const accessTokenLocalStorage = localStorage.getItem(this.KEYS.ACCESS_TOKEN)
+    const refreshTokenLocalStorage = localStorage.getItem(this.KEYS.REFRESH_TOKEN)
+    const tokenTypeLocalStorage = localStorage.getItem(this.KEYS.TOKEN_TYPE)
+
+    if (accessTokenLocalStorage && refreshTokenLocalStorage && tokenTypeLocalStorage) {
+      return new Tokens({
+        accessToken: accessTokenLocalStorage,
+        refreshToken: refreshTokenLocalStorage,
+        tokenType: tokenTypeLocalStorage
+      })
+    }
+
+    return null
+  }
+
+  static flush () {
+    localStorage.removeItem(this.KEYS.ACCESS_TOKEN)
+    localStorage.removeItem(this.KEYS.REFRESH_TOKEN)
+    localStorage.removeItem(this.KEYS.TOKEN_TYPE)
+  }
+
+  constructor (hash?: TokenOptions) {
+    if (hash) {
+      this.accessToken = hash.accessToken
+      this.refreshToken = hash.refreshToken
+
+      if (hash.tokenType === 'bearer') {
+        this.tokenType = 'Bearer'
+      } else {
+        this.tokenType = hash.tokenType
+      }
+    }
+  }
+
+  save () {
+    localStorage.setItem(Tokens.KEYS.ACCESS_TOKEN, this.accessToken)
+    localStorage.setItem(Tokens.KEYS.REFRESH_TOKEN, this.refreshToken)
+    localStorage.setItem(Tokens.KEYS.TOKEN_TYPE, this.tokenType)
+  }
+}
 
 export class AuthUser extends User {
   private static KEYS = {
@@ -9,123 +69,69 @@ export class AuthUser extends User {
     EMAIL: 'email',
     USERNAME: 'username',
     DISPLAY_NSFW: 'display_nsfw'
-  };
+  }
 
-  tokens: Tokens;
+  tokens: Tokens
 
-  static load() {
-    const usernameLocalStorage = localStorage.getItem(this.KEYS.USERNAME);
+  static load () {
+    const usernameLocalStorage = localStorage.getItem(this.KEYS.USERNAME)
     if (usernameLocalStorage) {
       return new AuthUser(
         {
-          id: parseInt(localStorage.getItem(this.KEYS.ID)),
+          id: parseInt(localStorage.getItem(this.KEYS.ID), 10),
           username: localStorage.getItem(this.KEYS.USERNAME),
           email: localStorage.getItem(this.KEYS.EMAIL),
           role: localStorage.getItem(this.KEYS.ROLE) as UserRole,
           displayNSFW: localStorage.getItem(this.KEYS.DISPLAY_NSFW) === 'true'
         },
         Tokens.load()
-      );
+      )
     }
 
-    return null;
+    return null
   }
 
-  static flush() {
-    localStorage.removeItem(this.KEYS.USERNAME);
-    localStorage.removeItem(this.KEYS.ID);
-    localStorage.removeItem(this.KEYS.ROLE);
-    localStorage.removeItem(this.KEYS.DISPLAY_NSFW);
-    Tokens.flush();
+  static flush () {
+    localStorage.removeItem(this.KEYS.USERNAME)
+    localStorage.removeItem(this.KEYS.ID)
+    localStorage.removeItem(this.KEYS.ROLE)
+    localStorage.removeItem(this.KEYS.DISPLAY_NSFW)
+    Tokens.flush()
   }
 
-  constructor(userHash: {
+  constructor (userHash: {
     id: number,
     username: string,
     role: UserRole,
     email: string,
     displayNSFW: boolean
-  }, hashTokens: any) {
-    super(userHash);
-    this.tokens = new Tokens(hashTokens);
-  }
-
-  getAccessToken() {
-    return this.tokens.access_token;
-  }
-
-  getRefreshToken() {
-    return this.tokens.refresh_token;
-  }
-
-  getTokenType() {
-    return this.tokens.token_type;
-  }
-
-  refreshTokens(access_token: string, refresh_token: string) {
-    this.tokens.access_token = access_token;
-    this.tokens.refresh_token = refresh_token;
+  }, hashTokens: TokenOptions) {
+    super(userHash)
+    this.tokens = new Tokens(hashTokens)
   }
 
-  save() {
-    localStorage.setItem(AuthUser.KEYS.ID, this.id.toString());
-    localStorage.setItem(AuthUser.KEYS.USERNAME, this.username);
-    localStorage.setItem(AuthUser.KEYS.ROLE, this.role);
-    localStorage.setItem(AuthUser.KEYS.DISPLAY_NSFW, JSON.stringify(this.displayNSFW));
-    this.tokens.save();
+  getAccessToken () {
+    return this.tokens.accessToken
   }
-}
-
-// Private class only used by User
-class Tokens {
-  private static KEYS = {
-    ACCESS_TOKEN: 'access_token',
-    REFRESH_TOKEN: 'refresh_token',
-    TOKEN_TYPE: 'token_type',
-  };
-
-  access_token: string;
-  refresh_token: string;
-  token_type: string;
-
-  static load() {
-    const accessTokenLocalStorage = localStorage.getItem(this.KEYS.ACCESS_TOKEN);
-    const refreshTokenLocalStorage = localStorage.getItem(this.KEYS.REFRESH_TOKEN);
-    const tokenTypeLocalStorage = localStorage.getItem(this.KEYS.TOKEN_TYPE);
-
-    if (accessTokenLocalStorage && refreshTokenLocalStorage && tokenTypeLocalStorage) {
-      return new Tokens({
-        access_token: accessTokenLocalStorage,
-        refresh_token: refreshTokenLocalStorage,
-        token_type: tokenTypeLocalStorage
-      });
-    }
 
-    return null;
+  getRefreshToken () {
+    return this.tokens.refreshToken
   }
 
-  static flush() {
-    localStorage.removeItem(this.KEYS.ACCESS_TOKEN);
-    localStorage.removeItem(this.KEYS.REFRESH_TOKEN);
-    localStorage.removeItem(this.KEYS.TOKEN_TYPE);
+  getTokenType () {
+    return this.tokens.tokenType
   }
 
-  constructor(hash?: any) {
-    if (hash) {
-      this.access_token = hash.access_token;
-      this.refresh_token = hash.refresh_token;
-
-      if (hash.token_type === 'bearer') {
-        this.token_type = 'Bearer';
-      } else {
-        this.token_type = hash.token_type;
-      }
-    }
+  refreshTokens (accessToken: string, refreshToken: string) {
+    this.tokens.accessToken = accessToken
+    this.tokens.refreshToken = refreshToken
   }
 
-  save() {
-    localStorage.setItem('access_token', this.access_token);
-    localStorage.setItem('refresh_token', this.refresh_token);
-    localStorage.setItem('token_type', this.token_type);
+  save () {
+    localStorage.setItem(AuthUser.KEYS.ID, this.id.toString())
+    localStorage.setItem(AuthUser.KEYS.USERNAME, this.username)
+    localStorage.setItem(AuthUser.KEYS.ROLE, this.role)
+    localStorage.setItem(AuthUser.KEYS.DISPLAY_NSFW, JSON.stringify(this.displayNSFW))
+    this.tokens.save()
   }
 }