MrSphay/Modrinth-plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 500 on oauth authorize page (#5661)

Browse Source
This commit is contained in:
Calum H.
2026-03-25 17:52:12 +00:00
committed by GitHub
parent 7b3471944d
commit 4b4282cfbf
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/frontend/src/pages/auth/authorize.vue
View File

@@ -5,11 +5,11 @@
<h1>{{ formatMessage(commonMessages.errorLabel) }}</h1> <h1>{{ formatMessage(commonMessages.errorLabel) }}</h1>
</div> </div>
<p> <p>
<span>{{ error.data.error }}: </span> <span>{{ error.data?.error }}: </span>
{{ error.data.description }} {{ error.data?.description }}
</p> </p>
</div> </div>
<div v-else class="oauth-items"> <div v-else-if="app && createdBy && authorizationData" class="oauth-items">
<div class="connected-items"> <div class="connected-items">
<div class="profile-pics"> <div class="profile-pics">
<Avatar size="md" :src="app.icon_url" /> <Avatar size="md" :src="app.icon_url" />
@@ -164,24 +164,31 @@ const {
data: authorizationData, data: authorizationData,
isPending: pending, isPending: pending,
error, error,
suspense: authSusp,
} = useQuery({ } = useQuery({
queryKey: computed(() => ['authorization', clientId, redirectUri, scope, state]), queryKey: computed(() => ['authorization', clientId, redirectUri, scope, state]),
queryFn: getFlowIdAuthorization, queryFn: getFlowIdAuthorization,
enabled: computed(() => !!clientId && !!redirectUri && !!scope), enabled: computed(() => !!clientId && !!redirectUri && !!scope),
}) })
const { data: app } = useQuery({ const { data: app, suspense: appSusp } = useQuery({
queryKey: computed(() => ['oauth/app', clientId]), queryKey: computed(() => ['oauth/app', clientId]),
queryFn: () => client.labrinth.oauth_internal.getApp(clientId), queryFn: () => client.labrinth.oauth_internal.getApp(clientId),
enabled: computed(() => !!clientId), enabled: computed(() => !!clientId),
}) })
const { data: createdBy } = useQuery({ const { data: createdBy, suspense: userSusp } = useQuery({
queryKey: computed(() => ['user', app.value?.created_by]), queryKey: computed(() => ['user', app.value?.created_by]),
queryFn: () => client.labrinth.users_v2.get(app.value.created_by), queryFn: () => client.labrinth.users_v2.get(app.value.created_by),
enabled: computed(() => !!app.value?.created_by), enabled: computed(() => !!app.value?.created_by),
}) })
onServerPrefetch(async () => {
await authSusp()
await appSusp()
await userSusp()
})
const scopeDefinitions = computed(() => const scopeDefinitions = computed(() =>
scopesToDefinitions(BigInt(authorizationData.value?.requested_scopes || 0)), scopesToDefinitions(BigInt(authorizationData.value?.requested_scopes || 0)),
) )