+import { Hotkey, HotkeysService } from 'angular2-hotkeys'
import { Observable, ReplaySubject, Subject, throwError as observableThrowError } from 'rxjs'
import { catchError, map, mergeMap, share, tap } from 'rxjs/operators'
-import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'
+import { HttpClient, HttpErrorResponse, HttpHeaders, HttpParams } from '@angular/common/http'
import { Injectable } from '@angular/core'
import { Router } from '@angular/router'
import { Notifier } from '@app/core/notification/notifier.service'
-import { OAuthClientLocal, MyUser as UserServerModel, UserRefreshToken } from '../../../../../shared'
-import { User } from '../../../../../shared/models/users'
-import { UserLogin } from '../../../../../shared/models/users/user-login.model'
+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/rest-extractor.service'
+import { RestExtractor } from '../rest/rest-extractor.service'
import { AuthStatus } from './auth-status.model'
import { AuthUser } from './auth-user.model'
-import { objectToUrlEncoded } from '@app/shared/misc/utils'
-import { peertubeLocalStorage } from '@app/shared/misc/peertube-web-storage'
-import { I18n } from '@ngx-translate/i18n-polyfill'
-import { Hotkey, HotkeysService } from 'angular2-hotkeys'
interface UserLoginWithUsername extends UserLogin {
access_token: string
loginChangedSource: Observable<AuthStatus>
userInformationLoaded = new ReplaySubject<boolean>(1)
+ tokensRefreshed = new ReplaySubject<void>(1)
hotkeys: Hotkey[]
private clientId: string = peertubeLocalStorage.getItem(AuthService.LOCAL_STORAGE_OAUTH_CLIENT_KEYS.CLIENT_ID)
private notifier: Notifier,
private hotkeysService: HotkeysService,
private restExtractor: RestExtractor,
- private router: Router,
- private i18n: I18n
+ private router: Router
) {
this.loginChanged = new Subject<AuthStatus>()
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, this.i18n('Go to my subscriptions')),
+ }, undefined, $localize`Go to my subscriptions`),
new Hotkey('m v', (event: KeyboardEvent): boolean => {
- this.router.navigate([ '/my-account/videos' ])
+ this.router.navigate([ '/my-library/videos' ])
return false
- }, undefined, this.i18n('Go to my videos')),
+ }, undefined, $localize`Go to my videos`),
new Hotkey('m i', (event: KeyboardEvent): boolean => {
- this.router.navigate([ '/my-account/video-imports' ])
+ this.router.navigate([ '/my-library/video-imports' ])
return false
- }, undefined, this.i18n('Go to my imports')),
+ }, undefined, $localize`Go to my imports`),
new Hotkey('m c', (event: KeyboardEvent): boolean => {
- this.router.navigate([ '/my-account/video-channels' ])
+ this.router.navigate([ '/my-library/video-channels' ])
return false
- }, undefined, this.i18n('Go to my channels'))
+ }, undefined, $localize`Go to my channels`)
]
}
+ buildAuthUser (userInfo: Partial<User>, tokens: OAuthUserTokens) {
+ this.user = new AuthUser(userInfo, tokens)
+ }
+
loadClientCredentials () {
// Fetch the client_id/client_secret
this.http.get<OAuthClientLocal>(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
peertubeLocalStorage.setItem(AuthService.LOCAL_STORAGE_OAUTH_CLIENT_KEYS.CLIENT_ID, this.clientId)
peertubeLocalStorage.setItem(AuthService.LOCAL_STORAGE_OAUTH_CLIENT_KEYS.CLIENT_SECRET, this.clientSecret)
- console.log('Client credentials loaded.')
+ logger.info('Client credentials loaded.')
},
- error => {
- let errorMessage = error.message
+ error: err => {
+ let errorMessage = err.message
- if (error.status === 403) {
- errorMessage = this.i18n('Cannot retrieve OAuth Client credentials: {{errorText}}.\n', { errorText: error.text })
- errorMessage += this.i18n(
- '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.notifier.error(errorMessage, this.i18n('Error'), 7000)
+ this.notifier.error(errorMessage, $localize`Error`, 7000)
}
- )
+ })
}
getRefreshToken () {
return !!this.getAccessToken()
}
- login (username: string, password: string, token?: 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,
if (token) Object.assign(body, { externalAuthToken: token })
- const headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded')
+ 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<UserLogin>(AuthService.BASE_TOKEN_URL, objectToUrlEncoded(body), { headers })
.pipe(
map(res => Object.assign(res, { username })),
const authHeaderValue = this.getRequestHeaderValue()
const headers = new HttpHeaders().set('Authorization', authHeaderValue)
- this.http.post<void>(AuthService.BASE_REVOKE_TOKEN_URL, {}, { headers })
- .subscribe(
- () => { /* nothing to do */ },
+ this.http.post<{ redirectUrl?: string }>(AuthService.BASE_REVOKE_TOKEN_URL, {}, { headers })
+ .subscribe({
+ next: res => {
+ if (res.redirectUrl) {
+ window.location.href = res.redirectUrl
+ }
+ },
- err => console.error(err)
- )
+ error: err => logger.error(err)
+ })
this.user = null
- AuthUser.flush()
-
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()
this.refreshingTokenObservable = this.http.post<UserRefreshToken>(AuthService.BASE_TOKEN_URL, body, { headers })
.pipe(
map(res => this.handleRefreshToken(res)),
- tap(() => this.refreshingTokenObservable = null),
+ tap(() => {
+ this.refreshingTokenObservable = null
+ }),
catchError(err => {
this.refreshingTokenObservable = null
- console.error(err)
- console.log('Cannot refresh token -> logout...')
+ logger.error(err)
+ logger.info('Cannot refresh token -> logout...')
this.logout()
this.router.navigate([ '/login' ])
- return observableThrowError({
- error: this.i18n('You need to reconnect.')
- })
+ return observableThrowError(() => ({
+ error: $localize`You need to reconnect.`
+ }))
}),
share()
)
}
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<UserLoginWithUserInformation> {
}
this.user = new AuthUser(obj, hashTokens)
- this.user.save()
this.setStatus(AuthStatus.LoggedIn)
this.userInformationLoaded.next(true)
private handleRefreshToken (obj: UserRefreshToken) {
this.user.refreshTokens(obj.access_token, obj.refresh_token)
- this.user.save()
+ this.tokensRefreshed.next()
}
private setStatus (status: AuthStatus) {
projects / github / Chocobozzz / PeerTube.git / blobdiff