diff --git a/apps/frontend/src/components/project-review/project-info/members/member-actions.vue b/apps/frontend/src/components/project-review/project-info/members/member-actions.vue index bddefa1a33f..4b0b4b02aed 100644 --- a/apps/frontend/src/components/project-review/project-info/members/member-actions.vue +++ b/apps/frontend/src/components/project-review/project-info/members/member-actions.vue @@ -48,7 +48,7 @@ import { useQuery } from '@tanstack/vue-query' import { useClipboard } from '@vueuse/core' import { computed, ref } from 'vue' -import { runPrivileged } from '~/composables/reauth.ts' +import { ensurePrivileged, runPrivileged } from '~/composables/reauth.ts' defineOptions({ inheritAttrs: false }) @@ -94,6 +94,11 @@ provideUserProfile({ const editModal = ref>() const detailsModal = ref>() +async function openEditUser() { + if (!(await ensurePrivileged())) return + editModal.value?.show() +} + const menuOptions = computed(() => [ { id: 'copy-id', @@ -150,7 +155,9 @@ const menuOptions = computed(() => [ id: 'edit-user', label: 'Edit user', icon: EditIcon, - action: () => editModal.value?.show(), + action: () => { + void openEditUser() + }, tone: 'default', shown: isAdmin.value, disabled: !userQuery.data.value || userQuery.isFetching.value, diff --git a/apps/frontend/src/components/ui/auth/PasskeySettings.vue b/apps/frontend/src/components/ui/auth/PasskeySettings.vue index e7b898c927d..f9854d8080e 100644 --- a/apps/frontend/src/components/ui/auth/PasskeySettings.vue +++ b/apps/frontend/src/components/ui/auth/PasskeySettings.vue @@ -70,12 +70,7 @@ @@ -218,7 +213,7 @@ import { } from '@modrinth/ui' import { computed, ref, useTemplateRef } from 'vue' -import { isReauthCancelled, runPrivileged } from '~/composables/reauth.ts' +import { ensurePrivileged, isReauthCancelled, runPrivileged } from '~/composables/reauth.ts' import { createPasskeyCredential } from '~/helpers/passkey.ts' const { labrinth } = injectModrinthClient() @@ -418,6 +413,12 @@ async function renamePasskey() { stopLoading() } +async function confirmRemovePasskey(passkey: Labrinth.Auth.v2.Passkey) { + if (!(await ensurePrivileged())) return + passkeyToRemove.value = passkey + removePasskeyModal.value?.show() +} + async function removePasskey() { if (!passkeyToRemove.value) return const { id } = passkeyToRemove.value diff --git a/apps/frontend/src/composables/reauth.ts b/apps/frontend/src/composables/reauth.ts index 4797a5ed779..4fd9c4e8366 100644 --- a/apps/frontend/src/composables/reauth.ts +++ b/apps/frontend/src/composables/reauth.ts @@ -63,6 +63,25 @@ async function openReauth(): Promise { } } +/** + * Reauthenticate before a privileged flow collects input. + * A missing session age counts as not privileged, so save does not discover that after the form is filled. + * Returns false when reauthentication is cancelled. + */ +export async function ensurePrivileged(required = true): Promise { + try { + if (required && isSessionYoung(useAuthState().value.token) !== true) { + await requestReauth() + } + return true + } catch (error) { + if (isReauthCancelled(error)) { + return false + } + throw error + } +} + export async function runPrivileged(action: () => Promise, precheck = true): Promise { if (precheck && isSessionYoung(useAuthState().value.token) === false) { await requestReauth() diff --git a/apps/frontend/src/composables/sign-in.ts b/apps/frontend/src/composables/sign-in.ts index 5fe8a3158d8..4185ff4641c 100644 --- a/apps/frontend/src/composables/sign-in.ts +++ b/apps/frontend/src/composables/sign-in.ts @@ -589,6 +589,7 @@ export function provideSignIn() { code, verifier, }) + rememberSessionCreated(session.session, session.created) await finishSignIn(session.session, session.app_session, readPendingAuthMethod()) } catch (error) { console.error(error) diff --git a/apps/frontend/src/pages/[type]/[project]/settings/index.vue b/apps/frontend/src/pages/[type]/[project]/settings/index.vue index 61177fee9f4..f27be284901 100644 --- a/apps/frontend/src/pages/[type]/[project]/settings/index.vue +++ b/apps/frontend/src/pages/[type]/[project]/settings/index.vue @@ -317,7 +317,7 @@ type="colored" color="red" :disabled="!hasDeletePermission" - @click="$refs.modal_confirm.show()" + @click="confirmDeleteProject" >