Skip to content

fix: add loader while oauthRedirecting #676

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
SerVitasik merged 1 commit into from
Jun 22, 2026
+11 −3
Merged

fix: add loader while oauthRedirecting #676

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
14 changes: 11 additions & 3 deletions adminforth/spa/src/views/LoginView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}: {}"
>

<img v-if="coreStore.config?.loginBackgroundImage && backgroundPosition !== 'over'"
<img v-if="!oauthRedirecting && coreStore.config?.loginBackgroundImage && backgroundPosition !== 'over'"
:src="loadFile(coreStore.config?.loginBackgroundImage)"
class="position-absolute top-0 left-0 h-screen object-cover w-0"
:class="{
Expand All @@ -21,8 +21,13 @@
}[backgroundPosition]"
/>

<div v-if="oauthRedirecting">
<Spinner class="w-10 h-10" />
</div>

<!-- Main modal -->
<div id="authentication-modal" tabindex="-1"
v-show="!oauthRedirecting"
class="af-login-modal overflow-y-auto flex flex-grow
overflow-x-hidden z-50 min-w-[350px] justify-center items-center md:inset-0 h-[calc(100%-1rem)] max-h-full">
<div class="relative p-4 w-full max-h-full max-w-[400px]">
Expand Down Expand Up @@ -112,6 +117,7 @@
:is="getCustomComponent(formatComponent(c))"
:meta="formatComponent(c).meta"
@update:disableLoginButton="setDisableLoginButton($event)"
@update:oauthRedirecting="oauthRedirecting = $event"
/>
</form>
</div>
Expand All @@ -132,8 +138,8 @@ import { useCoreStore } from '@/stores/core';
import { useUserStore } from '@/stores/user';
import { IconEyeSolid, IconEyeSlashSolid } from '@iconify-prerendered/vue-flowbite';
import { callAdminForthApi, loadFile } from '@/utils';
import { useRouter } from 'vue-router';
import { Button, Checkbox, Input } from '@/afcl';
import { useRouter, useRoute } from 'vue-router';
import { Button, Checkbox, Input, Spinner } from '@/afcl';
import ErrorMessage from '@/components/ErrorMessage.vue';

const passwordInput = ref<InstanceType<typeof Input> | null>(null);
Expand All @@ -143,6 +149,8 @@ const username = ref('');
const password = ref('');

const router = useRouter();
const route = useRoute();
const oauthRedirecting = ref<boolean>('start_oauth' in route.query && route.query.start_oauth !== '');
const inProgress = ref<boolean>(false);
const isSuccess = ref<boolean>(false);
const coreStore = useCoreStore();
Expand Down