@dpgradio/creative 9.0.0 → 9.0.2

package/.github/workflows/publish.yml

@@ -13,7 +13,7 @@ jobs:
           cache: npm
           registry-url: "https://registry.npmjs.org" # This is needed to make npm publish work...
       - run: npm ci
-      - run: npm version ${{ github.event.release.tag_name }} --no-git-tag-version
+      - run: npm version ${{ github.event.release.tag_name }} --no-git-tag-version --allow-same-version
       - run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/package.json

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

package/src/app/authentication.js

@@ -1,6 +1,7 @@
 import api from '../api/api.js'
 import hybrid from './hybrid.js'
 import { onLocalStorageChange } from '../utils/onLocalStorageChange.js'
+import decodeRadioToken from '../utils/decodeRadioToken.js'
 
 export const RADIO_TOKEN_LOCAL_STORAGE_KEY = 'radio-auth-token'
 
@@ -19,6 +20,18 @@ class Authentication {
 
     this.radioTokenListeners = []
     this.askingForLoginListeners = []
+
+    this._refreshTokenPromise = null
+  }
+
+  _isValidRadioToken(token) {
+    try {
+      decodeRadioToken(token)
+      return true
+    } catch (error) {
+      console.warn('Invalid radio token detected, will be removed from localStorage:', error)
+      return false
+    }
   }
 
   initialize() {
@@ -38,7 +51,22 @@ class Authentication {
     hybrid.on('didAppear', ({ radioToken }) => {
       this.setToken(radioToken ?? null)
     })
-    onLocalStorageChange(RADIO_TOKEN_LOCAL_STORAGE_KEY, (token) => this.setToken(token), true)
+    onLocalStorageChange(
+      RADIO_TOKEN_LOCAL_STORAGE_KEY,
+      (token) => {
+        if (!token) {
+          this.setToken(null)
+        } else if (this._isValidRadioToken(token)) {
+          this.setToken(token)
+        } else {
+          // Token might be broken. Remove it and try a refresh. This will also ask for login.
+          localStorage.removeItem(RADIO_TOKEN_LOCAL_STORAGE_KEY)
+          this.setToken(null)
+          this.refreshToken().catch(() => {})
+        }
+      },
+      true
+    )
   }
 
   markAskingForLogin(state) {
@@ -114,7 +142,7 @@ class Authentication {
     })
   }
 
-  async refreshToken() {
+  async _doRefreshToken() {
     if (hybrid.isNativeApp()) {
       const updatedToken = Promise.race([
         new Promise((resolve) => {
@@ -136,6 +164,9 @@ class Authentication {
             'Content-Type': 'application/json',
           },
         })
+        if (!response.ok) {
+          throw new Error(`Failed to refresh token: ${response.status} ${response.statusText}`)
+        }
         const token = (await response.json()).radioToken
         localStorage.setItem(RADIO_TOKEN_LOCAL_STORAGE_KEY, token)
         return token
@@ -145,6 +176,18 @@ class Authentication {
       }
     }
   }
+
+  async refreshToken() {
+    if (this._refreshTokenPromise) {
+      return this._refreshTokenPromise
+    }
+    this._refreshTokenPromise = this._doRefreshToken()
+    try {
+      return await this._refreshTokenPromise
+    } finally {
+      this._refreshTokenPromise = null
+    }
+  }
 }
 
 export default new Authentication()