Update master with new auth (#1236)

* Begin UI for threads and moderation overhaul

* Hide close button on non-report threads

* Fix review age coloring

* Add project count

* Remove action buttons from queue page and add queued date to project page

* Hook up to actual data

* Remove unused icon

* Get up to 1000 projects in queue

* prettier

* more prettier

* Changed all the things

* lint

* rebuild

* Add omorphia

* Workaround formatjs bug in ThreadSummary.vue

* Fix notifications page on prod

* Fix a few notifications and threads bugs

* lockfile

* Fix duplicate button styles

* more fixes and polishing

* More fixes

* Remove legacy pages

* More bugfixes

* Add some error catching for reports and notifications

* More error handling

* fix lint

* Add inbox links

* Remove loading component and rename member header

* Rely on threads always existing

* Handle if project update notifs are not grouped

* oops

* Fix chips on notifications page

* Import ModalModeration

* finish threads

* New authentication (#1234)

* Initial new auth work

* more auth pages

* Finish most

* more

* fix on landing page

* Finish everything but PATs + Sessions

* fix threads merge bugs

* fix cf pages ssr

* fix most issues

* Finish authentication

* Fix merge

---------

Co-authored-by: triphora <emma@modrinth.com>
Co-authored-by: Jai A <jaiagr+gpg@pm.me>
Co-authored-by: Geometrically <18202329+Geometrically@users.noreply.github.com>

composables/auth.js

@@ -16,8 +16,12 @@ export const initAuth = async (oldToken = null) => {
   const auth = {
     user: null,
     token: '',
-    headers: {},
   }
+
+  if (oldToken === 'none') {
+    return auth
+  }
+
   const route = useRoute()
   const authCookie = useCookie('auth-token', {
     maxAge: 60 * 60 * 24 * 365 * 10,
@@ -31,33 +35,66 @@ export const initAuth = async (oldToken = null) => {
     authCookie.value = oldToken
   }
 
-  if (route.query.code) {
+  if (route.query.code && !route.fullPath.includes('new_account=true')) {
     authCookie.value = route.query.code
   }
 
   if (authCookie.value) {
     auth.token = authCookie.value
-    try {
-      auth.user = await useBaseFetch('user', {
-        headers: {
-          Authorization: auth.token,
-        },
-      })
-    } catch {}
 
-    auth.headers = {
-      headers: {
-        Authorization: auth.token,
-      },
+    if (!auth.token || !auth.token.startsWith('mra_')) {
+      return auth
+    }
+
+    try {
+      auth.user = await useBaseFetch(
+        'user',
+        {
+          headers: {
+            Authorization: auth.token,
+          },
+        },
+        true
+      )
+    } catch {}
+  }
+
+  if (!auth.user && auth.token) {
+    try {
+      const session = await useBaseFetch(
+        'session/refresh',
+        {
+          method: 'POST',
+          headers: {
+            Authorization: auth.token,
+          },
+        },
+        true
+      )
+
+      auth.token = session.session
+      authCookie.value = auth.token
+
+      auth.user = await useBaseFetch(
+        'user',
+        {
+          headers: {
+            Authorization: auth.token,
+          },
+        },
+        true
+      )
+    } catch {
+      authCookie.value = null
     }
   }
 
   return auth
 }
 
-export const getAuthUrl = () => {
+export const getAuthUrl = (provider) => {
   const config = useRuntimeConfig()
   const route = useRoute()
 
-  return `${config.public.apiBaseUrl}auth/init?url=${config.public.siteUrl}${route.fullPath}`
+  return `${config.public.apiBaseUrl}auth/init?url=${config.public.siteUrl}${route.path}&provider=${provider}`
 }

composables/fetch.js

@@ -1,13 +1,19 @@
-export const useBaseFetch = async (url, options = {}) => {
+export const useBaseFetch = async (url, options = {}, skipAuth = false) => {
   const config = useRuntimeConfig()
   const base = process.server ? config.apiBaseUrl : config.public.apiBaseUrl
 
-  if (options.headers && process.server) {
+  if (!options.headers) {
+    options.headers = {}
+  }
+
+  if (process.server) {
     options.headers['x-ratelimit-key'] = config.rateLimitKey
-  } else if (process.server) {
-    options.headers = {
-      'x-ratelimit-key': config.rateLimitKey,
-    }
+  }
+
+  if (!skipAuth) {
+    const auth = await useAuth()
+
+    options.headers.Authorization = auth.value.token
   }
 
   return await $fetch(`${base}${url}`, options)

composables/user.js

@@ -20,8 +20,8 @@ export const initUser = async () => {
   if (auth.user && auth.user.id) {
     try {
       const [notifications, follows] = await Promise.all([
-        useBaseFetch(`user/${auth.user.id}/notifications`, auth.headers),
-        useBaseFetch(`user/${auth.user.id}/follows`, auth.headers),
+        useBaseFetch(`user/${auth.user.id}/notifications`),
+        useBaseFetch(`user/${auth.user.id}/follows`),
       ])
 
       user.notifications = notifications
@@ -41,7 +41,7 @@ export const initUserNotifs = async () => {
 
   if (auth.user && auth.user.id) {
     try {
-      user.notifications = await useBaseFetch(`user/${auth.user.id}/notifications`, auth.headers)
+      user.notifications = await useBaseFetch(`user/${auth.user.id}/notifications`)
     } catch (err) {
       console.error(err)
     }
@@ -54,7 +54,7 @@ export const initUserFollows = async () => {
 
   if (auth.user && auth.user.id) {
     try {
-      user.follows = await useBaseFetch(`user/${auth.user.id}/follows`, auth.headers)
+      user.follows = await useBaseFetch(`user/${auth.user.id}/follows`)
     } catch (err) {
       console.error(err)
     }
@@ -67,7 +67,7 @@ export const initUserProjects = async () => {
 
   if (auth.user && auth.user.id) {
     try {
-      user.projects = await useBaseFetch(`user/${auth.user.id}/projects`, auth.headers)
+      user.projects = await useBaseFetch(`user/${auth.user.id}/projects`)
     } catch (err) {
       console.error(err)
     }
@@ -75,7 +75,6 @@ export const initUserProjects = async () => {
 }
 
 export const userFollowProject = async (project) => {
-  const auth = (await useAuth()).value
   const user = (await useUser()).value
 
   user.follows = user.follows.concat(project)
@@ -84,13 +83,11 @@ export const userFollowProject = async (project) => {
   setTimeout(() => {
     useBaseFetch(`project/${project.id}/follow`, {
       method: 'POST',
-      ...auth.headers,
     })
   })
 }
 
 export const userUnfollowProject = async (project) => {
-  const auth = (await useAuth()).value
   const user = (await useUser()).value
 
   user.follows = user.follows.filter((x) => x.id !== project.id)
@@ -99,7 +96,6 @@ export const userUnfollowProject = async (project) => {
   setTimeout(() => {
     useBaseFetch(`project/${project.id}/follow`, {
       method: 'DELETE',
-      ...auth.headers,
     })
   })
 }
@@ -126,3 +122,45 @@ export const userReadNotifications = async (ids) => {
     return x
   })
 }
+
+export const resendVerifyEmail = async () => {
+  const app = useNuxtApp()
+
+  startLoading()
+  try {
+    await useBaseFetch('auth/email/resend_verify', {
+      method: 'POST',
+    })
+
+    const auth = await useAuth()
+    app.$notify({
+      group: 'main',
+      title: 'Email sent',
+      text: `An email with a link to verify your account has been sent to ${auth.value.user.email}.`,
+      type: 'success',
+    })
+  } catch (err) {
+    app.$notify({
+      group: 'main',
+      title: 'An error occurred',
+      text: err.data.description,
+      type: 'error',
+    })
+  }
+  stopLoading()
+}
+
+export const logout = async () => {
+  startLoading()
+  const auth = await useAuth()
+  try {
+    await useBaseFetch(`session/${auth.value.token}`, {
+      method: 'DELETE',
+    })
+  } catch {}
+
+  await useAuth('none')
+  useCookie('auth-token').value = null
+  await navigateTo('/')
+  stopLoading()
+}