From 1852eed3aaea707117c77f142c85ca588437970c Mon Sep 17 00:00:00 2001
From: Jesse Wierzbinski <contact@cpluspatch.com>
Date: Sun, 21 Apr 2024 22:20:58 -1000
Subject: [PATCH] fix: :ambulance: Fix issue causing OAuth login to not work

---
 pages/oauth/authorize.vue | 138 +++++++++++++++----------------
 pages/oauth/consent.vue   | 165 ++++++++++++++++++++------------------
 2 files changed, 155 insertions(+), 148 deletions(-)

diff --git a/pages/oauth/authorize.vue b/pages/oauth/authorize.vue
index f638127..c7faac5 100644
--- a/pages/oauth/authorize.vue
+++ b/pages/oauth/authorize.vue
@@ -1,80 +1,82 @@
 <template>
-    <div class="flex min-h-screen relative flex-col justify-center py-12 lg:px-8">
-        <img src="https://camo.githubusercontent.com/353460d1fdb1667ec993159270dcece12c491fb38165460215a519ab93f4e554/68747470733a2f2f63646e2d7765622e63706c757370617463682e636f6d2f6c7973616e642e77656270"
-            alt="Lysand logo" class="mx-auto h-24 hidden md:block" />
-        <div v-if="validUrlParameters"
-            class="mt-10 sm:mx-auto w-full sm:max-w-md md:bg-dark-900 px-10 py-10 rounded md:ring-1 md:ring-white/10">
-            <VeeForm class="space-y-6" method="POST" :validation-schema="schema"
-                :action="`/api/auth/login?redirect_uri=${redirect_uri}&response_type=${response_type}&client_id=${client_id}&scope=${scope}`">
+    <ClientOnly>
+        <div class="flex min-h-screen relative flex-col justify-center py-12 lg:px-8">
+            <img src="https://camo.githubusercontent.com/353460d1fdb1667ec993159270dcece12c491fb38165460215a519ab93f4e554/68747470733a2f2f63646e2d7765622e63706c757370617463682e636f6d2f6c7973616e642e77656270"
+                alt="Lysand logo" class="mx-auto h-24 hidden md:block" />
+            <div v-if="validUrlParameters"
+                class="mt-10 sm:mx-auto w-full sm:max-w-md md:bg-dark-900 px-10 py-10 rounded md:ring-1 md:ring-white/10">
+                <VeeForm class="space-y-6" method="POST" :validation-schema="schema"
+                    :action="`/api/auth/login?redirect_uri=${redirect_uri}&response_type=${response_type}&client_id=${client_id}&scope=${scope}`">
 
-                <h1 class="font-bold text-2xl text-gray-50 text-center tracking-tight">Login to your account</h1>
+                    <h1 class="font-bold text-2xl text-gray-50 text-center tracking-tight">Login to your account</h1>
 
-                <VeeField name="email" as="div" v-slot="{ errors, field }" validate-on-change>
-                    <LoginInput label="Email" placeholder="contact@cpluspatch.com" type="email" autocomplete="email"
-                        required :is-invalid="errors.length > 0" v-bind="field" />
-                    <VeeErrorMessage name="email" as="p" class="mt-2 text-sm text-red-600" v-slot="{ message }">
-                        {{ message }}
-                    </VeeErrorMessage>
-                </VeeField>
+                    <VeeField name="email" as="div" v-slot="{ errors, field }" validate-on-change>
+                        <LoginInput label="Email" placeholder="contact@cpluspatch.com" type="email" autocomplete="email"
+                            required :is-invalid="errors.length > 0" v-bind="field" />
+                        <VeeErrorMessage name="email" as="p" class="mt-2 text-sm text-red-600" v-slot="{ message }">
+                            {{ message }}
+                        </VeeErrorMessage>
+                    </VeeField>
 
-                <VeeField name="password" as="div" v-slot="{ errors, field }" validate-on-change>
-                    <LoginInput label="Password" placeholder="Password here" type="password"
-                        autocomplete="current-password" required :is-invalid="errors.length > 0" v-bind="field" />
-                    <VeeErrorMessage name="password" as="p" class="mt-2 text-sm text-red-600" v-slot="{ message }">
-                        {{ message }}
-                    </VeeErrorMessage>
-                </VeeField>
+                    <VeeField name="password" as="div" v-slot="{ errors, field }" validate-on-change>
+                        <LoginInput label="Password" placeholder="Password here" type="password"
+                            autocomplete="current-password" required :is-invalid="errors.length > 0" v-bind="field" />
+                        <VeeErrorMessage name="password" as="p" class="mt-2 text-sm text-red-600" v-slot="{ message }">
+                            {{ message }}
+                        </VeeErrorMessage>
+                    </VeeField>
 
-                <div v-if="oauthProviders && oauthProviders.length > 0" class="w-full flex flex-col gap-3">
-                    <h2 class="text-sm text-gray-200">Or sign in with</h2>
-                    <div class="grid grid-cols-1 gap-4 w-full">
-                        <a v-for="provider of oauthProviders" :key="provider.id"
-                            :href="`/oauth/authorize-external?issuer=${provider.id}&redirect_uri=${redirect_uri}&response_type=${response_type}&clientId=${client_id}&scope=${scope}`">
-                            <ButtonsSecondary class="flex flex-row w-full items-center justify-center gap-3">
-                                <img :src="provider.icon" :alt="provider.name" class="w-6 h-6" />
-                                <div class="flex flex-col gap-0 justify-center">
-                                    <h3 class="font-bold">{{ provider.name }}</h3>
-                                </div>
-                            </ButtonsSecondary>
-                        </a>
+                    <div v-if="oauthProviders && oauthProviders.length > 0" class="w-full flex flex-col gap-3">
+                        <h2 class="text-sm text-gray-200">Or sign in with</h2>
+                        <div class="grid grid-cols-1 gap-4 w-full">
+                            <a v-for="provider of oauthProviders" :key="provider.id"
+                                :href="`/oauth/authorize-external?issuer=${provider.id}&redirect_uri=${redirect_uri}&response_type=${response_type}&clientId=${client_id}&scope=${scope}`">
+                                <ButtonsSecondary class="flex flex-row w-full items-center justify-center gap-3">
+                                    <img :src="provider.icon" :alt="provider.name" class="w-6 h-6" />
+                                    <div class="flex flex-col gap-0 justify-center">
+                                        <h3 class="font-bold">{{ provider.name }}</h3>
+                                    </div>
+                                </ButtonsSecondary>
+                            </a>
+                        </div>
                     </div>
-                </div>
 
-                <ButtonsPrimary type="submit" class="w-full">Sign in</ButtonsPrimary>
-            </VeeForm>
-        </div>
-        <div v-else class="mx-auto max-w-md mt-10">
-            <h1 class="text-2xl font-bold tracking-tight text-gray-50 sm:text-4xl">Invalid access
-                parameters
-            </h1>
-            <p class="mt-6 text-lg leading-8 text-gray-300">This page should be accessed
-                through a valid OAuth2 authorization request. Please use a <strong class="font-bold">Mastodon
-                    API</strong> client to access this page.
-            </p>
-            <p class="mt-6 text-lg leading-8 text-gray-300">Here are some recommended clients:</p>
-            <ul class="w-full flex flex-col gap-3 mt-4">
-                <li v-for="client of useConfig().RECOMMENDED_CLIENTS" :key="client.name" class="w-full">
-                    <a :href="client.link" target="_blank"
-                        class="rounded-sm ring-2 ring-white/10 px-4 py-2 w-full flex flex-row gap-3 items-center">
-                        <img :src="client.icon" :alt="client.name" class="h-10 w-10" />
-                        <div class="flex flex-col justify-between items-start">
-                            <h2 class="font-bold text-gray-100">{{ client.name }}</h2>
-                            <span class="underline text-pink-700">{{ client.link }}</span>
-                        </div>
-                    </a>
-                </li>
-            </ul>
-            <p class="mt-6 text-lg leading-8 text-gray-300">
-                Many other clients exist, but <strong class="font-bold">they have not been tested for
-                    compatibility</strong>. Bug reports are nevertheless welcome.
-            </p>
+                    <ButtonsPrimary type="submit" class="w-full">Sign in</ButtonsPrimary>
+                </VeeForm>
+            </div>
+            <div v-else class="mx-auto max-w-md mt-10">
+                <h1 class="text-2xl font-bold tracking-tight text-gray-50 sm:text-4xl">Invalid access
+                    parameters
+                </h1>
+                <p class="mt-6 text-lg leading-8 text-gray-300">This page should be accessed
+                    through a valid OAuth2 authorization request. Please use a <strong class="font-bold">Mastodon
+                        API</strong> client to access this page.
+                </p>
+                <p class="mt-6 text-lg leading-8 text-gray-300">Here are some recommended clients:</p>
+                <ul class="w-full flex flex-col gap-3 mt-4">
+                    <li v-for="client of useConfig().RECOMMENDED_CLIENTS" :key="client.name" class="w-full">
+                        <a :href="client.link" target="_blank"
+                            class="rounded-sm ring-2 ring-white/10 px-4 py-2 w-full flex flex-row gap-3 items-center">
+                            <img :src="client.icon" :alt="client.name" class="h-10 w-10" />
+                            <div class="flex flex-col justify-between items-start">
+                                <h2 class="font-bold text-gray-100">{{ client.name }}</h2>
+                                <span class="underline text-pink-700">{{ client.link }}</span>
+                            </div>
+                        </a>
+                    </li>
+                </ul>
+                <p class="mt-6 text-lg leading-8 text-gray-300">
+                    Many other clients exist, but <strong class="font-bold">they have not been tested for
+                        compatibility</strong>. Bug reports are nevertheless welcome.
+                </p>
 
-            <p class="mt-6 text-lg leading-8 text-gray-300">
-                Found a problem? Report it on <a href="https://github.com/lysand-org/lysand/issues/new/choose"
-                    target="_blank" class="underline text-pink-700">the issue tracker</a>.
-            </p>
+                <p class="mt-6 text-lg leading-8 text-gray-300">
+                    Found a problem? Report it on <a href="https://github.com/lysand-org/lysand/issues/new/choose"
+                        target="_blank" class="underline text-pink-700">the issue tracker</a>.
+                </p>
+            </div>
         </div>
-    </div>
+    </ClientOnly>
 </template>
 
 <script setup lang="ts">
diff --git a/pages/oauth/consent.vue b/pages/oauth/consent.vue
index 6121bfc..115c577 100644
--- a/pages/oauth/consent.vue
+++ b/pages/oauth/consent.vue
@@ -1,88 +1,93 @@
 <template>
-    <div class="flex min-h-screen relative flex-col justify-center px-6 py-12 lg:px-8">
-        <div class="absolute inset-x-0 -top-40 -z-10 transform-gpu overflow-hidden blur-3xl sm:-top-80"
-            aria-hidden="true">
-            <div class="relative left-[calc(50%-11rem)] aspect-[1155/678] w-[36.125rem] -translate-x-1/2 rotate-[30deg] bg-gradient-to-tr from-[#ff80b5] to-[#9089fc] opacity-30 sm:left-[calc(50%-30rem)] sm:w-[72.1875rem]"
-                style="clip-path: polygon(74.1% 44.1%, 100% 61.6%, 97.5% 26.9%, 85.5% 0.1%, 80.7% 2%, 72.5% 32.5%, 60.2% 62.4%, 52.4% 68.1%, 47.5% 58.3%, 45.2% 34.5%, 27.5% 76.7%, 0.1% 64.9%, 17.9% 100%, 27.6% 76.8%, 76.1% 97.7%, 74.1% 44.1%)" />
-        </div>
-        <div v-if="validUrlParameters" class="mt-10 sm:mx-auto sm:w-full sm:max-w-sm">
-            <form class="space-y-6" method="POST" :action="url.pathname.replace('/oauth/redirect', '/oauth/authorize')">
-                <input type="hidden" v-for="([key, value]) in url.searchParams" :key="key" :name="key" :value="value" />
-                <div class="flex flex-col items-center gap-y-5">
-                    <h1 class="font-bold text-2xl text-gray-50 text-center tracking-tight">Allow this application to
-                        access your
-                        account?</h1>
-                    <div v-if="application" class="rounded-sm ring-2 ring-white/10 px-4 py-2 w-full">
-                        <h2 class="font-bold text-gray-200">{{ application }}</h2>
-                        <a v-if="website" :href="website" target="_blank" class="underline text-pink-700">{{ website
-                            }}</a>
+    <ClientOnly>
+        <div class="flex min-h-screen relative flex-col justify-center px-6 py-12 lg:px-8">
+            <div class="absolute inset-x-0 -top-40 -z-10 transform-gpu overflow-hidden blur-3xl sm:-top-80"
+                aria-hidden="true">
+                <div class="relative left-[calc(50%-11rem)] aspect-[1155/678] w-[36.125rem] -translate-x-1/2 rotate-[30deg] bg-gradient-to-tr from-[#ff80b5] to-[#9089fc] opacity-30 sm:left-[calc(50%-30rem)] sm:w-[72.1875rem]"
+                    style="clip-path: polygon(74.1% 44.1%, 100% 61.6%, 97.5% 26.9%, 85.5% 0.1%, 80.7% 2%, 72.5% 32.5%, 60.2% 62.4%, 52.4% 68.1%, 47.5% 58.3%, 45.2% 34.5%, 27.5% 76.7%, 0.1% 64.9%, 17.9% 100%, 27.6% 76.8%, 76.1% 97.7%, 74.1% 44.1%)" />
+            </div>
+            <div v-if="validUrlParameters" class="mt-10 sm:mx-auto sm:w-full sm:max-w-sm">
+                <form class="space-y-6" method="POST"
+                    :action="url.pathname.replace('/oauth/consent', '/oauth/authorize')">
+                    <input type="hidden" v-for="([key, value]) in url.searchParams" :key="key" :name="key"
+                        :value="value" />
+                    <div class="flex flex-col items-center gap-y-5">
+                        <h1 class="font-bold text-2xl text-gray-50 text-center tracking-tight">Allow this application to
+                            access your
+                            account?</h1>
+                        <div v-if="application" class="rounded-sm ring-2 ring-white/10 px-4 py-2 w-full">
+                            <h2 class="font-bold text-gray-200">{{ application }}</h2>
+                            <a v-if="website" :href="website" target="_blank" class="underline text-pink-700">{{ website
+                                }}</a>
+                        </div>
                     </div>
-                </div>
-
-                <h2 class="text-gray-50 tracking-tight text-xl font-semibold">
-                    This application will be able to:
-                </h2>
-
-                <ul class="flex flex-col gap-y-1.5">
-                    <li v-for="text in getScopeText(scopes)" :key="text[1]" class="flex flex-row gap-1">
-                        <svg class="fill-pink-600 w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="currentColor"
-                            viewBox="0 0 16 16">
-                            <path
-                                d="M10.97 4.97a.75.75 0 0 1 1.07 1.05l-3.99 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425z" />
-                        </svg>
-                        <h2 class="text-sm text-gray-200">
-                            <strong class="font-bold">{{ text[0] }}</strong> {{ text[1] }}
-                        </h2>
+
+                    <h2 class="text-gray-50 tracking-tight text-xl font-semibold">
+                        This application will be able to:
+                    </h2>
+
+                    <ul class="flex flex-col gap-y-1.5">
+                        <li v-for="text in getScopeText(scopes)" :key="text[1]" class="flex flex-row gap-1">
+                            <svg class="fill-pink-600 w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="currentColor"
+                                viewBox="0 0 16 16">
+                                <path
+                                    d="M10.97 4.97a.75.75 0 0 1 1.07 1.05l-3.99 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425z" />
+                            </svg>
+                            <h2 class="text-sm text-gray-200">
+                                <strong class="font-bold">{{ text[0] }}</strong> {{ text[1] }}
+                            </h2>
+                        </li>
+                    </ul>
+
+                    <div class="flex-col flex gap-y-1">
+                        <p class="text-sm text-gray-200">You are signing in to <b>{{ application }}</b> with your
+                            account.</p>
+                        <p class="text-sm text-gray-200">This allows <b>{{ application }}</b> to perform the above
+                            account
+                            actions.</p>
+                    </div>
+
+                    <div class="flex flex-col gap-3">
+                        <ButtonsPrimary type="submit">Authorize</ButtonsPrimary>
+                        <NuxtLink href="/" class="w-full">
+                            <ButtonsSecondary class="w-full">Cancel</ButtonsSecondary>
+                        </NuxtLink>
+                    </div>
+                </form>
+            </div>
+            <div v-else class="mx-auto max-w-md mt-10">
+                <h1 class="text-2xl font-bold tracking-tight text-gray-50 sm:text-4xl">Invalid access
+                    parameters
+                </h1>
+                <p class="mt-6 text-lg leading-8 text-gray-300">This page should be accessed
+                    through a valid OAuth2 authorization request. Please use a <strong class="font-bold">Mastodon
+                        API</strong> client to access this page.
+                </p>
+                <p class="mt-6 text-lg leading-8 text-gray-300">Here are some recommended clients:</p>
+                <ul class="w-full flex flex-col gap-3 mt-4">
+                    <li v-for="client of useConfig().RECOMMENDED_CLIENTS" :key="client.name" class="w-full">
+                        <a :href="client.link" target="_blank"
+                            class="rounded-sm ring-2 ring-white/10 px-4 py-2 w-full flex flex-row gap-3 items-center">
+                            <img :src="client.icon" :alt="client.name" class="h-10 w-10" />
+                            <div class="flex flex-col justify-between items-start">
+                                <h2 class="font-bold text-gray-100">{{ client.name }}</h2>
+                                <span class="underline text-pink-700">{{ client.link }}</span>
+                            </div>
+                        </a>
                     </li>
                 </ul>
-
-                <div class="flex-col flex gap-y-1">
-                    <p class="text-sm text-gray-200">You are signing in to <b>{{ application }}</b> with your
-                        account.</p>
-                    <p class="text-sm text-gray-200">This allows <b>{{ application }}</b> to perform the above account
-                        actions.</p>
-                </div>
-
-                <div class="flex flex-col gap-3">
-                    <ButtonsPrimary type="submit">Authorize</ButtonsPrimary>
-                    <NuxtLink href="/" class="w-full">
-                        <ButtonsSecondary class="w-full">Cancel</ButtonsSecondary>
-                    </NuxtLink>
-                </div>
-            </form>
-        </div>
-        <div v-else class="mx-auto max-w-md mt-10">
-            <h1 class="text-2xl font-bold tracking-tight text-gray-50 sm:text-4xl">Invalid access
-                parameters
-            </h1>
-            <p class="mt-6 text-lg leading-8 text-gray-300">This page should be accessed
-                through a valid OAuth2 authorization request. Please use a <strong class="font-bold">Mastodon
-                    API</strong> client to access this page.
-            </p>
-            <p class="mt-6 text-lg leading-8 text-gray-300">Here are some recommended clients:</p>
-            <ul class="w-full flex flex-col gap-3 mt-4">
-                <li v-for="client of useConfig().RECOMMENDED_CLIENTS" :key="client.name" class="w-full">
-                    <a :href="client.link" target="_blank"
-                        class="rounded-sm ring-2 ring-white/10 px-4 py-2 w-full flex flex-row gap-3 items-center">
-                        <img :src="client.icon" :alt="client.name" class="h-10 w-10" />
-                        <div class="flex flex-col justify-between items-start">
-                            <h2 class="font-bold text-gray-100">{{ client.name }}</h2>
-                            <span class="underline text-pink-700">{{ client.link }}</span>
-                        </div>
-                    </a>
-                </li>
-            </ul>
-            <p class="mt-6 text-lg leading-8 text-gray-300">
-                Many other clients exist, but <strong class="font-bold">they have not been tested for
-                    compatibility</strong>. Bug reports are nevertheless welcome.
-            </p>
-
-            <p class="mt-6 text-lg leading-8 text-gray-300">
-                Found a problem? Report it on <a href="https://github.com/lysand-org/lysand/issues/new/choose"
-                    target="_blank" class="underline text-pink-700">the issue tracker</a>.
-            </p>
+                <p class="mt-6 text-lg leading-8 text-gray-300">
+                    Many other clients exist, but <strong class="font-bold">they have not been tested for
+                        compatibility</strong>. Bug reports are nevertheless welcome.
+                </p>
+
+                <p class="mt-6 text-lg leading-8 text-gray-300">
+                    Found a problem? Report it on <a href="https://github.com/lysand-org/lysand/issues/new/choose"
+                        target="_blank" class="underline text-pink-700">the issue tracker</a>.
+                </p>
+            </div>
         </div>
-    </div>
+    </ClientOnly>
 </template>
 
 <script setup lang="ts">