diff --git a/middleware/auth.js b/middleware/auth.js index 68d31e7d..ee800dc7 100644 --- a/middleware/auth.js +++ b/middleware/auth.js @@ -1,5 +1,10 @@ export default async function (context) { if (!context.from) { + if (context.app.$cookies.get('auth-token-reset')) { + context.app.$cookies.removeAll() + return + } + if (context.route.query.code) { context.app.$cookies.set('auth-token', context.route.query.code, { secure: true, @@ -7,15 +12,10 @@ export default async function (context) { httpOnly: true, }) - return context.redirect(context.route.path) - } - - if (context.app.$cookies.get('auth-token-reset')) { - context.app.$cookies.removeAll() - return - } - - if (context.app.$cookies.get('auth-token')) { + await context.store.dispatch('auth/fetchUser', { + token: context.route.query.code, + }) + } else if (context.app.$cookies.get('auth-token')) { const cookie = context.app.$cookies.get('auth-token') await context.store.dispatch('auth/fetchUser', { token: cookie }) diff --git a/pages/dashboard/follows.vue b/pages/dashboard/follows.vue index 4c139553..d2741ba9 100644 --- a/pages/dashboard/follows.vue +++ b/pages/dashboard/follows.vue @@ -48,17 +48,9 @@ export default { FollowIcon, }, async asyncData(data) { - const config = { - headers: { - Authorization: data.$auth.getToken('local') - ? data.$auth.getToken('local') - : '', - }, - } - const res = await axios.get( `https://api.modrinth.com/api/v1/user/${data.$auth.user.id}/follows`, - config + data.$auth.headers ) const mods = (