From d88494af24cf9219ab7bf6daae720ac8b3fe84d4 Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Fri, 14 Oct 2022 17:57:04 -0800
Subject: [PATCH] use auth middleware

---
 frontend/layouts/default.vue       | 64 ++++++++++++++++++++++++++-
 frontend/layouts/home.vue          | 69 ------------------------------
 frontend/middleware/auth.ts        | 15 +++++++
 frontend/pages/home.vue            | 12 +-----
 frontend/pages/item/[id]/edit.vue  |  2 +-
 frontend/pages/item/[id]/index.vue |  2 +-
 frontend/pages/item/new.vue        |  2 +-
 frontend/pages/items.vue           |  3 +-
 frontend/pages/label/[id].vue      |  2 +-
 frontend/pages/location/[id].vue   |  2 +-
 frontend/pages/profile.vue         |  2 +-
 11 files changed, 87 insertions(+), 88 deletions(-)
 delete mode 100644 frontend/layouts/home.vue
 create mode 100644 frontend/middleware/auth.ts

diff --git a/frontend/layouts/default.vue b/frontend/layouts/default.vue
index a65f7e3..1d87350 100644
--- a/frontend/layouts/default.vue
+++ b/frontend/layouts/default.vue
@@ -1,10 +1,70 @@
-<script setup lang="ts"></script>
 <template>
   <div>
     <AppToast />
     <AppHeader />
-    <main class="p-8 dark:bg-gray-800 dark:text-white bg-white text-gray-800 min-h-screen">
+    <main>
       <slot></slot>
     </main>
   </div>
 </template>
+
+<script lang="ts" setup>
+  import { useItemStore } from "~~/stores/items";
+  import { useLabelStore } from "~~/stores/labels";
+  import { useLocationStore } from "~~/stores/locations";
+
+  /**
+   * Store Provider Initialization
+   */
+
+  const labelStore = useLabelStore();
+  const reLabel = /\/api\/v1\/labels\/.*/gm;
+  const rmLabelStoreObserver = defineObserver("labelStore", {
+    handler: r => {
+      if (r.status === 201 || r.url.match(reLabel)) {
+        labelStore.refresh();
+      }
+      console.debug("labelStore handler called by observer");
+    },
+  });
+
+  const locationStore = useLocationStore();
+  const reLocation = /\/api\/v1\/locations\/.*/gm;
+  const rmLocationStoreObserver = defineObserver("locationStore", {
+    handler: r => {
+      if (r.status === 201 || r.url.match(reLocation)) {
+        locationStore.refresh();
+      }
+      console.debug("locationStore handler called by observer");
+    },
+  });
+
+  const itemStore = useItemStore();
+  const reItem = /\/api\/v1\/items\/.*/gm;
+  const rmItemStoreObserver = defineObserver("itemStore", {
+    handler: r => {
+      if (r.status === 201 || r.url.match(reItem)) {
+        itemStore.refresh();
+      }
+      console.debug("itemStore handler called by observer");
+    },
+  });
+
+  const eventBus = useEventBus();
+  eventBus.on(
+    EventTypes.ClearStores,
+    () => {
+      labelStore.refresh();
+      itemStore.refresh();
+      locationStore.refresh();
+    },
+    "stores"
+  );
+
+  onUnmounted(() => {
+    rmLabelStoreObserver();
+    rmLocationStoreObserver();
+    rmItemStoreObserver();
+    eventBus.off(EventTypes.ClearStores, "stores");
+  });
+</script>
diff --git a/frontend/layouts/home.vue b/frontend/layouts/home.vue
deleted file mode 100644
index 9f0adc7..0000000
--- a/frontend/layouts/home.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<template>
-  <div>
-    <AppToast />
-    <AppHeader />
-    <main>
-      <slot></slot>
-    </main>
-  </div>
-</template>
-
-<script lang="ts" setup>
-  import { useItemStore } from "~~/stores/items";
-  import { useLabelStore } from "~~/stores/labels";
-  import { useLocationStore } from "~~/stores/locations";
-  /**
-   * Store Provider Initialization
-   */
-
-  const labelStore = useLabelStore();
-  const reLabel = /\/api\/v1\/labels\/.*/gm;
-  const rmLabelStoreObserver = defineObserver("labelStore", {
-    handler: r => {
-      if (r.status === 201 || r.url.match(reLabel)) {
-        labelStore.refresh();
-      }
-      console.debug("labelStore handler called by observer");
-    },
-  });
-
-  const locationStore = useLocationStore();
-  const reLocation = /\/api\/v1\/locations\/.*/gm;
-  const rmLocationStoreObserver = defineObserver("locationStore", {
-    handler: r => {
-      if (r.status === 201 || r.url.match(reLocation)) {
-        locationStore.refresh();
-      }
-      console.debug("locationStore handler called by observer");
-    },
-  });
-
-  const itemStore = useItemStore();
-  const reItem = /\/api\/v1\/items\/.*/gm;
-  const rmItemStoreObserver = defineObserver("itemStore", {
-    handler: r => {
-      if (r.status === 201 || r.url.match(reItem)) {
-        itemStore.refresh();
-      }
-      console.debug("itemStore handler called by observer");
-    },
-  });
-
-  const eventBus = useEventBus();
-  eventBus.on(
-    EventTypes.ClearStores,
-    () => {
-      labelStore.refresh();
-      itemStore.refresh();
-      locationStore.refresh();
-    },
-    "stores"
-  );
-
-  onUnmounted(() => {
-    rmLabelStoreObserver();
-    rmLocationStoreObserver();
-    rmItemStoreObserver();
-    eventBus.off(EventTypes.ClearStores, "stores");
-  });
-</script>
diff --git a/frontend/middleware/auth.ts b/frontend/middleware/auth.ts
new file mode 100644
index 0000000..f67fa01
--- /dev/null
+++ b/frontend/middleware/auth.ts
@@ -0,0 +1,15 @@
+import { useAuthStore } from "~~/stores/auth";
+
+export default defineNuxtRouteMiddleware(async () => {
+  const auth = useAuthStore();
+  const api = useUserApi();
+
+  if (!auth.self) {
+    const { data, error } = await api.user.self();
+    if (error) {
+      navigateTo("/");
+    }
+
+    auth.$patch({ self: data.item });
+  }
+});
diff --git a/frontend/pages/home.vue b/frontend/pages/home.vue
index c3a4819..8bf0a54 100644
--- a/frontend/pages/home.vue
+++ b/frontend/pages/home.vue
@@ -5,8 +5,9 @@
   import { useLocationStore } from "~~/stores/locations";
 
   definePageMeta({
-    layout: "home",
+    middleware: ["auth"],
   });
+
   useHead({
     title: "Homebox | Home",
   });
@@ -15,15 +16,6 @@
 
   const auth = useAuthStore();
 
-  if (auth.self === null) {
-    const { data, error } = await api.user.self();
-    if (error) {
-      navigateTo("/");
-    }
-
-    auth.$patch({ self: data.item });
-  }
-
   const itemsStore = useItemStore();
   const items = computed(() => itemsStore.items);
 
diff --git a/frontend/pages/item/[id]/edit.vue b/frontend/pages/item/[id]/edit.vue
index 8ffcba6..35daf29 100644
--- a/frontend/pages/item/[id]/edit.vue
+++ b/frontend/pages/item/[id]/edit.vue
@@ -6,7 +6,7 @@
   import { capitalize } from "~~/lib/strings";
 
   definePageMeta({
-    layout: "home",
+    middleware: ["auth"],
   });
 
   const route = useRoute();
diff --git a/frontend/pages/item/[id]/index.vue b/frontend/pages/item/[id]/index.vue
index 5c9c938..ae22d0c 100644
--- a/frontend/pages/item/[id]/index.vue
+++ b/frontend/pages/item/[id]/index.vue
@@ -3,7 +3,7 @@
   import { ItemAttachment } from "~~/lib/api/types/data-contracts";
 
   definePageMeta({
-    layout: "home",
+    middleware: ["auth"],
   });
 
   const route = useRoute();
diff --git a/frontend/pages/item/new.vue b/frontend/pages/item/new.vue
index 4762c1c..a1a6584 100644
--- a/frontend/pages/item/new.vue
+++ b/frontend/pages/item/new.vue
@@ -1,6 +1,6 @@
 <script setup>
   definePageMeta({
-    layout: "home",
+    middleware: ["auth"],
   });
 
   const show = reactive({
diff --git a/frontend/pages/items.vue b/frontend/pages/items.vue
index b827562..6481345 100644
--- a/frontend/pages/items.vue
+++ b/frontend/pages/items.vue
@@ -4,8 +4,9 @@
   import { useLocationStore } from "~~/stores/locations";
 
   definePageMeta({
-    layout: "home",
+    middleware: ["auth"],
   });
+
   useHead({
     title: "Homebox | Home",
   });
diff --git a/frontend/pages/label/[id].vue b/frontend/pages/label/[id].vue
index d61b8fa..414c3ed 100644
--- a/frontend/pages/label/[id].vue
+++ b/frontend/pages/label/[id].vue
@@ -2,7 +2,7 @@
   import type { DateDetail, Detail } from "~~/components/global/DetailsSection/types";
 
   definePageMeta({
-    layout: "home",
+    middleware: ["auth"],
   });
 
   const route = useRoute();
diff --git a/frontend/pages/location/[id].vue b/frontend/pages/location/[id].vue
index 04b80a0..0fcf09b 100644
--- a/frontend/pages/location/[id].vue
+++ b/frontend/pages/location/[id].vue
@@ -2,7 +2,7 @@
   import { Detail, DateDetail } from "~~/components/global/DetailsSection/types";
 
   definePageMeta({
-    layout: "home",
+    middleware: ["auth"],
   });
 
   const route = useRoute();
diff --git a/frontend/pages/profile.vue b/frontend/pages/profile.vue
index b7279f0..2c4fbeb 100644
--- a/frontend/pages/profile.vue
+++ b/frontend/pages/profile.vue
@@ -5,7 +5,7 @@
   import { currencies, Currency } from "~~/lib/data/currency";
 
   definePageMeta({
-    layout: "home",
+    middleware: ["auth"],
   });
   useHead({
     title: "Homebox | Profile",