From 3b770bbd4be17e6018be371f60796664a86a0561 Mon Sep 17 00:00:00 2001
From: Niklas Widmann <nik@somethingcatchy.net>
Date: Mon, 12 Aug 2024 16:53:22 +0200
Subject: [PATCH] remember redirect on login & improve sentry compatibility

---
 components/Nav.vue       |  5 ++++-
 composables/auth.ts      | 11 +++++++++++
 pages/login.vue          |  8 +++++---
 plugins/sentry.ts        | 13 ++++++++++---
 server/plugins/sentry.ts | 20 ++++++++++++++++++++
 5 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100644 server/plugins/sentry.ts

diff --git a/components/Nav.vue b/components/Nav.vue
index aaeee54..cd467c1 100644
--- a/components/Nav.vue
+++ b/components/Nav.vue
@@ -7,13 +7,14 @@
       <section class="flex gap-4 ml-auto">
          <ThemeButton />
          <ProfileIcon v-if="account" :account="account" />
-         <NuxtLink v-else to="/login" class="px-2"> Login </NuxtLink>
+         <NuxtLink v-else :to="loginLink" class="px-2"> Login </NuxtLink>
       </section>
    </nav>
 </template>
 
 <script lang="ts" setup>
 import { BookOpenIcon, FlagIcon, MapIcon, MapPinIcon } from '@heroicons/vue/24/solid'
+import type { RouteLocationRaw } from 'vue-router'
 
 const route = useRoute()
 
@@ -26,6 +27,8 @@ const links = ref([
 
 const active = computed(() => [...links.value].reverse().find(it => route.path.startsWith(it.to))?.to)
 
+const loginLink = computed((): RouteLocationRaw => ({ name: 'login', query: { from: route.path } }))
+
 const { account } = useSession()
 </script>
 
diff --git a/composables/auth.ts b/composables/auth.ts
index 2b74adb..6859dec 100644
--- a/composables/auth.ts
+++ b/composables/auth.ts
@@ -1,13 +1,24 @@
 import { MeDocument, Permission, type SelfFragment } from '~/graphql/generated'
 
+function refresh() {
+   const apollo = useApolloClient()
+   apollo.client.refetchQueries({ include: 'all' })
+}
+
 export function login(token: string) {
    const cookie = useToken()
    cookie.value = token
+
+   refresh()
 }
 
 export function logout() {
    const cookie = useToken()
    cookie.value = null
+
+   if (import.meta.client) {
+      window.location.reload()
+   }
 }
 
 interface Session {
diff --git a/pages/login.vue b/pages/login.vue
index 9ed96fa..d8cfe8b 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -1,6 +1,6 @@
 <template>
    <div id="buttons">
-      <a href="/auth/discord">
+      <a :href="`/auth/discord?from=${redirectTo}`">
          <StyledButton id="discord"> Login via Discord</StyledButton>
       </a>
       <div v-if="result?.settings.development">
@@ -30,10 +30,12 @@ const { query } = useRoute()
 const router = useRouter()
 const { result } = useQuery(ApiSettingsDocument)
 
+const redirectTo = computed(() => query.from?.toString() || '/me')
+
 onMounted(() => {
    if (query.token && typeof query.token === 'string') {
       login(query.token)
-      router.replace('/me')
+      router.replace(redirectTo.value)
    }
 })
 
@@ -44,7 +46,7 @@ async function seededLogin(values: ImpersonateMutationVariables) {
    const token = reponse?.data?.impersonate?.token
    if (token) {
       login(token)
-      router.push('/me')
+      router.push(redirectTo.value)
    }
 }
 </script>
diff --git a/plugins/sentry.ts b/plugins/sentry.ts
index b0c08a9..a9ba06d 100644
--- a/plugins/sentry.ts
+++ b/plugins/sentry.ts
@@ -1,14 +1,21 @@
 import { browserTracingIntegration, init, replayIntegration } from '@sentry/vue'
 
 export default defineNuxtPlugin({
-   setup: nuxt => {
+   setup: ({ vueApp }) => {
       const config = useRuntimeConfig()
+      const router = useRouter()
+
+      if (!config.public.sentryDsn) {
+         // eslint-disable-next-line no-console
+         console.warn('Sentry DSN not set, skipping Sentry initialization')
+         return
+      }
 
       init({
-         app: nuxt.vueApp,
+         app: vueApp,
          dsn: config.public.sentryDsn,
          environment: config.public.sentryEnvironment,
-         integrations: [browserTracingIntegration(), replayIntegration()],
+         integrations: [replayIntegration(), browserTracingIntegration({ router })],
          tracesSampleRate: 1.0,
          tracePropagationTargets: ['localhost'],
          replaysSessionSampleRate: 1.0,
diff --git a/server/plugins/sentry.ts b/server/plugins/sentry.ts
new file mode 100644
index 0000000..8fbc737
--- /dev/null
+++ b/server/plugins/sentry.ts
@@ -0,0 +1,20 @@
+import { captureException, close } from '@sentry/vue'
+import { H3Error } from 'h3'
+
+const IGNORED_STATUS_CODES = [404, 422]
+
+export default defineNitroPlugin(nitroApp => {
+   nitroApp.hooks.hook('error', error => {
+      if (error instanceof H3Error) {
+         if (IGNORED_STATUS_CODES.includes(error.statusCode)) {
+            return
+         }
+      }
+
+      captureException(error)
+   })
+
+   nitroApp.hooks.hookOnce('close', async () => {
+      await close(2000)
+   })
+})