Merge pull request #302 from KenEucker/develop

Trying to resolve the 400 errors.

Author: KenEucker

functions/common/methods.ts

@@ -14,6 +14,7 @@ import nodemailer from 'nodemailer'
 import { extname, join } from 'path'
 import qs from 'qs'
 import {
+  BikeTagEnv,
   getDomainInfo,
   getImageSized,
   getTagDateISOFromTimezone,
@@ -498,7 +499,10 @@ export const getPayloadAuthorization = async (
       const { payload } = await jose.jwtVerify(authStr, JWKS)
       return payload
     } catch (e: any) {
-      if (e.code === 'ERR_JWT_EXPIRED') return null
+      if (e.code === 'ERR_JWT_EXPIRED') {
+        log('Auth0 JWT expired', e, 'warn')
+        return null
+      }
       log('Auth0 JWT verification error', e, 'warn')
       return authStr
     }
@@ -857,9 +861,14 @@ export const archiveAndClearQueue = async (
       { game: queuedTags[0].game },
       { source: 'sanity' },
     )
-    game = gameResponse.success ? gameResponse.data : undefined
+    if (gameResponse.success) {
+      game = gameResponse.data
+    } else {
+      return  { results: [{ message: ErrorMessage.GameNotSet, game: undefined }], errors: true }
+    }
   }
-  const imageSource = game?.awsRegion ? 'aws' : 'imgur'
+  
+  const imageSource = getImageSource(game)
 
   if (queuedTags.length && game) {
     const nonAdminBikeTagOpts = getBikeTagClientOpts(undefined, true, false, game)
@@ -1939,5 +1948,5 @@ export const getImageSource = (game: Game): 'aws' | 'imgur' => {
   } else if (game.mainhash?.length) {
     return 'imgur'
   }
-  return 'imgur'
+  return BikeTagEnv.IMAGE_SOURCE as 'aws' | 'imgur'
 }

src/common/constants.ts

@@ -6,7 +6,7 @@ export const BikeTagDefaults = {
   hostKey: 'ItsABikeTagGame',
   logo: '/images/BikeTag.svg',
   jingle: 'media/biketag-jingle-1.mp3',
-  imageSource: 'imgur',
+  imageSource: 'aws',
   gameSource: 'sanity',
   store: 'biketag',
   cacheResetInterval: '5000',
@@ -41,11 +41,10 @@ export const BikeTagEnv = {
   B_KEY: process.env.B_KEY ?? process.env.CLIENT_KEY ?? null,
   /* BikeTag Configuration */
   GAME_NAME: process.env.GAME_NAME ?? null,
-  GAME_SOURCE: process.env.GAME_SOURCE ?? BikeTagDefaults.gameSource ?? null,
-  IMAGE_SOURCE: process.env.IMAGE_SOURCE ?? BikeTagDefaults.imageSource ?? null,
+  GAME_SOURCE: process.env.GAME_SOURCE ?? BikeTagDefaults.gameSource,
+  IMAGE_SOURCE: process.env.IMAGE_SOURCE ?? BikeTagDefaults.imageSource,
   HOST: process.env.HOST ?? BikeTagDefaults.host ?? null,
   BIKETAG_AUTHED: process.env.BIKETAG_AUTHED ?? null,
-  DEFAULT_IMAGE_SOURCE: process.env.DEFAULT_IMAGE_SOURCE ?? BikeTagDefaults.imageSource ?? 'imgur',
   /* Google Configuration */
   G_AKEY:
     process.env.G_AKEY ?? process.env.GOOGLE_ACCESS_TOKEN ?? process.env.GOOGLE_API_KEY ?? null,

src/store/index.ts

@@ -172,6 +172,10 @@ export const useBikeTagStore = defineStore(BikeTagDefaults.store, {
             },
           })
           .catch((e) => {
+            /// THIS IS COSTLY
+            this.auth0Token = undefined
+            localStorage.clear()            
+            this.SET_PROFILE()
             console.error('error fetching profile', e)
             return e
           })
@@ -243,7 +247,7 @@ export const useBikeTagStore = defineStore(BikeTagDefaults.store, {
       }
     },
     async fetchCredentials(fetchNewCredentials = false) {
-      if (!this.credentialsFetched || fetchNewCredentials) {
+      if ((!this.credentialsFetched && !this.token?.length) || fetchNewCredentials) {
         try {
           const biketagConf = await client.fetchCredentials(`player-id ${this.profile.sub}`)
           if (biketagConf?.biketag?.clientToken) {
@@ -745,7 +749,7 @@ export const useBikeTagStore = defineStore(BikeTagDefaults.store, {
     // ======= mutations ================================================
     // ==================================================================
 
-    SET_PROFILE(profile: any) {
+    SET_PROFILE(profile?: any) {
       const oldState = this.profile
 
       if (