@dpgradio/creative 8.0.0 → 8.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dpgradio/creative",
-  "version": "8.0.0",
+  "version": "8.1.1",
   "description": "Support package for standalone Javascript applications",
   "main": "src/index.js",
   "scripts": {

package/src/api/request.js

@@ -1,5 +1,8 @@
 import tap from '../utils/tap.js'
+import authentication from '../app/authentication.js'
 
+let authenticationRetries = 0
+let tokenRefreshPromise = null
 export default class Request {
   constructor(baseUrl, version, errorHandlers = []) {
     this.baseUrl = baseUrl
@@ -76,6 +79,21 @@ export default class Request {
     })
 
     if (!response.ok) {
+      if (response.status === 401 && authenticationRetries < 2) {
+        if (!tokenRefreshPromise) {
+          tokenRefreshPromise = authentication.refreshToken()
+        }
+
+        try {
+          const newToken = await tokenRefreshPromise
+          authenticationRetries++
+          this.withHeader('Authorization', `Bearer ${newToken}`)
+          return await this.fetchJson(endpoint, method)
+        } finally {
+          tokenRefreshPromise = null
+        }
+      }
+
       this.errorHandlers.forEach((handler) => handler({ response }))
 
       throw new Error(
@@ -84,6 +102,9 @@ export default class Request {
       )
     }
 
+    // reset authentication retries
+    authenticationRetries = 0
+
     try {
       return await response.json()
     } catch (error) {

package/src/app/authentication.js

@@ -22,11 +22,14 @@ class Authentication {
   }
 
   initialize() {
-    hybrid.appLoaded().then((radioToken) => {
-      if (radioToken) {
-        this.setToken(radioToken)
-      }
-    })
+    hybrid
+      .appLoaded()
+      .then((radioToken) => {
+        if (radioToken) {
+          this.setToken(radioToken)
+        }
+      })
+      .catch(() => {}) // We don't have to do anything if there is no radio token at app load
     hybrid.on('authenticated', ({ radioToken }) => {
       this.setToken(radioToken)
     })
@@ -110,6 +113,38 @@ class Authentication {
       }
     })
   }
+
+  async refreshToken() {
+    if (hybrid.isNativeApp()) {
+      const updatedToken = Promise.race([
+        new Promise((resolve) => {
+          hybrid.on('authenticated', (token) => resolve(token))
+        }),
+        new Promise((_, reject) => {
+          setTimeout(() => reject(new Error('Timeout: no token received')), 2000)
+        }),
+      ])
+
+      hybrid.call('refreshExpiredToken')
+
+      return (await updatedToken).radioToken
+    } else {
+      try {
+        const response = await fetch('/login/refresh', {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+        })
+        const token = (await response.json()).radioToken
+        localStorage.setItem(RADIO_TOKEN_LOCAL_STORAGE_KEY, token)
+        return token
+      } catch (e) {
+        localStorage.removeItem(RADIO_TOKEN_LOCAL_STORAGE_KEY)
+        throw e
+      }
+    }
+  }
 }
 
 export default new Authentication()