X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fcore%2Fauth%2Fauth.service.ts;h=fd2708c11e4d3260c69079f0bef1856a216e2237;hb=c182778e26b8478fae9d7dd0bf0687baf7b72fd1;hp=913c857e3c6bc44509019f56d0fd3c4e45fcd07f;hpb=2de96f4d6b800076743ed2073f9529816cfd5c8a;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts
index 913c857e3..fd2708c11 100644
--- a/client/src/app/core/auth/auth.service.ts
+++ b/client/src/app/core/auth/auth.service.ts
@@ -1,30 +1,25 @@
+import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'
 import { Injectable } from '@angular/core'
 import { Router } from '@angular/router'
-import { Observable } from 'rxjs/Observable'
-import { Subject } from 'rxjs/Subject'
-import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'
-import { ReplaySubject } from 'rxjs/ReplaySubject'
+
+import { NotificationsService } from 'angular2-notifications'
+import 'rxjs/add/observable/throw'
 import 'rxjs/add/operator/do'
 import 'rxjs/add/operator/map'
 import 'rxjs/add/operator/mergeMap'
-import 'rxjs/add/observable/throw'
-
-import { NotificationsService } from 'angular2-notifications'
-
-import { AuthStatus } from './auth-status.model'
-import { AuthUser } from './auth-user.model'
-import {
-  OAuthClientLocal,
-  UserRole,
-  UserRefreshToken,
-  VideoChannel,
-  User as UserServerModel
-} from '../../../../../shared'
+import { Observable } from 'rxjs/Observable'
+import { ReplaySubject } from 'rxjs/ReplaySubject'
+import { Subject } from 'rxjs/Subject'
+import { OAuthClientLocal, User as UserServerModel, UserRefreshToken, UserRole, VideoChannel } from '../../../../../shared'
+import { Account } from '../../../../../shared/models/accounts'
+import { UserLogin } from '../../../../../shared/models/users/user-login.model'
 // Do not use the barrel (dependency loop)
 import { RestExtractor } from '../../shared/rest'
-import { UserLogin } from '../../../../../shared/models/users/user-login.model'
 import { UserConstructorHash } from '../../shared/users/user.model'
 
+import { AuthStatus } from './auth-status.model'
+import { AuthUser } from './auth-user.model'
+
 interface UserLoginWithUsername extends UserLogin {
   access_token: string
   refresh_token: string
@@ -42,10 +37,7 @@ interface UserLoginWithUserInformation extends UserLogin {
   displayNSFW: boolean
   email: string
   videoQuota: number
-  author: {
-    id: number
-    uuid: string
-  }
+  account: Account
   videoChannels: VideoChannel[]
 }
 
@@ -208,7 +200,7 @@ export class AuthService {
           this.user.displayNSFW = res.displayNSFW
           this.user.role = res.role
           this.user.videoChannels = res.videoChannels
-          this.user.author = res.author
+          this.user.account = res.account
 
           this.user.save()
         }
@@ -227,7 +219,7 @@ export class AuthService {
                         displayNSFW: res.displayNSFW,
                         email: res.email,
                         videoQuota: res.videoQuota,
-                        author: res.author,
+                        account: res.account,
                         videoChannels: res.videoChannels
                       }
 
@@ -245,7 +237,7 @@ export class AuthService {
       displayNSFW: obj.displayNSFW,
       videoQuota: obj.videoQuota,
       videoChannels: obj.videoChannels,
-      author: obj.author
+      account: obj.account
     }
     const hashTokens = {
       accessToken: obj.access_token,
@@ -257,6 +249,7 @@ export class AuthService {
     this.user.save()
 
     this.setStatus(AuthStatus.LoggedIn)
+    this.userInformationLoaded.next(true)
   }
 
   private handleRefreshToken (obj: UserRefreshToken) {