Skip to content

fix: app sign in with button to open app #7259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tdgao wants to merge 1 commit into
base: main
Choose a base branch
from
+32 −4
Open

fix: app sign in with button to open app #7259

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 32 additions & 4 deletions apps/frontend/src/components/ui/auth/SignIn.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
<template>
<div v-if="subtleLauncherRedirectUri">
<iframe
:src="subtleLauncherRedirectUri"
class="fixed left-0 top-0 z-[9999] m-0 h-full w-full border-0 p-0"
></iframe>
<iframe :src="subtleLauncherRedirectUri" class="hidden"></iframe>
<div
class="universal-card mx-auto flex w-full max-w-[27rem] flex-col gap-6 border border-solid border-surface-5 !p-6 text-center"
>
<div class="flex flex-col gap-2">
<h1 class="m-0 text-2xl font-semibold text-contrast">Opening Modrinth App...</h1>
<p class="m-0 text-left text-primary">
If the app doesn’t open, use the button below to finish signing in.
</p>
</div>
<Button type="colored" color="brand" class="" @click="sendLauncherCallback">
{{ formatMessage(messages.returnToLauncherButton) }}
<RightArrowIcon />
</Button>
</div>
</div>
<div
v-else
Expand Down Expand Up @@ -239,6 +250,10 @@ const onOAuthProviderClick = (provider: AuthProvider) => {
pendingSignInOAuthProvider.value = provider
}

async function sendLauncherCallback() {
await fetch(subtleLauncherRedirectUri, { mode: 'no-cors' }).catch(() => undefined)
}

const { formatMessage } = useVIntl()

const messages = defineMessages({
Expand Down Expand Up @@ -287,6 +302,19 @@ const messages = defineMessages({
id: 'auth.sign-in.continue-with-passkey',
defaultMessage: 'Continue with passkey',
},
launcherSignInCompleteTitle: {
id: 'auth.sign-in.launcher.complete.title',
defaultMessage: 'You’re signed in',
},
launcherSignInCompleteDescription: {
id: 'auth.sign-in.launcher.complete.description',
defaultMessage:
'We’re returning you to the Modrinth App. If nothing happens, use the button below.',
},
returnToLauncherButton: {
id: 'auth.sign-in.launcher.complete.return-button',
defaultMessage: 'Open Modrinth App',
},
})
</script>

Expand Down
Loading