credebl · nishad-ayanworks · Feb 7, 2024 · Feb 6, 2024 · Feb 6, 2024 · Feb 6, 2024
diff --git a/src/commonComponents/EcosystemProfileCard.tsx b/src/commonComponents/EcosystemProfileCard.tsx
@@ -71,7 +71,6 @@ const EcosystemProfileCard = ({getEndorsementListData}:IEndorsement) => {
 				await getEndorsementListData()
     }
 
-
     useEffect(() => {
         fetchEcosystemDetails();
     }, []);

diff --git a/src/commonComponents/PasseyAddDevicePopup.tsx b/src/commonComponents/PasseyAddDevicePopup.tsx
@@ -30,14 +30,6 @@ const PasskeyAddDevice = (props: {
 	const savePassword = async (values: PasswordValue) => {
 		try {
 			const storedEmail = await getFromLocalStorage(storageKeys.LOGIN_USER_EMAIL);
-			const { error } = await getSupabaseClient().auth.signInWithPassword({
-				email: storedEmail,
-				password: values.Password,
-			});
-			if (error) {
-				setFidoUserError(error?.message)
-
-			} else {
 					const payload = {
 						password: passwordEncryption(values.Password)
 					}
@@ -48,8 +40,6 @@ const PasskeyAddDevice = (props: {
 					} else {
 						setFidoUserError(passkeyUserDetailsResp as string)
 					}
-
-			}
 		} catch (error) {
 			console.error('An unexpected error occurred:', error.message);
 			setFidoUserError('An unexpected error occurred')

diff --git a/src/components/Authentication/KeyCloakResetPassword.tsx b/src/components/Authentication/KeyCloakResetPassword.tsx
@@ -9,6 +9,7 @@ import { passwordEncryption, resetPasswordKeyCloak } from '../../api/Auth';
 import { PassInvisible, PassVisible } from './Svg.js';
 import { pathRoutes } from '../../config/pathRoutes';
 import type { IPassword, IProps, IValues } from './interfaces';
+import React from 'react';
 
 const KeyClockResetPassword = (props: IProps) => {
 	const [loading, setLoading] = useState(false);
@@ -34,7 +35,7 @@ const KeyClockResetPassword = (props: IProps) => {
 			if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
 				setSuccess(data.message);
 				setLoading(false);
-				window.location.href = pathRoutes.landingPage.landingPage;
+				window.location.href= pathRoutes.auth.sinIn
 			} else {
 				setError(response as string);
 				setLoading(false);
@@ -179,9 +180,8 @@ const KeyClockResetPassword = (props: IProps) => {
 								</div>
 								{formikHandlers?.errors?.newPassword &&
    									typeof formikHandlers?.errors?.newPassword === 'string' &&
-									formikHandlers?.errors?.newPassword &&
 									formikHandlers?.touched?.newPassword && (
-										<span className="text-red-500 text-xs absolute mt-1">
+										<span className="text-red-500 text-xs mt-1">
 											{formikHandlers?.errors?.newPassword}
 										</span>
 									)}

diff --git a/src/components/Authentication/SignInUserPassword.tsx b/src/components/Authentication/SignInUserPassword.tsx
@@ -80,7 +80,7 @@ const SignInUserPassword = (signInUserProps: SignInUser3Props) => {
 		setLoading(true);
 		const loginRsp = await loginUser(payload);
 		const { data } = loginRsp as AxiosResponse;
-		
+
 		if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
 			if (data?.data?.isRegisteredToSupabase) {
 				setOpenModel(true);
@@ -112,8 +112,13 @@ const SignInUserPassword = (signInUserProps: SignInUser3Props) => {
 			}
 		} else {
 			setLoading(false);
-			setFailure(loginRsp as string);
+			if (loginRsp.toString().includes('401')) {
+				setFailure('Invalid Credntials');
+			} else {
+				setFailure(loginRsp as string);
+			}
 		}
+		setLoading(false);
 	};
 
 	const handleBackButtonClick = () => {

diff --git a/src/components/Resources/Schema/Create.tsx b/src/components/Resources/Schema/Create.tsx
@@ -70,19 +70,18 @@ const CreateSchema = () => {
 			},
 		],
 	};
+	const checkEcosystemData = async () => {
+		const data: ICheckEcosystem = await checkEcosystem();
+		setIsEcosystemData(data);
+	};
+
 	const [formData, setFormData] = useState(initFormData);
+
 	useEffect(() => {
-		const fetchData = async () => {
+		(async () => {
 			const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
 			setOrgId(orgId);
-		};
-
-		fetchData();
-
-		const checkEcosystemData = async () => {
-			const data: ICheckEcosystem = await checkEcosystem();
-			setIsEcosystemData(data);
-		};
+	})();
 
 		checkEcosystemData();
 	}, []);
@@ -283,7 +282,7 @@ const CreateSchema = () => {
 			</div>
 			{isEcosystemData?.isEnabledEcosystem && (
 				<div className="mx-6 mb-4">
-					<EcosystemProfileCard />
+					<EcosystemProfileCard getEndorsementListData={checkEcosystemData} />
 				</div>
 			)}
 

diff --git a/src/services/axiosIntercepter.ts b/src/services/axiosIntercepter.ts
@@ -1,6 +1,8 @@
 import axios from 'axios'
 import { envConfig } f
5D32
rom '../config/envConfig';
 import { pathRoutes } from '../config/pathRoutes';
+import { getFromLocalStorage } from '../api/Auth';
+import { storageKeys } from '../config/CommonConstant';
 
 const instance = axios.create({
     baseURL: envConfig.PUBLIC_BASE_URL
@@ -21,13 +23,13 @@ instance.interceptors.response.use(function (response) {
     // Any status codes that falls outside the range of 2xx cause this function to trigger
     // Do something with response error
     const errorRes = error?.response;
-
-    if(errorRes?.status === 401){
+    const token = await getFromLocalStorage(storageKeys.TOKEN)
+    if(errorRes?.status === 401 && token){
         await localStorage.clear()
         window.location.href = pathRoutes.auth.sinIn
     }
 
     return Promise.reject(error);
 });
 
-export default instance
+export default instance
-Original file line number
+Diff line change
@@ Expand Up @@
     				await getEndorsementListData()
         }
         useEffect(() => {
             fetchEcosystemDetails();
         }, []);
@@ Expand Down @@