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>

helpers/notifications.js

@@ -2,13 +2,12 @@ import { useNuxtApp } from '#app'
 import { userReadNotifications } from '~/composables/user.js'
 
 async function getBulk(type, ids) {
-  const auth = (await useAuth()).value
   if (ids.length === 0) {
     return []
   }
 
-  const url = `${type}?ids=${JSON.stringify([...new Set(ids)])}`
-  const { data: bulkFetch } = await useAsyncData(url, () => useBaseFetch(url, auth.headers))
+  const url = `${type}?ids=${encodeURIComponent(JSON.stringify([...new Set(ids)]))}`
+  const { data: bulkFetch } = await useAsyncData(url, () => useBaseFetch(url))
   return bulkFetch.value
 }
 
@@ -16,7 +15,7 @@ export async function fetchNotifications() {
   try {
     const auth = (await useAuth()).value
     const { data: notifications } = await useAsyncData(`user/${auth.user.id}/notifications`, () =>
-      useBaseFetch(`user/${auth.user.id}/notifications`, auth.headers)
+      useBaseFetch(`user/${auth.user.id}/notifications`)
     )
 
     const projectIds = []
@@ -161,12 +160,8 @@ export function groupNotifications(notifications, includeRead = false) {
 
 export async function markAsRead(ids) {
   try {
-    const auth = (await useAuth()).value
     await useBaseFetch(`notifications?ids=${JSON.stringify([...new Set(ids)])}`, {
       method: 'PATCH',
-      headers: {
-        Authorization: auth.token,
-      },
     })
     await userReadNotifications(ids)
     return (notifications) => {

helpers/projects.js

@@ -1,20 +1,21 @@
 export const getProjectTypeForUrl = (type, categories) => {
-  const app = useNuxtApp()
-  return getProjectTypeForUrlShorthand(app, type, categories)
+  return getProjectTypeForUrlShorthand(type, categories)
 }
 
-export const getProjectTypeForUrlShorthand = (app, type, categories) => {
+export const getProjectTypeForUrlShorthand = (type, categories, overrideTags) => {
+  const tags = overrideTags ?? useTags().value
+
   if (type === 'mod') {
     const isMod = categories.some((category) => {
-      return app.$tag.loaderData.modLoaders.includes(category)
+      return tags.loaderData.modLoaders.includes(category)
     })
 
     const isPlugin = categories.some((category) => {
-      return app.$tag.loaderData.allPluginLoaders.includes(category)
+      return tags.loaderData.allPluginLoaders.includes(category)
     })
 
     const isDataPack = categories.some((category) => {
-      return app.$tag.loaderData.dataPackLoaders.includes(category)
+      return tags.loaderData.dataPackLoaders.includes(category)
     })
 
     if (isDataPack) {

helpers/teams.js

@@ -1,18 +1,14 @@
 export const acceptTeamInvite = async (teamId) => {
-  const app = useNuxtApp()
   await useBaseFetch(`team/${teamId}/join`, {
     method: 'POST',
-    ...app.$defaultHeaders(),
   })
 }
 export const removeSelfFromTeam = async (teamId) => {
-  const app = useNuxtApp()
-  await removeTeamMember(teamId, app.$auth.user.id)
+  const auth = await useAuth()
+  await removeTeamMember(teamId, auth.user.id)
 }
 export const removeTeamMember = async (teamId, userId) => {
-  const app = useNuxtApp()
   await useBaseFetch(`team/${teamId}/members/${userId}`, {
     method: 'DELETE',
-    ...app.$defaultHeaders(),
   })
 }