From d4e575774c3cc81c817b567c5be2ebe40f35dc95 Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 13 Aug 2024 08:58:53 +0800 Subject: [PATCH] fix: auth callback --- frontend/web/src/pages/AuthCallback.tsx | 3 +-- frontend/web/src/pages/SignIn.tsx | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/web/src/pages/AuthCallback.tsx b/frontend/web/src/pages/AuthCallback.tsx index 814407e..fa635cd 100644 --- a/frontend/web/src/pages/AuthCallback.tsx +++ b/frontend/web/src/pages/AuthCallback.tsx @@ -1,4 +1,3 @@ -import { last } from "lodash-es"; import { ClientError } from "nice-grpc-web"; import { useEffect, useState } from "react"; import { useSearchParams } from "react-router-dom"; @@ -34,7 +33,7 @@ const AuthCallback = () => { return; } - const idpId = last(state.split("-")); + const idpId = state; if (!idpId) { setState({ loading: false, diff --git a/frontend/web/src/pages/SignIn.tsx b/frontend/web/src/pages/SignIn.tsx index 134faae..0deb715 100644 --- a/frontend/web/src/pages/SignIn.tsx +++ b/frontend/web/src/pages/SignIn.tsx @@ -62,7 +62,7 @@ const SignIn: React.FC = () => { }; const handleSignInWithIdentityProvider = async (identityProvider: IdentityProvider) => { - const stateQueryParameter = `auth.signin.${identityProvider.title}-${identityProvider.id}`; + const stateQueryParameter = identityProvider.id; if (identityProvider.type === IdentityProvider_Type.OAUTH2) { const redirectUri = absolutifyLink("/auth/callback"); const oauth2Config = identityProvider.config?.oauth2;