wrap the hotkeys component to allow templating :art:

[github/Chocobozzz/PeerTube.git] / client / src / app / core / auth / auth.service.ts

diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts
index c3879d570afd5afa9995ef1aac2d419c385e6858..9ec404557bca9db9df86aad3a56f9e38c14e5d14 100644 (file)
--- a/client/src/app/core/auth/auth.service.ts
+++ b/client/src/app/core/auth/auth.service.ts
@@ -1,5 +1,5 @@
 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'
@@ -12,6 +12,8 @@ import { RestExtractor } from '../../shared/rest'
 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-local-storage'
+import { I18n } from '@ngx-translate/i18n-polyfill'
 
 interface UserLoginWithUsername extends UserLogin {
   access_token: string
@@ -27,12 +29,16 @@ 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_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)
 
-  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>
@@ -41,7 +47,8 @@ export class AuthService {
     private http: HttpClient,
     private notificationsService: NotificationsService,
     private restExtractor: RestExtractor,
-    private router: Router
+    private router: Router,
+    private i18n: I18n
   ) {
     this.loginChanged = new Subject<AuthStatus>()
     this.loginChangedSource = this.loginChanged.asObservable()
@@ -52,13 +59,16 @@ export class AuthService {
 
   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.')
           },
 
@@ -66,14 +76,15 @@ export class AuthService {
             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.'
+              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.'
+              )
             }
 
             // We put a bigger timeout
             // This is an important message
-            this.notificationsService.error('Error', errorMessage, { timeOut: 7000 })
+            this.notificationsService.error(this.i18n('Error'), errorMessage, { timeOut: 7000 })
           }
         )
   }
@@ -172,9 +183,10 @@ export class AuthService {
                                              this.router.navigate([ '/login' ])
 
                                              return observableThrowError({
-                                               error: 'You need to reconnect.'
+                                               error: this.i18n('You need to reconnect.')
                                              })
-                                           })
+                                           }),
+                                           share()
                                          )
 
     return this.refreshingTokenObservable