paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 37 Packages Projects Releases Wiki Activity

fix redirect loop using auto prop in signin component

Browse Source 
Signed-off-by: Stephen Glass <stephen@stephen.glass>
This commit is contained in:
Stephen Glass
2024-08-01 09:51:30 -04:00
parent cf15b1f53d
commit 32fe26a57f
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/core-components/src/layout/SignInPage/SignInPage.tsx
+5 -2
View File
@@ -109,7 +109,10 @@ export const SingleSignInPage = ({
// displayed for a split second when the user is already logged-in.
const [showLoginPage, setShowLoginPage] = useState<boolean>(false);
// User was redirected back to sign in page with error from auth redirect flow
const [searchParams, _setSearchParams] = useSearchParams();
const errorParam = searchParams.get('error');
const hasErrorSearchParam = errorParam !== 'false' && errorParam !== null;
type LoginOpts = { checkExisting?: boolean; showPopup?: boolean };
const login = async ({ checkExisting, showPopup }: LoginOpts) => {
@@ -123,7 +126,7 @@ export const SingleSignInPage = ({
}
// If no session exists, show the sign-in page
if (!identityResponse && (showPopup || auto)) {
if (!identityResponse && (showPopup || auto) && !hasErrorSearchParam) {
// Unless auto is set to true, this step should not happen.
// When user intentionally clicks the Sign In button, autoShowPopup is set to true
setShowLoginPage(true);
@@ -158,7 +161,7 @@ export const SingleSignInPage = ({
};
const [_, { execute: checkAuthErrors }] = useAsync(async () => {
if (searchParams.get('error') !== 'false') {
if (hasErrorSearchParam) {
const errorResponse = await authErrorApi.getSignInAuthError();
if (errorResponse) {
setError(errorResponse);
packages/core-components/src/layout/SignInPage/providers.tsx
+4 -1
View File
@@ -92,10 +92,13 @@ export const useSignInProviders = (
const authErrorApi = useApi(authErrorApiRef);
const [loading, setLoading] = useState(true);
// User was redirected back to sign in page with error from auth redirect flow
const [searchParams, _setSearchParams] = useSearchParams();
const errorParam = searchParams.get('error');
const hasErrorSearchParam = errorParam !== 'false' && errorParam !== null;
const [_, { execute: checkAuthErrors }] = useAsync(async () => {
if (searchParams.get('error') !== 'false') {
if (hasErrorSearchParam) {
const errorResponse = await authErrorApi.getSignInAuthError();
if (errorResponse) {
errorApi.post(errorResponse);