zio/elk
2
0
Fork 0
Code Releases 2 Packages 1 Activity

feat: prevent mixing data on account switch (#384)

Browse source
This commit is contained in:
Joaquín Sánchez 2022-12-12 00:30:26 +01:00 • committed by GitHub
parent 8c82c91056
commit de160c219a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 42 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

15
middleware/permalink.global.ts
View file

@ -6,7 +6,9 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
if (!('server' in to.params))
return
if (!currentUser.value) {
const user = currentUser.value
if (!user) {
if (from.params.server !== to.params.server) {
await loginTo({
server: to.params.server as string,
@ -16,7 +18,7 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
}
// No need to additionally resolve an id if we're already logged in
if (currentUser.value.server === to.params.server)
if (user.server === to.params.server)
return
// Tags don't need to be redirected to a local id
@ -29,12 +31,19 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
...to,
params: {
...to.params,
server: currentUser.value.server,
server: user.server,
},
}
}
try {
// If we're already on an account page, we can search for this on the new instance
if (to.params.account) {
const account = await fetchAccountByHandle(to.params.account as string)
if (account)
return getAccountRoute(account)
}
// If we're logged in, search for the local id the account or status corresponds to
const { value } = await useMasto().search({ q: `https:/${to.fullPath}`, resolve: true, limit: 1 }).next()