From aee510f5272bfc18f9e5b37e315dbc3baf3c346b Mon Sep 17 00:00:00 2001 From: Kartik Sharma Date: Sun, 21 Sep 2025 16:58:29 +0530 Subject: [PATCH] revert pramod changed - (tenant login mistake --- src/pages/authentication/LoginPage.jsx | 38 ++++++++++++-------------- src/repositories/AuthRepository.jsx | 17 +----------- 2 files changed, 18 insertions(+), 37 deletions(-) diff --git a/src/pages/authentication/LoginPage.jsx b/src/pages/authentication/LoginPage.jsx index e75b9f0c..3e331376 100644 --- a/src/pages/authentication/LoginPage.jsx +++ b/src/pages/authentication/LoginPage.jsx @@ -6,7 +6,7 @@ import { useForm } from "react-hook-form"; import { zodResolver } from "@hookform/resolvers/zod"; import { z } from "zod"; import { AuthWrapper } from "./AuthWrapper"; -import { setOrgToken } from "../../services/tenantService"; + const LoginPage = () => { const navigate = useNavigate(); const [loading, setLoading] = useState(false); @@ -16,13 +16,13 @@ const LoginPage = () => { const loginSchema = IsLoginWithOTP ? z.object({ - username: z.string().trim().email({ message: "Valid email required" }), - }) + username: z.string().trim().email({ message: "Valid email required" }), + }) : z.object({ - username: z.string().trim().email({ message: "Valid email required" }), - password: z.string().trim().min(1, { message: "Password required" }), - rememberMe: z.boolean(), - }); + username: z.string().trim().email({ message: "Valid email required" }), + password: z.string().trim().min(1, { message: "Password required" }), + rememberMe: z.boolean(), + }); const { register, @@ -41,11 +41,10 @@ const LoginPage = () => { password: data.password, }; const response = await AuthRepository.login(userCredential); - // localStorage.setItem("jwtToken", response.data.token); - // localStorage.setItem("refreshToken", response.data.refreshToken); + localStorage.setItem("jwtToken", response.data.token); + localStorage.setItem("refreshToken", response.data.refreshToken); setLoading(false); - setOrgToken(response.data.token, response.data.refreshToken); - navigate("/auth/user"); + navigate("/dashboard"); } else { await AuthRepository.sendOTP({ email: data.username }); showToast("OTP has been sent to your email.", "success"); @@ -147,9 +146,8 @@ const LoginPage = () => { type={hidepass ? "password" : "text"} autoComplete="new-password" id="password" - className={`form-control form-control-xl shadow-none ${ - errors.password ? "is-invalid" : "" - }`} + className={`form-control form-control-xl shadow-none ${errors.password ? "is-invalid" : "" + }`} name="password" {...register("password")} placeholder="••••••••••••" @@ -172,15 +170,13 @@ const LoginPage = () => { {/* ✅ Error message */} {errors.password && ( -
+
{errors.password.message}
)}
+ {/* Remember Me + Forgot Password */}
@@ -213,8 +209,8 @@ const LoginPage = () => { {loading ? "Please Wait..." : IsLoginWithOTP - ? "Send OTP" - : "Sign In"} + ? "Send OTP" + : "Sign In"} {/* Login With OTP Button */} @@ -258,4 +254,4 @@ const LoginPage = () => { ); }; -export default LoginPage; +export default LoginPage; \ No newline at end of file diff --git a/src/repositories/AuthRepository.jsx b/src/repositories/AuthRepository.jsx index e6c6411a..b1d28940 100644 --- a/src/repositories/AuthRepository.jsx +++ b/src/repositories/AuthRepository.jsx @@ -15,23 +15,8 @@ const AuthRepository = { logout: (data) => api.post("/api/auth/logout", data), profile: () => api.get("/api/user/profile"), changepassword: (data) => api.post("/api/auth/change-password", data), - appmenu: () => api.get("/api/appmenu/get/menu"), - // getTenantList: () => - // api.get("/api/Auth/get/user/tenants", {}, { useTenantToken: false }), - // selectTenant: (tenantId) => - // api.post(`/api/Auth/select-tenant/${tenantId}`), + appmenu:()=>api.get('/api/appmenu/get/menu') - // ---------------- Org-level routes (use org token) --------------- - // Note: pass `orgToken: true` (4th arg) so axios interceptor uses orgJwtToken. - getTenantList: () => api.get("/api/Auth/get/user/tenants", {}, {}, true), - - // Exchange tenantId (with org token) -> server returns tenant JWT - // Using POST with body { tenantId } (adjust if your API expects path param). - selectTenant: (tenantId) => - api.post("/api/Auth/select-tenant", { tenantId }, {}, true), - - // If your backend expects tenantId in URL instead of body, use this variant: - // selectTenant: (tenantId) => api.post(`/api/Auth/select-tenant/${tenantId}`, {}, {}, true), }; export default AuthRepository;