X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fcore%2Fauth%2Fauth-user.model.ts;h=4e7801550d05c5f2b5f0eeea2aa02db79c489600;hb=67ed6552b831df66713bac9e672738796128d33f;hp=7b6c8816fdd3d75675a98f0a4a47987ef27bd3b4;hpb=757f0da370a992cf07afd20d3829b2748c76cc15;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 7b6c8816f..4e7801550 100644 --- a/client/src/app/core/auth/auth-user.model.ts +++ b/client/src/app/core/auth/auth-user.model.ts @@ -1,7 +1,14 @@ -// Do not use the barrel (dependency loop) -import { hasUserRight, UserRole } from '../../../../../shared/models/users/user-role' -import { User, UserConstructorHash } from '../../shared/users/user.model' -import { UserRight } from '../../../../../shared/models/users/user-right.enum' +import { User } from '@app/core/users/user.model' +import { peertubeLocalStorage } from '@app/helpers/peertube-web-storage' +import { + hasUserRight, + MyUser as ServerMyUserModel, + MyUserSpecialPlaylist, + NSFWPolicyType, + User as ServerUserModel, + UserRight, + UserRole +} from '@shared/models' export type TokenOptions = { accessToken: string @@ -22,9 +29,9 @@ class Tokens { 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) + 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({ @@ -38,9 +45,9 @@ class Tokens { } static flush () { - localStorage.removeItem(this.KEYS.ACCESS_TOKEN) - localStorage.removeItem(this.KEYS.REFRESH_TOKEN) - localStorage.removeItem(this.KEYS.TOKEN_TYPE) + peertubeLocalStorage.removeItem(this.KEYS.ACCESS_TOKEN) + peertubeLocalStorage.removeItem(this.KEYS.REFRESH_TOKEN) + peertubeLocalStorage.removeItem(this.KEYS.TOKEN_TYPE) } constructor (hash?: TokenOptions) { @@ -57,33 +64,29 @@ class Tokens { } 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) + 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' - } - +export class AuthUser extends User implements ServerMyUserModel { tokens: Tokens + specialPlaylists: MyUserSpecialPlaylist[] static load () { - const usernameLocalStorage = localStorage.getItem(this.KEYS.USERNAME) + const usernameLocalStorage = peertubeLocalStorage.getItem(this.KEYS.USERNAME) if (usernameLocalStorage) { return new AuthUser( { - id: parseInt(localStorage.getItem(this.KEYS.ID), 10), - username: localStorage.getItem(this.KEYS.USERNAME), - email: localStorage.getItem(this.KEYS.EMAIL), - role: parseInt(localStorage.getItem(this.KEYS.ROLE), 10) as UserRole, - 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, + webTorrentEnabled: peertubeLocalStorage.getItem(this.KEYS.WEBTORRENT_ENABLED) === 'true', + autoPlayVideo: peertubeLocalStorage.getItem(this.KEYS.AUTO_PLAY_VIDEO) === 'true', + videosHistoryEnabled: peertubeLocalStorage.getItem(this.KEYS.VIDEOS_HISTORY_ENABLED) === 'true' }, Tokens.load() ) @@ -93,17 +96,18 @@ export class AuthUser extends User { } static flush () { - localStorage.removeItem(this.KEYS.USERNAME) - localStorage.removeItem(this.KEYS.ID) - localStorage.removeItem(this.KEYS.ROLE) - localStorage.removeItem(this.KEYS.DISPLAY_NSFW) - localStorage.removeItem(this.KEYS.EMAIL) + peertubeLocalStorage.removeItem(this.KEYS.USERNAME) + peertubeLocalStorage.removeItem(this.KEYS.ID) + peertubeLocalStorage.removeItem(this.KEYS.ROLE) + peertubeLocalStorage.removeItem(this.KEYS.EMAIL) Tokens.flush() } - constructor (userHash: UserConstructorHash, hashTokens: TokenOptions) { + constructor (userHash: Partial, hashTokens: TokenOptions) { super(userHash) + this.tokens = new Tokens(hashTokens) + this.specialPlaylists = userHash.specialPlaylists } getAccessToken () { @@ -127,12 +131,23 @@ export class AuthUser extends User { return hasUserRight(this.role, right) } + canManage (user: ServerUserModel) { + const myRole = this.role + + if (myRole === UserRole.ADMINISTRATOR) return true + + // I'm a moderator: I can only manage users + return user.role === UserRole.USER + } + save () { - localStorage.setItem(AuthUser.KEYS.ID, this.id.toString()) - localStorage.setItem(AuthUser.KEYS.USERNAME, this.username) - localStorage.setItem(AuthUser.KEYS.EMAIL, this.email) - localStorage.setItem(AuthUser.KEYS.ROLE, this.role.toString()) - localStorage.setItem(AuthUser.KEYS.DISPLAY_NSFW, JSON.stringify(this.displayNSFW)) + 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.WEBTORRENT_ENABLED, JSON.stringify(this.webTorrentEnabled)) + peertubeLocalStorage.setItem(AuthUser.KEYS.AUTO_PLAY_VIDEO, JSON.stringify(this.autoPlayVideo)) this.tokens.save() } }