import { Observable } from 'rxjs/Observable'
import { Subject } from 'rxjs/Subject'
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'
+import { ReplaySubject } from 'rxjs/ReplaySubject'
+import 'rxjs/add/operator/do'
import 'rxjs/add/operator/map'
import 'rxjs/add/operator/mergeMap'
import 'rxjs/add/observable/throw'
import { AuthStatus } from './auth-status.model'
import { AuthUser } from './auth-user.model'
-import { OAuthClientLocal, UserRole, UserRefreshToken } from '../../../../../shared'
+import {
+ OAuthClientLocal,
+ UserRole,
+ UserRefreshToken,
+ VideoChannel,
+ User as UserServerModel
+} from '../../../../../shared'
// Do not use the barrel (dependency loop)
import { RestExtractor } from '../../shared/rest'
import { UserLogin } from '../../../../../shared/models/users/user-login.model'
-import { User } from '../../shared/users/user.model'
+import { UserConstructorHash } from '../../shared/users/user.model'
interface UserLoginWithUsername extends UserLogin {
access_token: string
role: UserRole
displayNSFW: boolean
email: string
+ videoQuota: number
+ account: {
+ id: number
+ uuid: string
+ }
+ videoChannels: VideoChannel[]
}
@Injectable()
private static BASE_USER_INFORMATION_URL = API_URL + '/api/v1/users/me'
loginChangedSource: Observable<AuthStatus>
+ userInformationLoaded = new ReplaySubject<boolean>(1)
private clientId: string
private clientSecret: string
return this.user
}
- isAdmin () {
- if (this.user === null) return false
-
- return this.user.isAdmin()
- }
-
isLoggedIn () {
return !!this.getAccessToken()
}
}
this.mergeUserInformation(obj)
- .subscribe(
- res => {
- this.user.displayNSFW = res.displayNSFW
- this.user.role = res.role
-
- this.user.save()
- }
- )
+ .do(() => this.userInformationLoaded.next(true))
+ .subscribe(
+ res => {
+ this.user.displayNSFW = res.displayNSFW
+ this.user.role = res.role
+ this.user.videoChannels = res.videoChannels
+ this.user.account = res.account
+
+ this.user.save()
+ }
+ )
}
private mergeUserInformation (obj: UserLoginWithUsername): Observable<UserLoginWithUserInformation> {
// User is not loaded yet, set manually auth header
const headers = new HttpHeaders().set('Authorization', `${obj.token_type} ${obj.access_token}`)
- return this.http.get<User>(AuthService.BASE_USER_INFORMATION_URL, { headers })
+ return this.http.get<UserServerModel>(AuthService.BASE_USER_INFORMATION_URL, { headers })
.map(res => {
const newProperties = {
- id: res.id as number,
- role: res.role as UserRole,
- displayNSFW: res.displayNSFW as boolean,
- email: res.email as string
+ id: res.id,
+ role: res.role,
+ displayNSFW: res.displayNSFW,
+ email: res.email,
+ videoQuota: res.videoQuota,
+ account: res.account,
+ videoChannels: res.videoChannels
}
return Object.assign(obj, newProperties)
}
private handleLogin (obj: UserLoginWithUserInformation) {
- const id = obj.id
- const username = obj.username
- const role = obj.role
- const email = obj.email
- const displayNSFW = obj.displayNSFW
+ const hashUser: UserConstructorHash = {
+ id: obj.id,
+ username: obj.username,
+ role: obj.role,
+ email: obj.email,
+ displayNSFW: obj.displayNSFW,
+ videoQuota: obj.videoQuota,
+ videoChannels: obj.videoChannels,
+ account: obj.account
+ }
const hashTokens = {
accessToken: obj.access_token,
tokenType: obj.token_type,
refreshToken: obj.refresh_token
}
- this.user = new AuthUser({ id, username, role, displayNSFW, email }, hashTokens)
+ this.user = new AuthUser(hashUser, hashTokens)
this.user.save()
this.setStatus(AuthStatus.LoggedIn)