+import { Observable, ReplaySubject, Subject, throwError as observableThrowError } from 'rxjs'
+import { catchError, map, mergeMap, tap } from 'rxjs/operators'
+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 'rxjs/add/operator/map'
-import 'rxjs/add/operator/mergeMap'
-import 'rxjs/add/observable/throw'
-
import { NotificationsService } from 'angular2-notifications'
-
+import { OAuthClientLocal, User as UserServerModel, UserRefreshToken } from '../../../../../shared'
+import { User } from '../../../../../shared/models/users'
+import { UserLogin } from '../../../../../shared/models/users/user-login.model'
+import { environment } from '../../../environments/environment'
+import { RestExtractor } from '../../shared/rest'
import { AuthStatus } from './auth-status.model'
import { AuthUser } from './auth-user.model'
-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 { UserConstructorHash } from '../../shared/users/user.model'
+import { objectToUrlEncoded } from '@app/shared/misc/utils'
interface UserLoginWithUsername extends UserLogin {
access_token: string
username: string
}
-interface UserLoginWithUserInformation extends UserLogin {
- access_token: string
- refresh_token: string
- token_type: string
- username: string
- id: number
- role: UserRole
- displayNSFW: boolean
- email: string
- videoQuota: number
- author: {
- id: number
- uuid: string
- }
- videoChannels: VideoChannel[]
-}
+type UserLoginWithUserInformation = UserLoginWithUsername & User
@Injectable()
export class AuthService {
- private static BASE_CLIENT_URL = API_URL + '/api/v1/oauth-clients/local'
- private static BASE_TOKEN_URL = API_URL + '/api/v1/users/token'
- private static BASE_USER_INFORMATION_URL = API_URL + '/api/v1/users/me'
+ private static BASE_CLIENT_URL = environment.apiUrl + '/api/v1/oauth-clients/local'
+ private static BASE_TOKEN_URL = environment.apiUrl + '/api/v1/users/token'
+ private static BASE_USER_INFORMATION_URL = environment.apiUrl + '/api/v1/users/me'
loginChangedSource: Observable<AuthStatus>
+ userInformationLoaded = new ReplaySubject<boolean>(1)
private clientId: string
private clientSecret: string
private loginChanged: Subject<AuthStatus>
private user: AuthUser = null
+ private refreshingTokenObservable: Observable<any>
constructor (
private http: HttpClient,
private notificationsService: NotificationsService,
private restExtractor: RestExtractor,
private router: Router
- ) {
+ ) {
this.loginChanged = new Subject<AuthStatus>()
this.loginChangedSource = this.loginChanged.asObservable()
// Fetch the client_id/client_secret
// FIXME: save in local storage?
this.http.get<OAuthClientLocal>(AuthService.BASE_CLIENT_URL)
- .catch(res => this.restExtractor.handleError(res))
- .subscribe(
- res => {
- this.clientId = res.client_id
- this.clientSecret = res.client_secret
- console.log('Client credentials loaded.')
- },
-
- error => {
- let errorMessage = `Cannot retrieve OAuth Client credentials: ${error.text}. \n`
- errorMessage += 'Ensure you have correctly configured PeerTube (config/ directory), in particular the "webserver" section.'
-
- // We put a bigger timeout
- // This is an important message
- this.notificationsService.error('Error', errorMessage, { timeOut: 7000 })
- }
- )
+ .pipe(catchError(res => this.restExtractor.handleError(res)))
+ .subscribe(
+ res => {
+ this.clientId = res.client_id
+ this.clientSecret = res.client_secret
+ console.log('Client credentials loaded.')
+ },
+
+ error => {
+ let errorMessage = error.message
+
+ if (error.status === 403) {
+ errorMessage = `Cannot retrieve OAuth Client credentials: ${error.text}. \n`
+ errorMessage += 'Ensure you have correctly configured PeerTube (config/ directory), ' +
+ 'in particular the "webserver" section.'
+ }
+
+ // We put a bigger timeout
+ // This is an important message
+ this.notificationsService.error('Error', errorMessage, { timeOut: 7000 })
+ }
+ )
}
getRefreshToken () {
login (username: string, password: string) {
// Form url encoded
- const body = new HttpParams().set('client_id', this.clientId)
- .set('client_secret', this.clientSecret)
- .set('response_type', 'code')
- .set('grant_type', 'password')
- .set('scope', 'upload')
- .set('username', username)
- .set('password', password)
+ const body = {
+ client_id: this.clientId,
+ client_secret: this.clientSecret,
+ response_type: 'code',
+ grant_type: 'password',
+ scope: 'upload',
+ username,
+ password
+ }
const headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded')
-
- return this.http.post<UserLogin>(AuthService.BASE_TOKEN_URL, body, { headers })
- .map(res => Object.assign(res, { username }))
- .flatMap(res => this.mergeUserInformation(res))
- .map(res => this.handleLogin(res))
- .catch(res => this.restExtractor.handleError(res))
+ return this.http.post<UserLogin>(AuthService.BASE_TOKEN_URL, objectToUrlEncoded(body), { headers })
+ .pipe(
+ map(res => Object.assign(res, { username })),
+ mergeMap(res => this.mergeUserInformation(res)),
+ map(res => this.handleLogin(res)),
+ catchError(res => this.restExtractor.handleError(res))
+ )
}
logout () {
}
refreshAccessToken () {
+ if (this.refreshingTokenObservable) return this.refreshingTokenObservable
+
console.log('Refreshing token...')
const refreshToken = this.getRefreshToken()
const headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded')
- return this.http.post<UserRefreshToken>(AuthService.BASE_TOKEN_URL, body, { headers })
- .map(res => this.handleRefreshToken(res))
- .catch(res => {
- // The refresh token is invalid?
- if (res.status === 400 && res.error.error === 'invalid_grant') {
- console.error('Cannot refresh token -> logout...')
- this.logout()
- this.router.navigate(['/login'])
-
- return Observable.throw({
- error: 'You need to reconnect.'
- })
- }
-
- return this.restExtractor.handleError(res)
- })
+ this.refreshingTokenObservable = this.http.post<UserRefreshToken>(AuthService.BASE_TOKEN_URL, body, { headers })
+ .pipe(
+ map(res => this.handleRefreshToken(res)),
+ tap(() => this.refreshingTokenObservable = null),
+ catchError(err => {
+ this.refreshingTokenObservable = null
+
+ console.error(err)
+ console.log('Cannot refresh token -> logout...')
+ this.logout()
+ this.router.navigate([ '/login' ])
+
+ return observableThrowError({
+ error: 'You need to reconnect.'
+ })
+ })
+ )
+
+ return this.refreshingTokenObservable
}
refreshUserInformation () {
this.mergeUserInformation(obj)
.subscribe(
res => {
- this.user.displayNSFW = res.displayNSFW
- this.user.role = res.role
- this.user.videoChannels = res.videoChannels
- this.user.author = res.author
-
+ this.user.patch(res)
this.user.save()
+
+ this.userInformationLoaded.next(true)
}
)
}
const headers = new HttpHeaders().set('Authorization', `${obj.token_type} ${obj.access_token}`)
return this.http.get<UserServerModel>(AuthService.BASE_USER_INFORMATION_URL, { headers })
- .map(res => {
- const newProperties = {
- id: res.id,
- role: res.role,
- displayNSFW: res.displayNSFW,
- email: res.email,
- videoQuota: res.videoQuota,
- author: res.author,
- videoChannels: res.videoChannels
- }
-
- return Object.assign(obj, newProperties)
- }
- )
+ .pipe(map(res => Object.assign(obj, res)))
}
private handleLogin (obj: UserLoginWithUserInformation) {
- const hashUser: UserConstructorHash = {
- id: obj.id,
- username: obj.username,
- role: obj.role,
- email: obj.email,
- displayNSFW: obj.displayNSFW,
- videoQuota: obj.videoQuota,
- videoChannels: obj.videoChannels,
- author: obj.author
- }
const hashTokens = {
accessToken: obj.access_token,
tokenType: obj.token_type,
refreshToken: obj.refresh_token
}
- this.user = new AuthUser(hashUser, hashTokens)
+ this.user = new AuthUser(obj, hashTokens)
this.user.save()
this.setStatus(AuthStatus.LoggedIn)
+ this.userInformationLoaded.next(true)
}
private handleRefreshToken (obj: UserRefreshToken) {
projects / github / Chocobozzz / PeerTube.git / blobdiff