X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fcore%2Fauth%2Fauth-user.model.ts;h=74ed1c5806c5b0730fa957a8052257c4c4f818b8;hb=ec769c89fdcbcaf2d15de8d211d3ede3b6f69c1a;hp=cb7e88d19e1f248d94dd0b33077f37d0132c705d;hpb=92fb909c9b4a92a00b0d0da7629e6fb003de281b;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/core/auth/auth-user.model.ts b/client/src/app/core/auth/auth-user.model.ts
index cb7e88d19..74ed1c580 100644
--- a/client/src/app/core/auth/auth-user.model.ts
+++ b/client/src/app/core/auth/auth-user.model.ts
@@ -1,127 +1,144 @@
+import { peertubeLocalStorage } from '@app/shared/misc/peertube-local-storage'
+import { UserRight } from '../../../../../shared/models/users/user-right.enum'
 // Do not use the barrel (dependency loop)
-import { User } from '../../shared/users/user.model';
+import { hasUserRight, UserRole } from '../../../../../shared/models/users/user-role'
+import { User, UserConstructorHash } from '../../shared/users/user.model'
+import { NSFWPolicyType } from '../../../../../shared/models/videos/nsfw-policy.type'
+
+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 = peertubeLocalStorage.getItem(this.KEYS.ACCESS_TOKEN)
+    const refreshTokenLocalStorage = peertubeLocalStorage.getItem(this.KEYS.REFRESH_TOKEN)
+    const tokenTypeLocalStorage = peertubeLocalStorage.getItem(this.KEYS.TOKEN_TYPE)
+
+    if (accessTokenLocalStorage && refreshTokenLocalStorage && tokenTypeLocalStorage) {
+      return new Tokens({
+        accessToken: accessTokenLocalStorage,
+        refreshToken: refreshTokenLocalStorage,
+        tokenType: tokenTypeLocalStorage
+      })
+    }
+
+    return null
+  }
+
+  static flush () {
+    peertubeLocalStorage.removeItem(this.KEYS.ACCESS_TOKEN)
+    peertubeLocalStorage.removeItem(this.KEYS.REFRESH_TOKEN)
+    peertubeLocalStorage.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 () {
+    peertubeLocalStorage.setItem(Tokens.KEYS.ACCESS_TOKEN, this.accessToken)
+    peertubeLocalStorage.setItem(Tokens.KEYS.REFRESH_TOKEN, this.refreshToken)
+    peertubeLocalStorage.setItem(Tokens.KEYS.TOKEN_TYPE, this.tokenType)
+  }
+}
 
 export class AuthUser extends User {
   private static KEYS = {
     ID: 'id',
     ROLE: 'role',
+    EMAIL: 'email',
     USERNAME: 'username',
-    DISPLAY_NSFW: 'display_nsfw'
-  };
+    NSFW_POLICY: 'nsfw_policy',
+    AUTO_PLAY_VIDEO: 'auto_play_video'
+  }
 
-  tokens: Tokens;
+  tokens: Tokens
 
-  static load() {
-    const usernameLocalStorage = localStorage.getItem(this.KEYS.USERNAME);
+  static load () {
+    const usernameLocalStorage = peertubeLocalStorage.getItem(this.KEYS.USERNAME)
     if (usernameLocalStorage) {
       return new AuthUser(
         {
-          id: parseInt(localStorage.getItem(this.KEYS.ID)),
-          username: localStorage.getItem(this.KEYS.USERNAME),
-          role: localStorage.getItem(this.KEYS.ROLE),
-          displayNSFW: localStorage.getItem(this.KEYS.DISPLAY_NSFW) === 'true'
+          id: parseInt(peertubeLocalStorage.getItem(this.KEYS.ID), 10),
+          username: peertubeLocalStorage.getItem(this.KEYS.USERNAME),
+          email: peertubeLocalStorage.getItem(this.KEYS.EMAIL),
+          role: parseInt(peertubeLocalStorage.getItem(this.KEYS.ROLE), 10) as UserRole,
+          nsfwPolicy: peertubeLocalStorage.getItem(this.KEYS.NSFW_POLICY) as NSFWPolicyType,
+          autoPlayVideo: peertubeLocalStorage.getItem(this.KEYS.AUTO_PLAY_VIDEO) === 'true'
         },
         Tokens.load()
-      );
+      )
     }
 
-    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();
+    return null
   }
 
-  constructor(userHash: {
-    id: number,
-    username: string,
-    role: string,
-    displayNSFW: boolean
-  }, hashTokens: any) {
-    super(userHash);
-    this.tokens = new Tokens(hashTokens);
+  static flush () {
+    peertubeLocalStorage.removeItem(this.KEYS.USERNAME)
+    peertubeLocalStorage.removeItem(this.KEYS.ID)
+    peertubeLocalStorage.removeItem(this.KEYS.ROLE)
+    peertubeLocalStorage.removeItem(this.KEYS.NSFW_POLICY)
+    peertubeLocalStorage.removeItem(this.KEYS.AUTO_PLAY_VIDEO)
+    peertubeLocalStorage.removeItem(this.KEYS.EMAIL)
+    Tokens.flush()
   }
 
-  getAccessToken() {
-    return this.tokens.access_token;
+  constructor (userHash: UserConstructorHash, hashTokens: TokenOptions) {
+    super(userHash)
+    this.tokens = new Tokens(hashTokens)
   }
 
-  getRefreshToken() {
-    return this.tokens.refresh_token;
+  getAccessToken () {
+    return this.tokens.accessToken
   }
 
-  getTokenType() {
-    return this.tokens.token_type;
+  getRefreshToken () {
+    return this.tokens.refreshToken
   }
 
-  refreshTokens(access_token: string, refresh_token: string) {
-    this.tokens.access_token = access_token;
-    this.tokens.refresh_token = refresh_token;
-  }
-
-  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();
-  }
-}
-
-// 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;
+  getTokenType () {
+    return this.tokens.tokenType
   }
 
-  static flush() {
-    localStorage.removeItem(this.KEYS.ACCESS_TOKEN);
-    localStorage.removeItem(this.KEYS.REFRESH_TOKEN);
-    localStorage.removeItem(this.KEYS.TOKEN_TYPE);
+  refreshTokens (accessToken: string, refreshToken: string) {
+    this.tokens.accessToken = accessToken
+    this.tokens.refreshToken = refreshToken
   }
 
-  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;
-      }
-    }
+  hasRight (right: UserRight) {
+    return hasUserRight(this.role, right)
   }
 
-  save() {
-    localStorage.setItem('access_token', this.access_token);
-    localStorage.setItem('refresh_token', this.refresh_token);
-    localStorage.setItem('token_type', this.token_type);
+  save () {
+    peertubeLocalStorage.setItem(AuthUser.KEYS.ID, this.id.toString())
+    peertubeLocalStorage.setItem(AuthUser.KEYS.USERNAME, this.username)
+    peertubeLocalStorage.setItem(AuthUser.KEYS.EMAIL, this.email)
+    peertubeLocalStorage.setItem(AuthUser.KEYS.ROLE, this.role.toString())
+    peertubeLocalStorage.setItem(AuthUser.KEYS.NSFW_POLICY, this.nsfwPolicy.toString())
+    peertubeLocalStorage.setItem(AuthUser.KEYS.AUTO_PLAY_VIDEO, JSON.stringify(this.autoPlayVideo))
+    this.tokens.save()
   }
 }