aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-08-10 14:58:32 +0200
committerChocobozzz <chocobozzz@cpy.re>2020-08-10 15:15:48 +0200
commit207612dff83401a9642f9cb0a63a5a6efcd5f590 (patch)
treed921b5c2f486c86b7fce244eb8cb7413c507f114 /client/src
parent41fafa9ef9da233639092de43411c9acf3417dbb (diff)
downloadPeerTube-207612dff83401a9642f9cb0a63a5a6efcd5f590.tar.gz
PeerTube-207612dff83401a9642f9cb0a63a5a6efcd5f590.tar.zst
PeerTube-207612dff83401a9642f9cb0a63a5a6efcd5f590.zip
Continue without token on error in embed
Diffstat (limited to 'client/src')
-rw-r--r--client/src/standalone/videos/embed.ts16
1 files changed, 9 insertions, 7 deletions
diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts
index c927e900e..1dca84f72 100644
--- a/client/src/standalone/videos/embed.ts
+++ b/client/src/standalone/videos/embed.ts
@@ -74,7 +74,7 @@ export class PeerTubeEmbed {
74 return window.location.origin + '/api/v1/videos/' + id 74 return window.location.origin + '/api/v1/videos/' + id
75 } 75 }
76 76
77 refreshFetch (url: string, options?: Object) { 77 refreshFetch (url: string, options?: RequestInit) {
78 return fetch(url, options) 78 return fetch(url, options)
79 .then((res: Response) => { 79 .then((res: Response) => {
80 if (res.status !== 401) return res 80 if (res.status !== 401) return res
@@ -85,8 +85,10 @@ export class PeerTubeEmbed {
85 const refreshingTokenPromise = new Promise((resolve, reject) => { 85 const refreshingTokenPromise = new Promise((resolve, reject) => {
86 const clientId: string = peertubeLocalStorage.getItem(this.LOCAL_STORAGE_OAUTH_CLIENT_KEYS.CLIENT_ID) 86 const clientId: string = peertubeLocalStorage.getItem(this.LOCAL_STORAGE_OAUTH_CLIENT_KEYS.CLIENT_ID)
87 const clientSecret: string = peertubeLocalStorage.getItem(this.LOCAL_STORAGE_OAUTH_CLIENT_KEYS.CLIENT_SECRET) 87 const clientSecret: string = peertubeLocalStorage.getItem(this.LOCAL_STORAGE_OAUTH_CLIENT_KEYS.CLIENT_SECRET)
88
88 const headers = new Headers() 89 const headers = new Headers()
89 headers.set('Content-Type', 'application/x-www-form-urlencoded') 90 headers.set('Content-Type', 'application/x-www-form-urlencoded')
91
90 const data = { 92 const data = {
91 refresh_token: this.userTokens.refreshToken, 93 refresh_token: this.userTokens.refreshToken,
92 client_id: clientId, 94 client_id: clientId,
@@ -99,8 +101,7 @@ export class PeerTubeEmbed {
99 headers, 101 headers,
100 method: 'POST', 102 method: 'POST',
101 body: objectToUrlEncoded(data) 103 body: objectToUrlEncoded(data)
102 }) 104 }).then(res => res.json())
103 .then(res => res.json())
104 .then((obj: UserRefreshToken) => { 105 .then((obj: UserRefreshToken) => {
105 this.userTokens.accessToken = obj.access_token 106 this.userTokens.accessToken = obj.access_token
106 this.userTokens.refreshToken = obj.refresh_token 107 this.userTokens.refreshToken = obj.refresh_token
@@ -116,10 +117,7 @@ export class PeerTubeEmbed {
116 }) 117 })
117 118
118 return refreshingTokenPromise 119 return refreshingTokenPromise
119 .catch(() => { 120 .catch(() => this.removeTokensFromHeaders())
120 // If refreshing fails, continue with original error
121 throw error
122 })
123 .then(() => fetch(url, { 121 .then(() => fetch(url, {
124 ...options, 122 ...options,
125 headers: this.headers 123 headers: this.headers
@@ -694,6 +692,10 @@ export class PeerTubeEmbed {
694 this.headers.set('Authorization', `${this.userTokens.tokenType} ${this.userTokens.accessToken}`) 692 this.headers.set('Authorization', `${this.userTokens.tokenType} ${this.userTokens.accessToken}`)
695 } 693 }
696 694
695 private removeTokensFromHeaders () {
696 this.headers.delete('Authorization')
697 }
698
697 private getResourceId () { 699 private getResourceId () {
698 const urlParts = window.location.pathname.split('/') 700 const urlParts = window.location.pathname.split('/')
699 return urlParts[ urlParts.length - 1 ] 701 return urlParts[ urlParts.length - 1 ]