aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/core/auth/auth.service.ts
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/core/auth/auth.service.ts')
-rw-r--r--client/src/app/core/auth/auth.service.ts10
1 files changed, 4 insertions, 6 deletions
diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts
index e887dde1f..e2b8b6ba5 100644
--- a/client/src/app/core/auth/auth.service.ts
+++ b/client/src/app/core/auth/auth.service.ts
@@ -1,7 +1,6 @@
1import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http' 1import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'
2import { Injectable } from '@angular/core' 2import { Injectable } from '@angular/core'
3import { Router } from '@angular/router' 3import { Router } from '@angular/router'
4
5import { NotificationsService } from 'angular2-notifications' 4import { NotificationsService } from 'angular2-notifications'
6import 'rxjs/add/observable/throw' 5import 'rxjs/add/observable/throw'
7import 'rxjs/add/operator/do' 6import 'rxjs/add/operator/do'
@@ -13,10 +12,9 @@ import { Subject } from 'rxjs/Subject'
13import { OAuthClientLocal, User as UserServerModel, UserRefreshToken, UserRole, VideoChannel } from '../../../../../shared' 12import { OAuthClientLocal, User as UserServerModel, UserRefreshToken, UserRole, VideoChannel } from '../../../../../shared'
14import { Account } from '../../../../../shared/models/accounts' 13import { Account } from '../../../../../shared/models/accounts'
15import { UserLogin } from '../../../../../shared/models/users/user-login.model' 14import { UserLogin } from '../../../../../shared/models/users/user-login.model'
16// Do not use the barrel (dependency loop) 15import { environment } from '../../../environments/environment'
17import { RestExtractor } from '../../shared/rest' 16import { RestExtractor } from '../../shared/rest'
18import { UserConstructorHash } from '../../shared/users/user.model' 17import { UserConstructorHash } from '../../shared/users/user.model'
19
20import { AuthStatus } from './auth-status.model' 18import { AuthStatus } from './auth-status.model'
21import { AuthUser } from './auth-user.model' 19import { AuthUser } from './auth-user.model'
22 20
@@ -43,9 +41,9 @@ interface UserLoginWithUserInformation extends UserLogin {
43 41
44@Injectable() 42@Injectable()
45export class AuthService { 43export class AuthService {
46 private static BASE_CLIENT_URL = API_URL + '/api/v1/oauth-clients/local' 44 private static BASE_CLIENT_URL = environment.apiUrl + '/api/v1/oauth-clients/local'
47 private static BASE_TOKEN_URL = API_URL + '/api/v1/users/token' 45 private static BASE_TOKEN_URL = environment.apiUrl + '/api/v1/users/token'
48 private static BASE_USER_INFORMATION_URL = API_URL + '/api/v1/users/me' 46 private static BASE_USER_INFORMATION_URL = environment.apiUrl + '/api/v1/users/me'
49 47
50 loginChangedSource: Observable<AuthStatus> 48 loginChangedSource: Observable<AuthStatus>
51 userInformationLoaded = new ReplaySubject<boolean>(1) 49 userInformationLoaded = new ReplaySubject<boolean>(1)