Merge branch 'main' into stage

thunderbird · Dec 7, 2023 · 9efe9bb · 9efe9bb
2 parents 269903f + 0b12052
commit 9efe9bb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.aws/task-definition.json b/.aws/task-definition.json
@@ -18,7 +18,7 @@
             "environment": [
                 {
                     "name": "FRONTEND_URL",
-                    "value": "https://appointment.day"
+                    "value": "https://stage.appointment.day"
                 },
                 {
                     "name": "SHORT_BASE_URL",
@@ -58,7 +58,7 @@
                 },
                 {
                   "name": "ZOOM_AUTH_CALLBACK",
-                  "value": "https://appointment.day/api/v1/zoom/callback"
+                  "value": "https://stage.appointment.day/api/v1/zoom/callback"
                 },
                 {
                   "name": "SERVICE_EMAIL",

diff --git a/frontend/.env.staging.example b/frontend/.env.staging.example
@@ -1,7 +1,6 @@
 # Production env config, do not put secrets in here !!
-# This is pointing to prod as a temp fix !
-VUE_APP_API_URL=appointment.day/api/v1/
-VUE_APP_BASE_URL=appointment.day
+VUE_APP_API_URL=stage.appointment.day/api/v1/
+VUE_APP_BASE_URL=stage.appointment.day
 VUE_APP_API_SECURE=true
 VUE_APP_SHORT_BASE_URL=https://stage.apmt.day
 

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
@@ -85,10 +85,11 @@ const call = createFetch({
           data.detail?.message || 'Please re-connect with Google',
           url,
         );
-      } else if (error.statusCode === 401) {
+      } else if (response.status === 401) {
         // Clear current user data, and ship them to the login screen!
         await currentUser.reset();
-        router.push('/login');
+        await router.push('/login');
+        return;
       }
 
       // Pass the error along