Clean up debug logging in login flow
All checks were successful
Build frontend / build (push) Successful in 57s
All checks were successful
Build frontend / build (push) Successful in 57s
This commit is contained in:
@ -22,7 +22,7 @@
|
|||||||
body {
|
body {
|
||||||
background: var(--background);
|
background: var(--background);
|
||||||
color: var(--foreground);
|
color: var(--foreground);
|
||||||
font-family: Arial, Helvetica, sans-serif;
|
font-family: 'Madani Arabic', 'Noto Sans Arabic', 'Cairo', Arial, sans-serif;
|
||||||
}
|
}
|
||||||
|
|
||||||
.leaflet-container {
|
.leaflet-container {
|
||||||
|
|||||||
@ -25,9 +25,19 @@ export const metadata = {
|
|||||||
export default function Layout({ children }) {
|
export default function Layout({ children }) {
|
||||||
return (
|
return (
|
||||||
<html lang="ar" dir="rtl">
|
<html lang="ar" dir="rtl">
|
||||||
<head />
|
<head>
|
||||||
|
<link
|
||||||
|
href="https://db.onlinewebfonts.com/c/5f92c3a05f1a5243b55892723e55b1c3?family=Madani+Arabic+DEMO+Thin"
|
||||||
|
rel="stylesheet"
|
||||||
|
/>
|
||||||
|
<link
|
||||||
|
href="https://db.onlinewebfonts.com/c/64ab2a7ae4cb5dbb5b5a1e1d2c5e7a3d?family=Madani+Arabic"
|
||||||
|
rel="stylesheet"
|
||||||
|
/>
|
||||||
|
</head>
|
||||||
<body
|
<body
|
||||||
className={`${geistSans.variable} ${geistMono.variable} antialiased`}
|
className={`${geistSans.variable} ${geistMono.variable} antialiased`}
|
||||||
|
style={{ fontFamily: "'Madani Arabic', 'Noto Sans Arabic', 'Cairo', Arial, sans-serif" }}
|
||||||
>
|
>
|
||||||
<ClientLayout>{children}</ClientLayout>
|
<ClientLayout>{children}</ClientLayout>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@ -85,17 +85,13 @@ export default function LoginPage() {
|
|||||||
|
|
||||||
const result = await loginFn(formData.credential, formData.password);
|
const result = await loginFn(formData.credential, formData.password);
|
||||||
|
|
||||||
console.log('[Login] Response:', JSON.stringify(result));
|
console.log('[Login] Response status:', result.status);
|
||||||
|
|
||||||
if (result.status === 200) {
|
if (result.status === 200) {
|
||||||
// Login success — store token via AuthService
|
const token = typeof result.data === 'string' ? result.data : result.data?.token || result.data?.accessToken;
|
||||||
console.log('[Login] result.data type:', typeof result.data, 'value:', result.data);
|
|
||||||
const token = typeof result.data === 'string' ? result.data : result.data?.token || result.data?.accessToken || JSON.stringify(result.data);
|
|
||||||
console.log('[Login] Extracted token:', token?.substring?.(0, 50) + '...');
|
|
||||||
AuthService.addToken(token);
|
AuthService.addToken(token);
|
||||||
console.log('[Login] Token stored, verifying:', AuthService.getToken()?.substring(0, 30));
|
console.log('[Login] Token stored');
|
||||||
|
|
||||||
// Decode token to get user info via AuthService
|
|
||||||
const authUser = AuthService.getUser();
|
const authUser = AuthService.getUser();
|
||||||
const userRole = AuthService.isAdmin() ? 'admin'
|
const userRole = AuthService.isAdmin() ? 'admin'
|
||||||
: AuthService.isOwner() ? 'owner'
|
: AuthService.isOwner() ? 'owner'
|
||||||
@ -116,13 +112,11 @@ export default function LoginPage() {
|
|||||||
}, 1500);
|
}, 1500);
|
||||||
|
|
||||||
} else if (result.status === 206) {
|
} else if (result.status === 206) {
|
||||||
// Needs OTP verification
|
console.log('[Login] 206 — OTP required');
|
||||||
console.log('[Login] 206 — result.data:', JSON.stringify(result.data));
|
|
||||||
// Store temp token if returned
|
|
||||||
const tempToken = typeof result.data === 'string' ? result.data : result.data?.token || result.data?.accessToken;
|
const tempToken = typeof result.data === 'string' ? result.data : result.data?.token || result.data?.accessToken;
|
||||||
if (tempToken) {
|
if (tempToken) {
|
||||||
AuthService.addToken(tempToken);
|
AuthService.addToken(tempToken);
|
||||||
console.log('[Login] Temp token stored for OTP, key:', AuthService.getToken()?.substring(0, 30));
|
console.log('[Login] Temp token stored for OTP');
|
||||||
}
|
}
|
||||||
toast('يرجى إدخال رمز التحقق', {
|
toast('يرجى إدخال رمز التحقق', {
|
||||||
icon: '🔐',
|
icon: '🔐',
|
||||||
@ -174,15 +168,13 @@ export default function LoginPage() {
|
|||||||
console.log('[OTP] Verifying code:', otpCode);
|
console.log('[OTP] Verifying code:', otpCode);
|
||||||
|
|
||||||
const result = await verifyFn(otpCode);
|
const result = await verifyFn(otpCode);
|
||||||
console.log('[OTP] Verify response:', JSON.stringify(result));
|
console.log('[OTP] Verify response status:', result.status);
|
||||||
|
|
||||||
if (result.ok) {
|
if (result.ok) {
|
||||||
// Verified — store final token if returned
|
|
||||||
const finalToken = typeof result.data === 'string' ? result.data : result.data?.token || result.data?.accessToken;
|
const finalToken = typeof result.data === 'string' ? result.data : result.data?.token || result.data?.accessToken;
|
||||||
console.log('[OTP] Final token:', finalToken?.substring?.(0, 50));
|
|
||||||
if (finalToken && typeof finalToken === 'string') {
|
if (finalToken && typeof finalToken === 'string') {
|
||||||
AuthService.addToken(finalToken);
|
AuthService.addToken(finalToken);
|
||||||
console.log('[OTP] Final token stored, verifying:', AuthService.getToken()?.substring(0, 30));
|
console.log('[OTP] Final token stored');
|
||||||
}
|
}
|
||||||
|
|
||||||
setIsSuccess(true);
|
setIsSuccess(true);
|
||||||
|
|||||||
Reference in New Issue
Block a user