Skip to content

Update the OAuth2 success and failure pages #452

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

Merged
TorstenDittmann merged 1 commit into from
Jul 19, 2023
Merged

Update the OAuth2 success and failure pages #452

Show file tree
Hide file tree
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
60 changes: 48 additions & 12 deletions src/routes/auth/oauth2/failure/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,56 @@
import { goto } from '$app/navigation';
import { page } from '$app/stores';
import { Heading } from '$lib/components';
import { onMount } from 'svelte';

onMount(async () => {
const project = $page.url.searchParams.get('project');
if (project) {
await goto(`appwrite-callback-${project}://${$page.url.search}`);
const project = $page.url.searchParams.get('project');
const link = `appwrite-callback-${project}://${$page.url.search}`;

const redirect = new Promise((resolve, reject) => {
if (!project) {
reject('no-project');
}
// this timeout is needed because goto does not
// throw an exception if the redirect does not work
setTimeout(() => reject('timeout'), 500);
// goto will resolve on successful redirect
goto(link).then(resolve);
});
</script>

<Heading tag="h1" size="1">Missing Redirect URL</Heading>
<p class="text">
Your OAuth login flow is missing a proper redirect URL. Please check the
<a class="link" href="https://appwrite.io/docs/client/account?sdk=web#createOAuth2Session"
>OAuth docs</a>
and send request for new session with a valid callback URL.
</p>
{#await redirect then}
<article class="card u-padding-16">
<div class="u-flex u-flex-vertical u-gap-16">
<Heading tag="h1" size="4">Login failed</Heading>
<p class="text">You will be automatically redirected back to your app shortly.</p>
<p class="text">
If you are not redirected, please click on the following
<a class="link" href={`appwrite-callback-${project}://${$page.url.search}`}>link</a
>.
</p>
</div>
</article>
{:catch}
<article class="card u-padding-16">
<div class="u-flex u-flex-vertical u-gap-16">
<Heading tag="h1" size="4">Missing Redirect URL</Heading>
<p class="text">
Your OAuth login flow is missing a proper redirect URL. Please check the
<a
class="link"
href="https://appwrite.io/docs/client/account?sdk=web#createOAuth2Session"
>OAuth docs</a>
and send request for new session with a valid callback URL.
</p>
</div>
</article>
{/await}

<style lang="scss">
@import '@appwrite.io/pink/src/abstract/variables/_devices.scss';
// override padding for screens bigger than mobile
@media #{$break2open} {
article.card {
padding: 2rem !important;
}
}
</style>
60 changes: 48 additions & 12 deletions src/routes/auth/oauth2/success/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,56 @@
import { goto } from '$app/navigation';
import { page } from '$app/stores';
import { Heading } from '$lib/components';
import { onMount } from 'svelte';

onMount(async () => {
const project = $page.url.searchParams.get('project');
if (project) {
await goto(`appwrite-callback-${project}://${$page.url.search}`);
const project = $page.url.searchParams.get('project');
const link = `appwrite-callback-${project}://${$page.url.search}`;

const redirect = new Promise((resolve, reject) => {
if (!project) {
reject('no-project');
}
// this timeout is needed because goto does not
// throw an exception if the redirect does not work
setTimeout(() => reject('timeout'), 500);
// goto will resolve on successful redirect
goto(link).then(resolve);
});
</script>

<Heading tag="h1" size="1">Missing Redirect URL</Heading>
<p class="text">
Your OAuth login flow is missing a proper redirect URL. Please check the
<a class="link" href="https://appwrite.io/docs/client/account?sdk=web#createOAuth2Session"
>OAuth docs</a>
and send request for new session with a valid callback URL.
</p>
{#await redirect then}
<article class="card u-padding-16">
<div class="u-flex u-flex-vertical u-gap-16">
<Heading tag="h1" size="4">You're now logged in</Heading>
<p class="text">You will be automatically redirected back to your app shortly.</p>
<p class="text">
If you are not redirected, please click on the following
<a class="link" href={`appwrite-callback-${project}://${$page.url.search}`}>link</a
>.
</p>
</div>
</article>
{:catch}
<article class="card u-padding-16">
<div class="u-flex u-flex-vertical u-gap-16">
<Heading tag="h1" size="4">Missing Redirect URL</Heading>
<p class="text">
Your OAuth login flow is missing a proper redirect URL. Please check the
<a
class="link"
href="https://appwrite.io/docs/client/account?sdk=web#createOAuth2Session"
>OAuth docs</a>
and send request for new session with a valid callback URL.
</p>
</div>
</article>
{/await}

<style lang="scss">
@import '@appwrite.io/pink/src/abstract/variables/_devices.scss';
// override padding for screens bigger than mobile
@media #{$break2open} {
article.card {
padding: 2rem !important;
}
}
</style>