X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fcore%2Fauth%2Fauth.service.ts;h=4213da20c065211f2468d23a4149d726dcb80be3;hb=cd4d7a2ca868209fb1e2dbd790c1e5d6cca77e86;hp=2e73281976c2e6626289701f08fe26913373b04d;hpb=e2a2d6c86c7ca39074fdff3b545947d1d58dc008;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 2e7328197..4213da20c 100644 --- a/client/src/app/core/auth/auth.service.ts +++ b/client/src/app/core/auth/auth.service.ts @@ -1,222 +1,232 @@ -import { Injectable } from '@angular/core'; -import { Headers, Http, Response, URLSearchParams } from '@angular/http'; -import { Router } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; -import { Subject } from 'rxjs/Subject'; -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'; -// Do not use the barrel (dependency loop) -import { RestExtractor } from '../../shared/rest'; +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 { 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 { objectToUrlEncoded } from '@app/shared/misc/utils' + +interface UserLoginWithUsername extends UserLogin { + access_token: string + refresh_token: string + token_type: string + username: string +} + +type UserLoginWithUserInformation = UserLoginWithUsername & User @Injectable() export class AuthService { - private static BASE_CLIENT_URL = '/api/v1/clients/local'; - private static BASE_TOKEN_URL = '/api/v1/users/token'; - private static BASE_USER_INFORMATIONS_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; + loginChangedSource: Observable + userInformationLoaded = new ReplaySubject(1) - private clientId: string; - private clientSecret: string; - private loginChanged: Subject; - private user: AuthUser = null; + private clientId: string + private clientSecret: string + private loginChanged: Subject + private user: AuthUser = null + private refreshingTokenObservable: Observable - constructor( - private http: Http, + constructor ( + private http: HttpClient, private notificationsService: NotificationsService, private restExtractor: RestExtractor, private router: Router - ) { - this.loginChanged = new Subject(); - this.loginChangedSource = this.loginChanged.asObservable(); + ) { + this.loginChanged = new Subject() + this.loginChangedSource = this.loginChanged.asObservable() + + // Return null if there is nothing to load + this.user = AuthUser.load() + } + loadClientCredentials () { // Fetch the client_id/client_secret // FIXME: save in local storage? - this.http.get(AuthService.BASE_CLIENT_URL) - .map(this.restExtractor.extractDataGet) - .catch((res) => this.restExtractor.handleError(res)) - .subscribe( - result => { - this.clientId = result.client_id; - this.clientSecret = result.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 }); - } - ); - - // Return null if there is nothing to load - this.user = AuthUser.load(); + this.http.get(AuthService.BASE_CLIENT_URL) + .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() { - if (this.user === null) return null; + getRefreshToken () { + if (this.user === null) return null - return this.user.getRefreshToken(); + return this.user.getRefreshToken() } - getRequestHeaderValue() { - return `${this.getTokenType()} ${this.getAccessToken()}`; - } + getRequestHeaderValue () { + const accessToken = this.getAccessToken() - getAccessToken() { - if (this.user === null) return null; + if (accessToken === null) return null - return this.user.getAccessToken(); + return `${this.getTokenType()} ${accessToken}` } - getTokenType() { - if (this.user === null) return null; + getAccessToken () { + if (this.user === null) return null - return this.user.getTokenType(); + return this.user.getAccessToken() } - getUser(): AuthUser { - return this.user; - } + getTokenType () { + if (this.user === null) return null - isAdmin() { - if (this.user === null) return false; - - return this.user.isAdmin(); + return this.user.getTokenType() } - isLoggedIn() { - if (this.getAccessToken()) { - return true; - } else { - return false; - } + getUser () { + return this.user } - login(username: string, password: string) { - let body = new URLSearchParams(); - body.set('client_id', this.clientId); - body.set('client_secret', this.clientSecret); - body.set('response_type', 'code'); - body.set('grant_type', 'password'); - body.set('scope', 'upload'); - body.set('username', username); - body.set('password', password); - - let headers = new Headers(); - headers.append('Content-Type', 'application/x-www-form-urlencoded'); + isLoggedIn () { + return !!this.getAccessToken() + } - let options = { - headers: headers - }; + login (username: string, password: string) { + // Form url encoded + const body = { + client_id: this.clientId, + client_secret: this.clientSecret, + response_type: 'code', + grant_type: 'password', + scope: 'upload', + username, + password + } - return this.http.post(AuthService.BASE_TOKEN_URL, body.toString(), options) - .map(this.restExtractor.extractDataGet) - .map(res => { - res.username = username; - return res; - }) - .flatMap(res => this.fetchUserInformations(res)) - .map(res => this.handleLogin(res)) - .catch((res) => this.restExtractor.handleError(res)); + const headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded') + return this.http.post(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() { + logout () { // TODO: make an HTTP request to revoke the tokens - this.user = null; + this.user = null - AuthUser.flush(); + AuthUser.flush() - this.setStatus(AuthStatus.LoggedOut); + this.setStatus(AuthStatus.LoggedOut) } - refreshAccessToken() { - console.log('Refreshing token...'); + refreshAccessToken () { + if (this.refreshingTokenObservable) return this.refreshingTokenObservable - const refreshToken = this.getRefreshToken(); + console.log('Refreshing token...') - let body = new URLSearchParams(); - body.set('refresh_token', refreshToken); - body.set('client_id', this.clientId); - body.set('client_secret', this.clientSecret); - body.set('response_type', 'code'); - body.set('grant_type', 'refresh_token'); + const refreshToken = this.getRefreshToken() - let headers = new Headers(); - headers.append('Content-Type', 'application/x-www-form-urlencoded'); + // Form url encoded + const body = new HttpParams().set('refresh_token', refreshToken) + .set('client_id', this.clientId) + .set('client_secret', this.clientSecret) + .set('response_type', 'code') + .set('grant_type', 'refresh_token') - let options = { - headers: headers - }; + const headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded') - return this.http.post(AuthService.BASE_TOKEN_URL, body.toString(), options) - .map(this.restExtractor.extractDataGet) - .map(res => this.handleRefreshToken(res)) - .catch((res: Response) => { - // The refresh token is invalid? - if (res.status === 400 && res.json() && res.json().error === 'invalid_grant') { - console.error('Cannot refresh token -> logout...'); - this.logout(); - this.router.navigate(['/login']); + this.refreshingTokenObservable = this.http.post(AuthService.BASE_TOKEN_URL, body, { headers }) + .pipe( + map(res => this.handleRefreshToken(res)), + tap(() => this.refreshingTokenObservable = null), + catchError(err => { + this.refreshingTokenObservable = null - return Observable.throw({ - json: () => '', - text: () => 'You need to reconnect.' - }); - } + console.error(err) + console.log('Cannot refresh token -> logout...') + this.logout() + this.router.navigate([ '/login' ]) - return this.restExtractor.handleError(res); - }); + return observableThrowError({ + error: 'You need to reconnect.' + }) + }) + ) + + return this.refreshingTokenObservable } - private fetchUserInformations (obj: any) { - // Do not call authHttp here to avoid circular dependencies headaches + refreshUserInformation () { + const obj = { + access_token: this.user.getAccessToken(), + refresh_token: null, + token_type: this.user.getTokenType(), + username: this.user.username + } + + this.mergeUserInformation(obj) + .subscribe( + res => { + this.user.patch(res) + this.user.save() + + this.userInformationLoaded.next(true) + } + ) + } - const headers = new Headers(); - headers.set('Authorization', `Bearer ${obj.access_token}`); + private mergeUserInformation (obj: UserLoginWithUsername): Observable { + // 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(AuthService.BASE_USER_INFORMATIONS_URL, { headers }) - .map(res => res.json()) - .map(res => { - obj.id = res.id; - obj.role = res.role; - return obj; - } - ); + return this.http.get(AuthService.BASE_USER_INFORMATION_URL, { headers }) + .pipe(map(res => Object.assign(obj, res))) } - private handleLogin (obj: any) { - const id = obj.id; - const username = obj.username; - const role = obj.role; + private handleLogin (obj: UserLoginWithUserInformation) { const hashTokens = { - access_token: obj.access_token, - token_type: obj.token_type, - refresh_token: obj.refresh_token - }; + accessToken: obj.access_token, + tokenType: obj.token_type, + refreshToken: obj.refresh_token + } - this.user = new AuthUser({ id, username, role }, hashTokens); - this.user.save(); + this.user = new AuthUser(obj, hashTokens) + this.user.save() - this.setStatus(AuthStatus.LoggedIn); + this.setStatus(AuthStatus.LoggedIn) + this.userInformationLoaded.next(true) } - private handleRefreshToken (obj: any) { - this.user.refreshTokens(obj.access_token, obj.refresh_token); - this.user.save(); + private handleRefreshToken (obj: UserRefreshToken) { + this.user.refreshTokens(obj.access_token, obj.refresh_token) + this.user.save() } - private setStatus(status: AuthStatus) { - this.loginChanged.next(status); + private setStatus (status: AuthStatus) { + this.loginChanged.next(status) } - }