feat(middleware): improve middleware for checking token expiration

PrivateAIM · Aug 16, 2024 · d53920f · d53920f
1 parent 6241955
commit d53920f
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 16 deletions.
diff --git a/components/analysis/AnalysesTable.vue b/components/analysis/AnalysesTable.vue
@@ -3,7 +3,7 @@ import { getAnalysisNodes } from "~/composables/useAPIFetch";
 import { formatDataRow } from "~/utils/format-data-row";
 import TableRowMetadata from "~/components/TableRowMetadata.vue";
 import ExpandRowButtons from "~/components/table/ExpandRowButtons.vue";
-import { showConnectionErrorToast } from "~/composables/connectionErrorToast";
+import { showHubAdapterConnectionErrorToast } from "~/composables/connectionErrorToast";
 
 const expandedRows = ref();
 const analyses = ref();
@@ -25,7 +25,7 @@ if (status.value === "success") {
     expandRowEntries,
   );
 } else if (error.value?.statusCode === 500) {
-  showConnectionErrorToast();
+  showHubAdapterConnectionErrorToast();
 }
 
 function onToggleRowExpansion(rowIds) {

diff --git a/components/data-stores/DataStoreListTabs.vue b/components/data-stores/DataStoreListTabs.vue
@@ -10,7 +10,6 @@ import { formatDataRow } from "~/utils/format-data-row";
 import type { Analysis, DetailedService, Project, Route } from "~/services/Api";
 import DetailedDataStoreTable from "~/components/data-stores/tables/DetailedDataStoreTable.vue";
 import DetailedAnalysisTable from "~/components/data-stores/tables/DetailedAnalysisTable.vue";
-import { showConnectionErrorToast } from "~/composables/connectionErrorToast";
 import DataStoreTreeTable from "~/components/data-stores/tables/DataStoreTreeTable.vue";
 
 const dataStores = ref();
@@ -76,7 +75,6 @@ async function loadDetailedDataStoreTable(responseData, status, error) {
     });
     dataStores.value = formattedDataStores;
   } else if (error.value?.statusCode === 500) {
-    showConnectionErrorToast();
     dataStores.value = [];
   }
   loading.value = false;

diff --git a/components/projects/ProjectTable.vue b/components/projects/ProjectTable.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { getProjects } from "~/composables/useAPIFetch";
 import { formatDataRow } from "~/utils/format-data-row";
-import { showConnectionErrorToast } from "~/composables/connectionErrorToast";
+import { showHubAdapterConnectionErrorToast } from "~/composables/connectionErrorToast";
 
 const projects = ref();
 
@@ -16,7 +16,7 @@ if (status.value === "success") {
     expandRowEntries,
   );
 } else if (error.value?.statusCode === 500) {
-  showConnectionErrorToast();
+  showHubAdapterConnectionErrorToast();
 }
 </script>
 

diff --git a/components/projects/ProposalTable.vue b/components/projects/ProposalTable.vue
@@ -5,7 +5,7 @@ import { formatDataRow } from "~/utils/format-data-row";
 import TableRowMetadata from "~/components/TableRowMetadata.vue";
 import type { ProjectNode } from "~/services/Api";
 import ExpandRowButtons from "~/components/table/ExpandRowButtons.vue";
-import { showConnectionErrorToast } from "~/composables/connectionErrorToast";
+import { showHubAdapterConnectionErrorToast } from "~/composables/connectionErrorToast";
 
 const proposals = ref();
 const expandedRows = ref({});
@@ -21,7 +21,7 @@ if (status.value === "success") {
     expandRowEntries,
   );
 } else if (error.value?.statusCode === 500) {
-  showConnectionErrorToast();
+  showHubAdapterConnectionErrorToast();
 }
 
 function onToggleRowExpansion(rowIds) {

diff --git a/composables/connectionErrorToast.ts b/composables/connectionErrorToast.ts
@@ -7,12 +7,24 @@ export const useToastService = () => {
   return getToast();
 };
 
-export const showConnectionErrorToast = () => {
+export const showHubAdapterConnectionErrorToast = () => {
   const toast = useToastService();
   toast.add({
     severity: "error",
     summary: "Connection error",
     detail: "Unable to contact the API.",
     life: 3000,
   });
+  console.warn("Hub Adapter API service unreachable");
+};
+
+export const showKongConnectionErrorToast = () => {
+  const toast = useToastService();
+  toast.add({
+    severity: "error",
+    summary: "Connection error",
+    detail: "Unable to contact the Kong gateway service.",
+    life: 3000,
+  });
+  console.warn("Kong service unreachable");
 };
diff --git a/composables/useAPIFetch.ts b/composables/useAPIFetch.ts
@@ -84,6 +84,13 @@ export function updateAnalysis(analysis_id: string, updates) {
 
 // Kong endpoints
 export function getDataStores(includeProject: boolean, opts?) {
+  // return nuxtApp.$hubApi("/kong/datastore", {
+  //   ...opts,
+  //   method: "GET",
+  //   query: {
+  //     detailed: includeProject,
+  //   },
+  // });
   return useAPIFetch<{ data: ListServices }>("/kong/datastore", {
     ...opts,
     method: "GET",

diff --git a/middleware/auth.ts b/middleware/auth.ts
@@ -1,7 +1,13 @@
 export default defineNuxtRouteMiddleware(async (to) => {
-  const { loggedIn, login } = useOidcAuth();
+  const { loggedIn, login, user } = useOidcAuth();
   if (!loggedIn.value && to.path !== "/") {
     console.warn("Not logged in");
     return login();
   }
+
+  if (Date.now() > Date.parse(user?.value.expireAt.toString())) {
+    console.warn("Token expired, routing to IDP");
+    await login();
+    navigateTo(to.path);
+  }
 });
diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -42,11 +42,12 @@ export default defineNuxtConfig({
         userinfoUrl:
           process.env.KEYCLOAK_SERVICE_URL +
           "/protocol/openid-connect/userinfo",
+        pkce: true,
       },
     },
     session: {
       expirationCheck: false,
-      automaticRefresh: true,
+      automaticRefresh: false,
       maxAge: 3600,
     },
     middleware: {

diff --git a/plugins/api.ts b/plugins/api.ts
@@ -1,5 +1,10 @@
+import {
+  showKongConnectionErrorToast,
+  showHubAdapterConnectionErrorToast,
+} from "~/composables/connectionErrorToast";
+
 export default defineNuxtPlugin((nuxtApp) => {
-  const { user } = useOidcAuth();
+  const { user, login } = useOidcAuth();
   const config = useRuntimeConfig();
   const baseUrl = config.public.hubAdapterUrl as string;
   const hubApi = $fetch.create({
@@ -15,12 +20,20 @@ export default defineNuxtPlugin((nuxtApp) => {
     onRequestError({ error }) {
       console.log(error);
     },
-    onResponseError({ response }) {
+    onResponseError({ request, response }) {
       // Handle the response errors
       console.log(response);
-      if (response.status === 401 || response.status === 403) {
-        console.warn("User signed out, routing to login");
-        nuxtApp.runWithContext(() => navigateTo("/auth/login"));
+      // if (response.status === 401 || response.status === 403) {
+      //   console.warn("User not signed in, routing to login");
+      //   return login();
+      // }
+
+      if (response.status === 500) {
+        if (typeof request === "string" && request.includes("kong")) {
+          showKongConnectionErrorToast();
+        } else {
+          showHubAdapterConnectionErrorToast();
+        }
       }
     },
   });