Merge pull request #600 from yeatmanlab/enh/restConfig-change

Force Token Refresh on SSO Logins
yeatmanlab · May 22, 2024 · ad86c67 · ad86c67
2 parents c1d6406 + fc88ac6
commit ad86c67
Show file tree

Hide file tree

Showing 31 changed files with 1,792 additions and 70 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@bdelab/roam-fluency": "^1.11.19",
-    "@bdelab/roar-firekit": "^4.11.0",
+    "@bdelab/roar-firekit": "^5.0.0",
     "@bdelab/roar-letter": "^1.11.4",
     "@bdelab/roar-multichoice": "^1.11.3",
     "@bdelab/roar-pa": "^2.2.0",

diff --git a/src/components/CreateAdministration.vue b/src/components/CreateAdministration.vue
@@ -540,11 +540,11 @@ const init = () => {
 };
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) init();
+  if (state.roarfirekit.restConfig()) init();
 });
 
 onMounted(async () => {
-  if (roarfirekit.value.restConfig) init();
+  if (roarfirekit.value.restConfig()) init();
 });
 
 watch([preExistingAdminInfo, allVariants], ([adminInfo, allVariantInfo]) => {

diff --git a/src/components/CreateAdministrator.vue b/src/components/CreateAdministrator.vue
@@ -111,11 +111,11 @@ const init = () => {
 };
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) init();
+  if (state.roarfirekit.restConfig()) init();
 });
 
 onMounted(() => {
-  if (roarfirekit.value.restConfig) init();
+  if (roarfirekit.value.restConfig()) init();
 });
 
 const selectedOrgs = ref();

diff --git a/src/components/CreateOrgs.vue b/src/components/CreateOrgs.vue
@@ -237,11 +237,11 @@ const initTable = () => {
 };
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) initTable();
+  if (state.roarfirekit.restConfig()) initTable();
 });
 
 onMounted(() => {
-  if (roarfirekit.value.restConfig) initTable();
+  if (roarfirekit.value.restConfig()) initTable();
 });
 
 const { isLoading: isLoadingClaims, data: userClaims } = useQuery({

diff --git a/src/components/ListOrgs.vue b/src/components/ListOrgs.vue
@@ -258,11 +258,11 @@ const initTable = () => {
 const { roarfirekit } = storeToRefs(authStore);
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) initTable();
+  if (state.roarfirekit.restConfig()) initTable();
 });
 
 onMounted(() => {
-  if (roarfirekit.value.restConfig) initTable();
+  if (roarfirekit.value.restConfig()) initTable();
 });
 
 watch(allDistricts, (newValue) => {

diff --git a/src/components/ListUsers.vue b/src/components/ListUsers.vue
@@ -153,10 +153,10 @@ const init = () => {
 };
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) init();
+  if (state.roarfirekit.restConfig()) init();
 });
 
 onMounted(() => {
-  if (roarfirekit.value.restConfig) init();
+  if (roarfirekit.value.restConfig()) init();
 });
 </script>
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
@@ -73,11 +73,11 @@ const init = () => {
 };
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) init();
+  if (state.roarfirekit.restConfig()) init();
 });
 
 onMounted(() => {
-  if (roarfirekit.value.restConfig) init();
+  if (roarfirekit.value.restConfig()) init();
   window.addEventListener('resize', handleResize);
 });
 

diff --git a/src/components/OrgPicker.vue b/src/components/OrgPicker.vue
@@ -255,11 +255,11 @@ const init = () => {
 const { roarfirekit } = storeToRefs(authStore);
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) init();
+  if (state.roarfirekit.restConfig()) init();
 });
 
 onMounted(() => {
-  if (roarfirekit.value.restConfig) init();
+  if (roarfirekit.value.restConfig()) init();
 });
 
 watch(allDistricts, (newValue) => {

diff --git a/src/components/reports/SubscoreTable.vue b/src/components/reports/SubscoreTable.vue
@@ -169,11 +169,11 @@ const refresh = () => {
 };
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) refresh();
+  if (state.roarfirekit.restConfig()) refresh();
 });
 
 onMounted(async () => {
-  if (roarfirekit.value.restConfig) refresh();
+  if (roarfirekit.value.restConfig()) refresh();
 });
 </script>
 <style>

diff --git a/src/components/tasks/RegisterTask.vue b/src/components/tasks/RegisterTask.vue
@@ -284,11 +284,11 @@ const init = () => {
 };
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) init();
+  if (state.roarfirekit.restConfig()) init();
 });
 
 onMounted(() => {
-  if (roarfirekit.value.restConfig) init();
+  if (roarfirekit.value.restConfig()) init();
 });
 
 const { isFetching: isFetchingTasks, data: tasks } = useQuery({

diff --git a/src/components/tasks/TaskCrowding.vue b/src/components/tasks/TaskCrowding.vue
@@ -42,7 +42,7 @@ const handlePopState = () => {
 };
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) init();
+  if (state.roarfirekit.restConfig()) init();
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
@@ -70,7 +70,7 @@ onMounted(async () => {
     console.error('An error occurred while importing the game module.', error);
   }
 
-  if (roarfirekit.value.restConfig) init();
+  if (roarfirekit.value.restConfig()) init();
   if (isFirekitInit.value && !isLoadingUserData.value) {
     await startTask();
   }

diff --git a/src/components/tasks/TaskFluency.vue b/src/components/tasks/TaskFluency.vue
@@ -42,7 +42,7 @@ const handlePopState = () => {
 };
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) init();
+  if (state.roarfirekit.restConfig()) init();
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
@@ -70,7 +70,7 @@ onMounted(async () => {
     console.error('An error occurred while importing the game module.', error);
   }
 
-  if (roarfirekit.value.restConfig) init();
+  if (roarfirekit.value.restConfig()) init();
   if (isFirekitInit.value && !isLoadingUserData.value) {
     await startTask();
   }

diff --git a/src/components/tasks/TaskLetter.vue b/src/components/tasks/TaskLetter.vue
@@ -42,7 +42,7 @@ const handlePopState = () => {
 };
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) init();
+  if (state.roarfirekit.restConfig()) init();
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
@@ -70,7 +70,7 @@ onMounted(async () => {
     console.error('An error occurred while importing the game module.', error);
   }
 
-  if (roarfirekit.value.restConfig) init();
+  if (roarfirekit.value.restConfig()) init();
   if (isFirekitInit.value && !isLoadingUserData.value) {
     await startTask();
   }

diff --git a/src/components/tasks/TaskLevante.vue b/src/components/tasks/TaskLevante.vue
@@ -42,7 +42,7 @@ const handlePopState = () => {
 };
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) init();
+  if (state.roarfirekit.restConfig()) init();
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
@@ -71,7 +71,7 @@ onMounted(async () => {
     console.error('An error occurred while importing the game module.', error);
   }
 
-  if (roarfirekit.value.restConfig) init();
+  if (roarfirekit.value.restConfig()) init();
   if (isFirekitInit.value && !isLoadingUserData.value) {
     await startTask();
   }

diff --git a/src/components/tasks/TaskMultichoice.vue b/src/components/tasks/TaskMultichoice.vue
@@ -42,7 +42,7 @@ const handlePopState = () => {
 };
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) init();
+  if (state.roarfirekit.restConfig()) init();
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
@@ -70,7 +70,7 @@ onMounted(async () => {
     console.error('An error occurred while importing the game module.', error);
   }
 
-  if (roarfirekit.value.restConfig) init();
+  if (roarfirekit.value.restConfig()) init();
   if (isFirekitInit.value && !isLoadingUserData.value) {
     await startTask();
   }

diff --git a/src/components/tasks/TaskPA.vue b/src/components/tasks/TaskPA.vue
@@ -42,7 +42,7 @@ const handlePopState = () => {
 };
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) init();
+  if (state.roarfirekit.restConfig()) init();
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
@@ -70,7 +70,7 @@ onMounted(async () => {
     console.error('An error occurred while importing the game module.', error);
   }
 
-  if (roarfirekit.value.restConfig) init();
+  if (roarfirekit.value.restConfig()) init();
   if (isFirekitInit.value && !isLoadingUserData.value) {
     await startTask();
   }

diff --git a/src/components/tasks/TaskRan.vue b/src/components/tasks/TaskRan.vue
@@ -42,7 +42,7 @@ const handlePopState = () => {
 };
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) init();
+  if (state.roarfirekit.restConfig()) init();
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
@@ -70,7 +70,7 @@ onMounted(async () => {
     console.error('An error occurred while importing the game module.', error);
   }
 
-  if (roarfirekit.value.restConfig) init();
+  if (roarfirekit.value.restConfig()) init();
   if (isFirekitInit.value && !isLoadingUserData.value) {
     await startTask();
   }

diff --git a/src/components/tasks/TaskSRE.vue b/src/components/tasks/TaskSRE.vue
@@ -42,7 +42,7 @@ const handlePopState = () => {
 };
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) init();
+  if (state.roarfirekit.restConfig()) init();
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
@@ -70,7 +70,7 @@ onMounted(async () => {
     console.error('An error occurred while importing the game module.', error);
   }
 
-  if (roarfirekit.value.restConfig) init();
+  if (roarfirekit.value.restConfig()) init();
   if (isFirekitInit.value && !isLoadingUserData.value) {
     await startTask();
   }

diff --git a/src/components/tasks/TaskSWR.vue b/src/components/tasks/TaskSWR.vue
@@ -42,7 +42,7 @@ const handlePopState = () => {
 };
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) init();
+  if (state.roarfirekit.restConfig()) init();
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
@@ -70,7 +70,7 @@ onMounted(async () => {
     console.error('An error occurred while importing the game module.', error);
   }
 
-  if (roarfirekit.value.restConfig) init();
+  if (roarfirekit.value.restConfig()) init();
   if (isFirekitInit.value && !isLoadingUserData.value) {
     await startTask();
   }

diff --git a/src/components/tasks/TaskVocab.vue b/src/components/tasks/TaskVocab.vue
@@ -42,7 +42,7 @@ const handlePopState = () => {
 };
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) init();
+  if (state.roarfirekit.restConfig()) init();
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
@@ -70,7 +70,7 @@ onMounted(async () => {
     console.error('An error occurred while importing the game module.', error);
   }
 
-  if (roarfirekit.value.restConfig) init();
+  if (roarfirekit.value.restConfig()) init();
   if (isFirekitInit.value && !isLoadingUserData.value) {
     await startTask();
   }

diff --git a/src/helpers/query/utils.js b/src/helpers/query/utils.js
@@ -72,7 +72,7 @@ export const getProjectId = (project = 'admin') => {
 export const getAxiosInstance = (db = 'admin') => {
   const authStore = useAuthStore();
   const { roarfirekit } = storeToRefs(authStore);
-  const axiosOptions = _get(roarfirekit.value.restConfig, db) ?? {};
+  const axiosOptions = _get(roarfirekit.value.restConfig(), db) ?? {};
   return axios.create(axiosOptions);
 };
 

diff --git a/src/pages/CleverLanding.vue b/src/pages/CleverLanding.vue
@@ -15,7 +15,6 @@ const router = useRouter();
 const authStore = useAuthStore();
 
 let userDataCheckInterval;
-
 async function checkForUserType() {
   try {
     const userData = await fetchDocById('users', authStore.uid);
@@ -31,7 +30,7 @@ async function checkForUserType() {
   }
 }
 
-userDataCheckInterval = setInterval(checkForUserType, 500);
+userDataCheckInterval = setInterval(checkForUserType, 1000);
 </script>
 <style>
 .loading-container {

diff --git a/src/pages/HomeAdministrator.vue b/src/pages/HomeAdministrator.vue
@@ -145,11 +145,11 @@ const init = () => {
 };
 
 unsubscribeInitializer = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) init();
+  if (state.roarfirekit.restConfig()) init();
 });
 
 onMounted(() => {
-  if (roarfirekit.value.restConfig) init();
+  if (roarfirekit.value.restConfig()) init();
 });
 
 const isSuperAdmin = computed(() => Boolean(userClaims.value?.claims?.super_admin));

diff --git a/src/pages/HomeParticipant.vue b/src/pages/HomeParticipant.vue
@@ -105,13 +105,13 @@ const authStore = useAuthStore();
 const { roarfirekit, consentSpinner } = storeToRefs(authStore);
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) init();
+  if (state.roarfirekit.restConfig()) init();
 });
 
 onMounted(async () => {
   GameTabs = (await import('../components/GameTabs.vue')).default;
   ParticipantSidebar = (await import('../components/ParticipantSidebar.vue')).default;
-  if (roarfirekit.value.restConfig) init();
+  if (roarfirekit.value.restConfig()) init();
 });
 
 const gameStore = useGameStore();

diff --git a/src/pages/HomeSelector.vue b/src/pages/HomeSelector.vue
@@ -54,7 +54,7 @@ const init = () => {
 };
 
 unsubscribe = authStore.$subscribe(async (mutation, state) => {
-  if (state.roarfirekit.restConfig) init();
+  if (state.roarfirekit.restConfig()) init();
 });
 
 const { isLoading: isLoadingUserData, data: userData } = useQuery({
@@ -127,7 +127,7 @@ onMounted(async () => {
     requireRefresh.value = false;
     router.go(0);
   }
-  if (roarfirekit.value.restConfig) init();
+  if (roarfirekit.value.restConfig()) init();
   if (!isLoading.value) {
     refreshDocs();
     await checkConsent();