diff --git a/src/app/widget/login/page.tsx b/src/app/widget/login/page.tsx index 52664ed..e786d17 100644 --- a/src/app/widget/login/page.tsx +++ b/src/app/widget/login/page.tsx @@ -1,10 +1,15 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ - 'use client'; -import { testPass, passMsg, testOTP, convertToApproxTime } from './utils'; +import { + testPass, + passMsg, + testOTP, + convertToApproxTime, + encrypt +} from './utils'; import Image from 'next/image'; import React, { useEffect, useState } from 'react'; -import { redirect, useSearchParams } from 'next/navigation'; +import { useSearchParams } from 'next/navigation'; import { useRouter } from 'next/navigation'; import { OrgData, useOrgData, useUserData } from './widgetStore'; //import zustand store to store and update org data import Spinner from '@/components/spinner'; @@ -131,6 +136,7 @@ export default function Widget() { } try { + const encryptedPass = encrypt(newPass); const response = await fetch(`https://api.trustauthx.com/user/me/auth`, { method: 'PUT', headers: { @@ -139,7 +145,7 @@ export default function Widget() { body: JSON.stringify({ usr: { forget_password: true, - new_password: newPass + new_password: encryptedPass }, UserTokenBody: { UserToken: currentUserToken @@ -191,6 +197,7 @@ export default function Widget() { }); return; } + const encryptedPass = encrypt(newPass); try { const response = await fetch(`https://api.trustauthx.com/user/me/auth`, { method: 'PUT', @@ -199,7 +206,7 @@ export default function Widget() { }, body: JSON.stringify({ usr: { - new_user_password: newPass + new_user_password: encryptedPass }, UserTokenBody: { UserToken: currentUserToken @@ -369,7 +376,7 @@ export default function Widget() { }); return; } - + const encryptedPass = encrypt(pass); try { let rcToken = ''; if (storeOrgData.bot_det) { @@ -383,7 +390,7 @@ export default function Widget() { body: JSON.stringify({ form_data: { email: email, - password: pass, + password: encryptedPass, mfa_totp: otp ? otp : 0, rc_token: rcToken }, @@ -461,7 +468,7 @@ export default function Widget() { setLoading2(false); return; } - + const encryptedPass = encrypt(pass); try { let rcToken = ''; if (storeOrgData.bot_det) { @@ -475,7 +482,7 @@ export default function Widget() { body: JSON.stringify({ form_data: { email: email, - password: pass, + password: encryptedPass, mfa_totp: otp ? otp : 0, rc_token: rcToken }, diff --git a/src/app/widget/login/utils.ts b/src/app/widget/login/utils.ts index 610fd4e..61678d7 100644 --- a/src/app/widget/login/utils.ts +++ b/src/app/widget/login/utils.ts @@ -8,6 +8,17 @@ export const decryptCode = (mfa: string): string => { const decoded = bytes.toString(CryptoJS.enc.Utf8); return decoded; }; +export const encrypt = (pass: string) => { + // console.log(pass) + // try { + // const encrypted = CryptoJS.AES.encrypt(pass, process.env.NEXT_PUBLIC_AES_KEY ? process.env.NEXT_PUBLIC_AES_KEY : ''); + // return encrypted + // } catch (error) { + // console.error('Encryption failed:', error); + // return; + // } + return pass; +}; //to test input password string export const testPass = (password: string): boolean => { // /^(?=.*[A-Z])(?=.*[a-z])(?=.*\d)[A-Za-z\d@$!%*#?&]{8,1000}$/ diff --git a/src/app/widget/profile/SecurityTab.tsx b/src/app/widget/profile/SecurityTab.tsx index dd8f475..7b101c3 100644 --- a/src/app/widget/profile/SecurityTab.tsx +++ b/src/app/widget/profile/SecurityTab.tsx @@ -27,6 +27,7 @@ import { testPass, testOTP, decryptCode, + encrypt, convertToApproxTime } from '../login/utils'; import Spinner from '@/components/spinner'; @@ -279,6 +280,7 @@ export default function Security() { async function newPasswordRequest() { setLoading1(true); + const encryptedPass = encrypt(pass); try { const response = await fetch(`https://api.trustauthx.com/user/me/auth`, { method: 'PUT', @@ -287,7 +289,8 @@ export default function Security() { }, body: JSON.stringify({ usr: { - forget_password: pass + forget_password: true, + new_password: encryptedPass }, UserTokenBody: { UserToken: user_token diff --git a/src/app/widget/profile/page.tsx b/src/app/widget/profile/page.tsx index c6f3744..ea2ad39 100644 --- a/src/app/widget/profile/page.tsx +++ b/src/app/widget/profile/page.tsx @@ -23,7 +23,6 @@ import { getAccessToken } from './utils'; import { IoArrowBackOutline } from 'react-icons/io5'; import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'; import { useRouter } from 'next/navigation'; -import { get } from 'http'; export default function WidgetProfile() { const searchParams = useSearchParams();