Fix CustomerType and OwnerType enums: send int instead of string
Some checks failed
Build frontend / build (push) Failing after 45s
Some checks failed
Build frontend / build (push) Failing after 45s
- CustomerType: PERSONAL=0, FAMILY=1 (was 'Personal', 'Family') - OwnerType: PERSON=0, REAL_ESTATE_AGENCY=1 (was 'peerson', 'RealEstateAgency') - Backend Type column is int(11), sending strings caused 415 errors
This commit is contained in:
@ -93,24 +93,12 @@ export default function LoginPage() {
|
||||
AuthService.addToken(token);
|
||||
console.log('[Login] Token stored via AuthService');
|
||||
|
||||
// Decode token to get user info (basic JWT decode)
|
||||
try {
|
||||
const payload = JSON.parse(atob(token.split('.')[1]));
|
||||
const user = {
|
||||
name: payload.name || payload.unique_name || formData.credential,
|
||||
email: payload.email || (loginMethod === 'email' ? formData.credential : ''),
|
||||
phone: payload.phone || (loginMethod === 'phone' ? formData.credential : ''),
|
||||
role: payload.role || payload.Role || 'customer',
|
||||
};
|
||||
localStorage.setItem('user', JSON.stringify(user));
|
||||
console.log('[Login] User stored:', user);
|
||||
} catch (decodeErr) {
|
||||
console.warn('[Login] Could not decode JWT, storing credential as user');
|
||||
localStorage.setItem('user', JSON.stringify({
|
||||
name: formData.credential,
|
||||
role: 'customer',
|
||||
}));
|
||||
}
|
||||
// Decode token to get user info via AuthService
|
||||
const authUser = AuthService.getUser();
|
||||
const userRole = authUser?.roles?.includes('Owner') ? 'owner'
|
||||
: authUser?.roles?.includes('Admin') ? 'admin'
|
||||
: 'customer';
|
||||
console.log('[Login] User role:', userRole);
|
||||
|
||||
setIsSuccess(true);
|
||||
toast.success('تم تسجيل الدخول بنجاح!', {
|
||||
@ -118,9 +106,7 @@ export default function LoginPage() {
|
||||
});
|
||||
|
||||
setTimeout(() => {
|
||||
const user = JSON.parse(localStorage.getItem('user') || '{}');
|
||||
console.log('[Login] Redirecting user:', user);
|
||||
if (user.role === 'admin') {
|
||||
if (userRole === 'admin') {
|
||||
router.push('/admin');
|
||||
} else {
|
||||
router.push('/');
|
||||
@ -190,11 +176,6 @@ export default function LoginPage() {
|
||||
console.log('[OTP] Token stored via AuthService');
|
||||
}
|
||||
|
||||
localStorage.setItem('user', JSON.stringify({
|
||||
name: formData.credential,
|
||||
role: 'customer',
|
||||
}));
|
||||
|
||||
setIsSuccess(true);
|
||||
toast.success('تم التحقق بنجاح!', {
|
||||
style: { background: '#dcfce7', color: '#166534' },
|
||||
|
||||
Reference in New Issue
Block a user