From 983eb6d3341d5ce1a547f9ea58900fd45b03eebc Mon Sep 17 00:00:00 2001 From: Melissa Autumn Date: Thu, 7 Dec 2023 11:41:13 -0800 Subject: [PATCH 1/3] Switch us back to stage.appointment.day --- frontend/.env.staging.example | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/.env.staging.example b/frontend/.env.staging.example index c7cbf61d0..3ec231df5 100644 --- 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 From fd77aad92c762413eaae8f97c99a26fedf6e5275 Mon Sep 17 00:00:00 2001 From: Melissa Autumn Date: Thu, 7 Dec 2023 11:41:25 -0800 Subject: [PATCH 2/3] Fix unauthorized login redirect --- frontend/src/App.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 34462ca8f..3519ed9f2 100644 --- 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 From 0b12052f1097779e4362a074b7837ccfd0e7d287 Mon Sep 17 00:00:00 2001 From: Melissa Autumn Date: Thu, 7 Dec 2023 11:42:07 -0800 Subject: [PATCH 3/3] More switching back to stage.appointment.day --- .aws/task-definition.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.aws/task-definition.json b/.aws/task-definition.json index aabea6060..72a9fc211 100644 --- 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",