aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-05-29 17:16:20 +0200
committerChocobozzz <me@florianbigard.com>2018-05-29 17:16:20 +0200
commita20776fcbbe488475238228716cad370056ad5bd (patch)
treeed18a80315aa32e00423a831969fbf6dbe45034a
parentf6a7c82ca51896a433bc2264c52afd6981c7c4c6 (diff)
downloadPeerTube-a20776fcbbe488475238228716cad370056ad5bd.tar.gz
PeerTube-a20776fcbbe488475238228716cad370056ad5bd.tar.zst
PeerTube-a20776fcbbe488475238228716cad370056ad5bd.zip
Fix refreshing oauth token
-rw-r--r--client/src/app/core/auth/auth.service.ts19
-rw-r--r--client/src/ngsw-config.json4
2 files changed, 15 insertions, 8 deletions
diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts
index c3879d570..614d38d08 100644
--- a/client/src/app/core/auth/auth.service.ts
+++ b/client/src/app/core/auth/auth.service.ts
@@ -1,5 +1,5 @@
1import { Observable, ReplaySubject, Subject, throwError as observableThrowError } from 'rxjs' 1import { Observable, ReplaySubject, Subject, throwError as observableThrowError } from 'rxjs'
2import { catchError, map, mergeMap, tap } from 'rxjs/operators' 2import { catchError, map, mergeMap, tap, share } from 'rxjs/operators'
3import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http' 3import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'
4import { Injectable } from '@angular/core' 4import { Injectable } from '@angular/core'
5import { Router } from '@angular/router' 5import { Router } from '@angular/router'
@@ -12,6 +12,7 @@ import { RestExtractor } from '../../shared/rest'
12import { AuthStatus } from './auth-status.model' 12import { AuthStatus } from './auth-status.model'
13import { AuthUser } from './auth-user.model' 13import { AuthUser } from './auth-user.model'
14import { objectToUrlEncoded } from '@app/shared/misc/utils' 14import { objectToUrlEncoded } from '@app/shared/misc/utils'
15import { peertubeLocalStorage } from '@app/shared/misc/peertube-local-storage'
15 16
16interface UserLoginWithUsername extends UserLogin { 17interface UserLoginWithUsername extends UserLogin {
17 access_token: string 18 access_token: string
@@ -27,12 +28,16 @@ export class AuthService {
27 private static BASE_CLIENT_URL = environment.apiUrl + '/api/v1/oauth-clients/local' 28 private static BASE_CLIENT_URL = environment.apiUrl + '/api/v1/oauth-clients/local'
28 private static BASE_TOKEN_URL = environment.apiUrl + '/api/v1/users/token' 29 private static BASE_TOKEN_URL = environment.apiUrl + '/api/v1/users/token'
29 private static BASE_USER_INFORMATION_URL = environment.apiUrl + '/api/v1/users/me' 30 private static BASE_USER_INFORMATION_URL = environment.apiUrl + '/api/v1/users/me'
31 private static LOCAL_STORAGE_OAUTH_CLIENT_KEYS = {
32 CLIENT_ID: 'client_id',
33 CLIENT_SECRET: 'client_secret'
34 }
30 35
31 loginChangedSource: Observable<AuthStatus> 36 loginChangedSource: Observable<AuthStatus>
32 userInformationLoaded = new ReplaySubject<boolean>(1) 37 userInformationLoaded = new ReplaySubject<boolean>(1)
33 38
34 private clientId: string 39 private clientId: string = peertubeLocalStorage.getItem(AuthService.LOCAL_STORAGE_OAUTH_CLIENT_KEYS.CLIENT_ID)
35 private clientSecret: string 40 private clientSecret: string = peertubeLocalStorage.getItem(AuthService.LOCAL_STORAGE_OAUTH_CLIENT_KEYS.CLIENT_SECRET)
36 private loginChanged: Subject<AuthStatus> 41 private loginChanged: Subject<AuthStatus>
37 private user: AuthUser = null 42 private user: AuthUser = null
38 private refreshingTokenObservable: Observable<any> 43 private refreshingTokenObservable: Observable<any>
@@ -52,13 +57,16 @@ export class AuthService {
52 57
53 loadClientCredentials () { 58 loadClientCredentials () {
54 // Fetch the client_id/client_secret 59 // Fetch the client_id/client_secret
55 // FIXME: save in local storage?
56 this.http.get<OAuthClientLocal>(AuthService.BASE_CLIENT_URL) 60 this.http.get<OAuthClientLocal>(AuthService.BASE_CLIENT_URL)
57 .pipe(catchError(res => this.restExtractor.handleError(res))) 61 .pipe(catchError(res => this.restExtractor.handleError(res)))
58 .subscribe( 62 .subscribe(
59 res => { 63 res => {
60 this.clientId = res.client_id 64 this.clientId = res.client_id
61 this.clientSecret = res.client_secret 65 this.clientSecret = res.client_secret
66
67 peertubeLocalStorage.setItem(AuthService.LOCAL_STORAGE_OAUTH_CLIENT_KEYS.CLIENT_ID, this.clientId)
68 peertubeLocalStorage.setItem(AuthService.LOCAL_STORAGE_OAUTH_CLIENT_KEYS.CLIENT_SECRET, this.clientSecret)
69
62 console.log('Client credentials loaded.') 70 console.log('Client credentials loaded.')
63 }, 71 },
64 72
@@ -174,7 +182,8 @@ export class AuthService {
174 return observableThrowError({ 182 return observableThrowError({
175 error: 'You need to reconnect.' 183 error: 'You need to reconnect.'
176 }) 184 })
177 }) 185 }),
186 share()
178 ) 187 )
179 188
180 return this.refreshingTokenObservable 189 return this.refreshingTokenObservable
diff --git a/client/src/ngsw-config.json b/client/src/ngsw-config.json
index 47a116bb7..25f099654 100644
--- a/client/src/ngsw-config.json
+++ b/client/src/ngsw-config.json
@@ -7,9 +7,7 @@
7 "resources": { 7 "resources": {
8 "files": [ 8 "files": [
9 "/index.html", 9 "/index.html",
10 "/client/assets/images/favicon.png" 10 "/client/assets/images/favicon.png",
11 ],
12 "versionedFiles": [
13 "/client/*.bundle.css", 11 "/client/*.bundle.css",
14 "/client/*.bundle.js", 12 "/client/*.bundle.js",
15 "/client/*.chunk.js" 13 "/client/*.chunk.js"