feat: multi client id use added
This commit is contained in:
@@ -11,7 +11,7 @@ import {
|
||||
} from '@mui/material';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Link } from 'react-router-dom';
|
||||
import type { AuthType } from '../../types/authTypes';
|
||||
import type { AuthFactory, AuthType } from '../../types/authTypes';
|
||||
import type { CountryCode } from '@/types/commonTypes';
|
||||
import {
|
||||
loginWithPassword,
|
||||
@@ -22,17 +22,23 @@ import type { LoginResult, PasswordLoginRequest } from '../../types/userTypes';
|
||||
import { Icon, useToast } from '@rkheftan/harmony-ui';
|
||||
import { useApi } from '@/hooks/useApi';
|
||||
import { useAuth } from '@/hooks/useAuth';
|
||||
import { generateTokenWithPassword } from '../../api/identityAPI';
|
||||
import {
|
||||
generateTokenWithPassword,
|
||||
type GenerateTokenResponse,
|
||||
} from '../../api/identityAPI';
|
||||
|
||||
export interface EnterPasswordFormProps {
|
||||
onEditValue: () => void;
|
||||
onLoginWithOTP: () => void;
|
||||
onLoggedIn: (loginResult: LoginResult) => void;
|
||||
onLoggedIn: (
|
||||
loginResult: LoginResult,
|
||||
tokenResponse: GenerateTokenResponse,
|
||||
) => void;
|
||||
emailOrPhone: string;
|
||||
authType: AuthType;
|
||||
loginRegisterValue: string;
|
||||
countryCode: CountryCode;
|
||||
authReturnUrl: string;
|
||||
authFactory: AuthFactory;
|
||||
}
|
||||
|
||||
export const EnterPasswordForm = ({
|
||||
@@ -43,7 +49,7 @@ export const EnterPasswordForm = ({
|
||||
authType,
|
||||
loginRegisterValue,
|
||||
countryCode,
|
||||
authReturnUrl,
|
||||
authFactory,
|
||||
}: EnterPasswordFormProps) => {
|
||||
const { t } = useTranslation('authentication');
|
||||
const [passValue, setPassValue] = useState<string>('');
|
||||
@@ -57,7 +63,6 @@ export const EnterPasswordForm = ({
|
||||
useApi(sendEmailOtp);
|
||||
const { loading: loginWithPassLoading, execute: loginWithPassCall } =
|
||||
useApi(loginWithPassword);
|
||||
const auth = useAuth();
|
||||
|
||||
const handleBlur = () => {
|
||||
setInputTouched(true);
|
||||
@@ -72,7 +77,7 @@ export const EnterPasswordForm = ({
|
||||
authType === 'phone' ? countryCode + loginRegisterValue : undefined,
|
||||
email: authType === 'email' ? loginRegisterValue : undefined,
|
||||
password: passValue,
|
||||
returnUrl: authReturnUrl,
|
||||
returnUrl: authFactory.redirectUrl,
|
||||
};
|
||||
const res = await loginWithPassCall(apiRequest);
|
||||
|
||||
@@ -82,12 +87,10 @@ export const EnterPasswordForm = ({
|
||||
const tokenRes = await generateTokenWithPassword({
|
||||
username: apiRequest.email ?? (apiRequest.phoneNumber as string),
|
||||
password: apiRequest.password,
|
||||
});
|
||||
auth.login({
|
||||
...tokenRes.data,
|
||||
client_id: authFactory.clientId,
|
||||
});
|
||||
|
||||
onLoggedIn(res);
|
||||
onLoggedIn(res, tokenRes.data);
|
||||
toast({
|
||||
message: t('verify.youHaveSuccessfullyLoggedIn'),
|
||||
severity: 'success',
|
||||
@@ -134,7 +137,7 @@ export const EnterPasswordForm = ({
|
||||
endIcon={<Icon Component={Edit2} />}
|
||||
onClick={onEditValue}
|
||||
>
|
||||
{emailOrPhone}
|
||||
{authType === 'phone' ? countryCode + emailOrPhone : emailOrPhone}
|
||||
</Button>
|
||||
</Box>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user