+import { Hotkey, HotkeysService } from 'angular2-hotkeys'
import { Observable, ReplaySubject, Subject, throwError as observableThrowError } from 'rxjs'
-import { catchError, map, mergeMap, tap } from 'rxjs/operators'
+import { catchError, map, mergeMap, share, 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 { Notifier } from '@app/core/notification/notifier.service'
+import { objectToUrlEncoded, peertubeLocalStorage } from '@root-helpers/index'
+import { 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 { AuthStatus } from './auth-status.model'
import { AuthUser } from './auth-user.model'
-import { objectToUrlEncoded } from '@app/shared/misc/utils'
+import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
interface UserLoginWithUsername extends UserLogin {
access_token: string
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<AuthStatus>
userInformationLoaded = new ReplaySubject<boolean>(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<AuthStatus>
private user: AuthUser = null
private refreshingTokenObservable: Observable<any>
constructor (
private http: HttpClient,
- private notificationsService: NotificationsService,
+ private notifier: Notifier,
+ private hotkeysService: HotkeysService,
private restExtractor: RestExtractor,
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, $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`)
+ ]
}
loadClientCredentials () {
// Fetch the client_id/client_secret
- // FIXME: save in local storage?
this.http.get<OAuthClientLocal>(AuthService.BASE_CLIENT_URL)
.pipe(catchError(res => this.restExtractor.handleError(res)))
.subscribe(
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.')
},
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.'
+ if (error.status === HttpStatusCode.FORBIDDEN_403) {
+ errorMessage = $localize`Cannot retrieve OAuth Client credentials: ${error.text}.
+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)
}
)
}
return !!this.getAccessToken()
}
- login (username: string, password: string) {
+ login (username: string, password: string, token?: string) {
// Form url encoded
const body = {
client_id: this.clientId,
scope: 'upload',
username,
password
- }
+ }
+
+ if (token) Object.assign(body, { externalAuthToken: token })
const headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded')
return this.http.post<UserLogin>(AuthService.BASE_TOKEN_URL, objectToUrlEncoded(body), { headers })
}
logout () {
- // TODO: make an HTTP request to revoke the tokens
+ const authHeaderValue = this.getRequestHeaderValue()
+ const headers = new HttpHeaders().set('Authorization', authHeaderValue)
+
+ this.http.post<{ redirectUrl?: string }>(AuthService.BASE_REVOKE_TOKEN_URL, {}, { headers })
+ .subscribe(
+ res => {
+ if (res.redirectUrl) {
+ window.location.href = res.redirectUrl
+ }
+ },
+
+ err => console.error(err)
+ )
+
this.user = null
AuthUser.flush()
this.setStatus(AuthStatus.LoggedOut)
+
+ this.hotkeysService.remove(this.hotkeys)
}
refreshAccessToken () {
this.router.navigate([ '/login' ])
return observableThrowError({
- error: 'You need to reconnect.'
+ 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(),
this.setStatus(AuthStatus.LoggedIn)
this.userInformationLoaded.next(true)
+
+ this.hotkeysService.add(this.hotkeys)
}
private handleRefreshToken (obj: UserRefreshToken) {
projects / github / Chocobozzz / PeerTube.git / blobdiff