X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fcore%2Fauth%2Fauth.service.ts;h=6fe601d8d24634275bfb0e555e3560d5aad07f3d;hb=98bd5e2256bfdeba6d5ab07f0421acfde1a0de26;hp=c3879d570afd5afa9995ef1aac2d419c385e6858;hpb=f954b5da2a9a5960d7c9563522f1ac0b2c10f96c;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 c3879d570..6fe601d8d 100644 --- a/client/src/app/core/auth/auth.service.ts +++ b/client/src/app/core/auth/auth.service.ts @@ -1,17 +1,17 @@ +import { Hotkey, HotkeysService } from 'angular2-hotkeys' 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 { catchError, map, mergeMap, share, tap } from 'rxjs/operators' +import { HttpClient, HttpErrorResponse, 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 { Notifier } from '@app/core/notification/notifier.service' +import { logger, OAuthUserTokens, objectToUrlEncoded, peertubeLocalStorage } from '@root-helpers/index' +import { HttpStatusCode, MyUser as UserServerModel, OAuthClientLocal, User, UserLogin, UserRefreshToken } from '@shared/models' import { environment } from '../../../environments/environment' -import { RestExtractor } from '../../shared/rest' +import { RestExtractor } from '../rest/rest-extractor.service' +import { RedirectService } from '../routing' 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 @@ -26,56 +26,87 @@ type UserLoginWithUserInformation = UserLoginWithUsername & User export class AuthService { 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_REVOKE_TOKEN_URL = environment.apiUrl + '/api/v1/users/revoke-token' private static BASE_USER_INFORMATION_URL = environment.apiUrl + '/api/v1/users/me' + private static LOCAL_STORAGE_OAUTH_CLIENT_KEYS = { + CLIENT_ID: 'client_id', + CLIENT_SECRET: 'client_secret' + } loginChangedSource: Observable userInformationLoaded = new ReplaySubject(1) + tokensRefreshed = new ReplaySubject(1) + hotkeys: Hotkey[] - private clientId: string - private clientSecret: string + private clientId: string = peertubeLocalStorage.getItem(AuthService.LOCAL_STORAGE_OAUTH_CLIENT_KEYS.CLIENT_ID) + private clientSecret: string = peertubeLocalStorage.getItem(AuthService.LOCAL_STORAGE_OAUTH_CLIENT_KEYS.CLIENT_SECRET) private loginChanged: Subject private user: AuthUser = null private refreshingTokenObservable: Observable constructor ( + private redirectService: RedirectService, private http: HttpClient, - private notificationsService: NotificationsService, + private notifier: Notifier, + private hotkeysService: HotkeysService, private restExtractor: RestExtractor, private router: Router ) { this.loginChanged = new Subject() this.loginChangedSource = this.loginChanged.asObservable() - // Return null if there is nothing to load - this.user = AuthUser.load() + // Set HotKeys + this.hotkeys = [ + new Hotkey('m s', (event: KeyboardEvent): boolean => { + this.router.navigate([ '/videos/subscriptions' ]) + return false + }, undefined, $localize`Go to my subscriptions`), + new Hotkey('m v', (event: KeyboardEvent): boolean => { + this.router.navigate([ '/my-library/videos' ]) + return false + }, undefined, $localize`Go to my videos`), + new Hotkey('m i', (event: KeyboardEvent): boolean => { + this.router.navigate([ '/my-library/video-imports' ]) + return false + }, undefined, $localize`Go to my imports`), + new Hotkey('m c', (event: KeyboardEvent): boolean => { + this.router.navigate([ '/my-library/video-channels' ]) + return false + }, undefined, $localize`Go to my channels`) + ] + } + + buildAuthUser (userInfo: Partial, tokens: OAuthUserTokens) { + this.user = new AuthUser(userInfo, tokens) } loadClientCredentials () { // Fetch the client_id/client_secret - // FIXME: save in local storage? this.http.get(AuthService.BASE_CLIENT_URL) .pipe(catchError(res => this.restExtractor.handleError(res))) - .subscribe( - res => { + .subscribe({ + next: res => { this.clientId = res.client_id this.clientSecret = res.client_secret - console.log('Client credentials loaded.') + + peertubeLocalStorage.setItem(AuthService.LOCAL_STORAGE_OAUTH_CLIENT_KEYS.CLIENT_ID, this.clientId) + peertubeLocalStorage.setItem(AuthService.LOCAL_STORAGE_OAUTH_CLIENT_KEYS.CLIENT_SECRET, this.clientSecret) + + logger.info('Client credentials loaded.') }, - error => { - let errorMessage = error.message + error: err => { + let errorMessage = err.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.' + if (err.status === HttpStatusCode.FORBIDDEN_403) { + errorMessage = $localize`Cannot retrieve OAuth Client credentials: ${err.message}. +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 }) + // We put a bigger timeout: this is an important message + this.notifier.error(errorMessage, $localize`Error`, 7000) } - ) + }) } getRefreshToken () { @@ -112,7 +143,14 @@ export class AuthService { return !!this.getAccessToken() } - login (username: string, password: string) { + login (options: { + username: string + password: string + otpToken?: string + token?: string + }) { + const { username, password, token, otpToken } = options + // Form url encoded const body = { client_id: this.clientId, @@ -124,7 +162,11 @@ export class AuthService { password } - const headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded') + if (token) Object.assign(body, { externalAuthToken: token }) + + let headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded') + if (otpToken) headers = headers.set('x-peertube-otp', otpToken) + return this.http.post(AuthService.BASE_TOKEN_URL, objectToUrlEncoded(body), { headers }) .pipe( map(res => Object.assign(res, { username })), @@ -135,18 +177,31 @@ export class AuthService { } logout () { - // TODO: make an HTTP request to revoke the tokens - this.user = null + const authHeaderValue = this.getRequestHeaderValue() + const headers = new HttpHeaders().set('Authorization', authHeaderValue) + + this.http.post<{ redirectUrl?: string }>(AuthService.BASE_REVOKE_TOKEN_URL, {}, { headers }) + .subscribe({ + next: res => { + if (res.redirectUrl) { + window.location.href = res.redirectUrl + } + }, + + error: err => logger.error(err) + }) - AuthUser.flush() + this.user = null this.setStatus(AuthStatus.LoggedOut) + + this.hotkeysService.remove(this.hotkeys) } refreshAccessToken () { if (this.refreshingTokenObservable) return this.refreshingTokenObservable - console.log('Refreshing token...') + logger.info('Refreshing token...') const refreshToken = this.getRefreshToken() @@ -160,28 +215,32 @@ export class AuthService { const headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded') 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 - - console.error(err) - console.log('Cannot refresh token -> logout...') - this.logout() - this.router.navigate([ '/login' ]) - - return observableThrowError({ - error: 'You need to reconnect.' - }) - }) - ) + .pipe( + map(res => this.handleRefreshToken(res)), + tap(() => { + this.refreshingTokenObservable = null + }), + catchError(err => { + this.refreshingTokenObservable = null + + logger.error(err) + logger.info('Cannot refresh token -> logout...') + this.logout() + + this.redirectService.redirectToLogin() + + return observableThrowError(() => ({ + error: $localize`You need to reconnect.` + })) + }), + share() + ) return this.refreshingTokenObservable } refreshUserInformation () { - const obj = { + const obj: UserLoginWithUsername = { access_token: this.user.getAccessToken(), refresh_token: null, token_type: this.user.getTokenType(), @@ -189,14 +248,21 @@ export class AuthService { } this.mergeUserInformation(obj) - .subscribe( - res => { + .subscribe({ + next: res => { this.user.patch(res) - this.user.save() this.userInformationLoaded.next(true) } - ) + }) + } + + isOTPMissingError (err: HttpErrorResponse) { + if (err.status !== HttpStatusCode.UNAUTHORIZED_401) return false + + if (err.headers.get('x-peertube-otp') !== 'required; app') return false + + return true } private mergeUserInformation (obj: UserLoginWithUsername): Observable { @@ -215,15 +281,16 @@ export class AuthService { } this.user = new AuthUser(obj, hashTokens) - this.user.save() this.setStatus(AuthStatus.LoggedIn) this.userInformationLoaded.next(true) + + this.hotkeysService.add(this.hotkeys) } private handleRefreshToken (obj: UserRefreshToken) { this.user.refreshTokens(obj.access_token, obj.refresh_token) - this.user.save() + this.tokensRefreshed.next() } private setStatus (status: AuthStatus) {