amir/Account
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hotfix: token return add to return URL

Browse Source
This commit is contained in:
mehrzadghdev
2025-08-22 00:48:35 +03:30
parent 037f208f05
commit b8de694a2a
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/features/authentication/components/AuthenticationSteps/AuthenticationSteps.tsx
View File

@@ -9,11 +9,15 @@ import { UserStatus, type LoginResult } from '../../types/userTypes';
import type { CountryCode } from '@/types/commonTypes'; import type { CountryCode } from '@/types/commonTypes';
import { VerifyPhoneNumber } from './VerifyPhoneNumber'; import { VerifyPhoneNumber } from './VerifyPhoneNumber';
import { useNavigate, useSearchParams } from 'react-router-dom'; import { useNavigate, useSearchParams } from 'react-router-dom';
import { REFRESH_TOKEN_KEY } from '@/providers/AuthProvider';
export const AuthenticationSteps = (): JSX.Element => { export const AuthenticationSteps = (): JSX.Element => {
const navigate = useNavigate(); const navigate = useNavigate();
const [searchParams] = useSearchParams(); const [searchParams] = useSearchParams();
const authReturnUrl: string | null = searchParams.get('returnUrl'); const authReturnUrl: string | null = searchParams.get('returnUrl');
const authReturnUrlWithRefreshToken =
authReturnUrl + `?token=${sessionStorage.getItem(REFRESH_TOKEN_KEY)}`;
authReturnUrl + `?token=${sessionStorage.getItem(REFRESH_TOKEN_KEY)}`;
const authReturnUrlOrDefault: string = const authReturnUrlOrDefault: string =
authReturnUrl ?? import.meta.env.VITE_DEFUALT_AUTH_RETURN_URL; authReturnUrl ?? import.meta.env.VITE_DEFUALT_AUTH_RETURN_URL;
const [authMode, setAuthMode] = useState<AuthMode>('register'); const [authMode, setAuthMode] = useState<AuthMode>('register');
@@ -57,7 +61,7 @@ export const AuthenticationSteps = (): JSX.Element => {
if (!loginResult.completedUserInformation) { if (!loginResult.completedUserInformation) {
if (authReturnUrl) { if (authReturnUrl) {
navigate(`/signup?returnUrl=${authReturnUrl}`); navigate(`/signup?returnUrl=${authReturnUrlWithRefreshToken}`);
} else { } else {
navigate(`/signup`); navigate(`/signup`);
} }
@@ -69,7 +73,7 @@ export const AuthenticationSteps = (): JSX.Element => {
const handlePhoneNumberVerified = () => { const handlePhoneNumberVerified = () => {
if (authReturnUrl) { if (authReturnUrl) {
navigate(`/signup?returnUrl=${authReturnUrl}`); navigate(`/signup?returnUrl=${authReturnUrlWithRefreshToken}`);
} else { } else {
navigate(`/signup`); navigate(`/signup`);
} }
@@ -80,9 +84,10 @@ export const AuthenticationSteps = (): JSX.Element => {
navigate(import.meta.env.VITE_DEFUALT_AUTH_RETURN_URL); navigate(import.meta.env.VITE_DEFUALT_AUTH_RETURN_URL);
} else { } else {
if (authMode === 'register') { if (authMode === 'register') {
navigate(`/account-created?returnUrl=${authReturnUrl}`); navigate(`/account-created?returnUrl=${authReturnUrlWithRefreshToken}`);
} else { } else {
location.href = authReturnUrl; alert(authReturnUrlWithRefreshToken);
location.href = authReturnUrlWithRefreshToken;
} }
} }
}; };