From fe3604f70bc401c8f6ccd1522f7e3d8723b3d9d8 Mon Sep 17 00:00:00 2001 From: sadnub Date: Fri, 18 Oct 2024 20:01:42 -0400 Subject: [PATCH] auto redirect to sso login on sso signup --- src/ee/sso/api/sso.ts | 3 +++ src/ee/sso/views/ProviderCallback.vue | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ee/sso/api/sso.ts b/src/ee/sso/api/sso.ts index e7e1b3e..9ae88e0 100644 --- a/src/ee/sso/api/sso.ts +++ b/src/ee/sso/api/sso.ts @@ -1,6 +1,7 @@ import axios from "axios"; import { getCookie } from "@/ee/sso/utils/cookies"; import { getBaseUrl } from "@/boot/axios"; +import { useStorage } from "@vueuse/core"; import type { SSOProvider, SSOSettings } from "@/ee/sso/types/sso"; @@ -129,6 +130,8 @@ export async function disconnectSSOAccount( } export async function openSSOProviderRedirect(id: string) { + //save provider to local storage + useStorage("provider_id", id); postForm(`${getBaseUrl()}/${allauthBase}/auth/provider/redirect`, { provider: id, process: "login", diff --git a/src/ee/sso/views/ProviderCallback.vue b/src/ee/sso/views/ProviderCallback.vue index 0a4c9c6..749353f 100644 --- a/src/ee/sso/views/ProviderCallback.vue +++ b/src/ee/sso/views/ProviderCallback.vue @@ -18,12 +18,10 @@ import { useRoute, useRouter } from "vue-router"; import { useAuthStore } from "@/stores/auth"; const route = useRoute(); -const error = route.params.error; +const error = route.query.error; const router = useRouter(); - const auth = useAuthStore(); - if (!error) { if (auth.loggedIn) { router.push({ name: "Dashboard" });