Rahaf/SweetHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

owner account
All checks were successful
Build frontend / build (push) Successful in 1m16s
Details

Browse Source
This commit is contained in:
Beilin-b
2026-06-05 18:33:51 -07:00
parent 6bc0c8ba27
commit 53a83494b7
2 changed files with 596 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
app/utils/api.js
View File

@ -449,9 +449,6 @@
// });
// }
import AuthService from '../services/AuthService';
const API_BASE = process.env.NEXT_PUBLIC_API_URL || 'https://45.93.137.91.nip.io/api';
@ -468,18 +465,13 @@ async function apiFetch(endpoint, options = {}) {
...options.headers,
};
console.log('[API] Request:', options.method || 'GET', `${API_BASE}${endpoint}`);
const res = await fetch(`${API_BASE}${endpoint}`, {
...options,
headers,
});
console.log('[API] Response:', res.status, endpoint);
if (!res.ok && res.status !== 206) {
const text = await res.text().catch(() => '');
console.error('[API] Error:', res.status, text);
throw new Error(`API ${res.status}: ${text || res.statusText}`);
}
@ -501,12 +493,9 @@ async function apiFetch(endpoint, options = {}) {
* Auth fetch — returns full { status, data, ok } for status-code handling
*/
async function authFetch(endpoint, body, token = null) {
console.log('[Auth] Request:', `${API_BASE}${endpoint}`);
const headers = { 'Content-Type': 'application/json' };
if (token) {
headers['Authorization'] = `Bearer ${token}`;
console.log('[Auth] Sending with Bearer token');
}
const res = await fetch(`${API_BASE}${endpoint}`, {
@ -515,8 +504,6 @@ async function authFetch(endpoint, body, token = null) {
body: JSON.stringify(body),
});
console.log('[Auth] Response status:', res.status, endpoint);
const text = await res.text();
let data = null;
try {
@ -582,17 +569,9 @@ export async function getTopRecommendations(count = 10) {
// ─── Reservations ───
export async function getAvailableDateRanges(propertyId, fromDate = null, toDate = null) {
console.log('[API] Fetching available dates for property:', {
propertyId,
fromDate,
toDate,
});
const qs = new URLSearchParams();
if (fromDate) qs.set('fromDate', fromDate);
if (toDate) qs.set('toDate', toDate);
const query = qs.toString();
return apiFetch(
@ -623,8 +602,6 @@ export async function bookReservation(propertyInfoId, startDate, endDate) {
endDate,
};
console.log('[API] Booking reservation FINAL:', payload);
return apiFetch('/Reservations/BookReservation/book', {
method: 'POST',
body: JSON.stringify(payload),
@ -640,24 +617,20 @@ export async function getTerms() {
// ─── Profile ───
export async function getCustomerByUserId(userId) {
console.log('[API] Fetching customer by user ID:', userId);
return apiFetch(`/Customer/GetByUserId/${userId}`);
}
export async function getOwnerByUserId(userId) {
console.log('[API] Fetching owner by user ID:', userId);
return apiFetch(`/Owner/GetByUserId/${userId}`);
}
// ─── Properties ───
export async function getMyRentListings() {
console.log('[API] Fetching my rent listings');
return apiFetch(`/RentProperties/GetMyRentListings`);
}
export async function addRentProperty(data) {
console.log('[API] Adding rent property:', data.PropertyInformation?.Address);
return apiFetch('/RentProperties/AddRentProperty', {
method: 'POST',
body: JSON.stringify(data),
@ -665,7 +638,6 @@ export async function addRentProperty(data) {
}
export async function editRentProperty(id, data) {
console.log('[API] Editing rent property:', id, data.PropertyInformation?.Address);
return apiFetch(`/RentProperties/EditRentProperty/${id}`, {
method: 'PUT',
body: JSON.stringify(data),
@ -673,7 +645,6 @@ export async function editRentProperty(id, data) {
}
export async function editSaleProperty(id, data) {
console.log('[API] Editing sale property:', id);
return apiFetch(`/SaleProperties/EditSaleProperty/${id}`, {
method: 'PUT',
body: JSON.stringify(data),
@ -681,7 +652,6 @@ export async function editSaleProperty(id, data) {
}
export async function addSaleProperty(data) {
console.log('[API] Adding sale property');
return apiFetch('/SaleProperties/AddSaleProperty', {
method: 'POST',
body: JSON.stringify(data),
@ -689,7 +659,6 @@ export async function addSaleProperty(data) {
}
export async function getMySaleListings() {
console.log('[API] Fetching my sale listings');
return apiFetch('/SaleProperties/GetMySaleListings');
}
@ -706,7 +675,6 @@ export async function getCurrencies() {
// ─── Files ───
export async function uploadPicture(file) {
console.log('[API] Uploading picture:', file.name);
const formData = new FormData();
formData.append('image', file);
const token = AuthService.getToken();
@ -720,7 +688,6 @@ export async function uploadPicture(file) {
});
const text = await res.text();
console.log('[API] Upload response:', res.status, text?.substring(0, 100));
if (!res.ok) throw new Error(`Upload failed: ${res.status} ${text}`);
@ -735,15 +702,11 @@ export async function uploadPicture(file) {
// ─── Auth: Registration ───
async function multipartAuthFetch(endpoint, formData) {
console.log('[Auth] Multipart request:', `${API_BASE}${endpoint}`);
const res = await fetch(`${API_BASE}${endpoint}`, {
method: 'POST',
body: formData,
});
console.log('[Auth] Response status:', res.status, endpoint);
const text = await res.text();
let data = null;
@ -759,30 +722,35 @@ async function multipartAuthFetch(endpoint, formData) {
return { status: res.status, data, ok: res.ok || res.status === 206, message: data?.message };
}
export async function addOwner(data, frontImage = null, backImage = null) {
console.log('[Auth] Registering owner (multipart):', data.email);
export async function addOwner(data, frontImage = null, backImage = null, licenseImage = null) {
const formData = new FormData();
formData.append('FirstName', data.firstName || data.FirstName || '');
formData.append('LastName', data.lastName || data.LastName || '');
formData.append('Email', data.email || '');
formData.append('PhoneNumber', data.phoneNumber || '');
formData.append('WhatsAppNumber', data.whatsAppNumber || '');
formData.append('Phone', data.phone || '');
formData.append('NationalNumber', data.nationalNumber || '');
formData.append('Password', data.password || '');
formData.append('Type', String(data.ownerType ?? data.Type ?? 0));
formData.append('Language', '0');
formData.append('Email', data.email || data.Email || '');
const phoneValue =
data.phone || data.phoneNumber || data.Phone || data.PhoneNumber || '';
const whatsappValue =
data.whatsAppNumber || data.whatsapp || data.WhatsAppNumber || data.WhatsApp || '';
formData.append('PhoneNumber', phoneValue);
formData.append('Phone', phoneValue);
formData.append('WhatsAppNumber', whatsappValue);
formData.append('NationalNumber', data.nationalNumber || data.NationalNumber || '');
formData.append('Password', data.password || data.Password || '');
formData.append('Type', String(data.type ?? data.ownerType ?? data.Type ?? 0));
formData.append('Language', String(data.language ?? data.Language ?? 1));
if (frontImage) formData.append('FrontIdCarImagePath', frontImage);
if (backImage) formData.append('RearIdCarImagePath', backImage);
if (licenseImage) formData.append('LicenseImagePath', licenseImage);
return multipartAuthFetch('/Owner/Add', formData);
}
export async function addCustomer(data, frontImage = null, backImage = null) {
console.log('[Auth] Registering customer (multipart):', data.email);
const formData = new FormData();
formData.append('FirstName', data.firstName || data.FirstName || '');
formData.append('LastName', data.lastName || data.LastName || '');
@ -804,7 +772,6 @@ export async function addCustomer(data, frontImage = null, backImage = null) {
// ─── Auth: Login ───
export async function loginWithEmail(credential, password) {
console.log('[Auth] Login with email:', credential);
return authFetch('/Auth/LogInWithEmail', {
credential,
password,
@ -814,7 +781,6 @@ export async function loginWithEmail(credential, password) {
}
export async function loginWithPhone(credential, password) {
console.log('[Auth] Login with phone:', credential);
return authFetch('/Auth/LogInWithPhoneNumber', {
credential,
password,
@ -826,23 +792,19 @@ export async function loginWithPhone(credential, password) {
// ─── Auth: OTP ───
export async function sendEmailOTP() {
console.log('[Auth] Sending email OTP...');
return apiFetch('/Auth/SendEmailOTP', { method: 'POST' });
}
export async function sendPhoneOTP() {
console.log('[Auth] Sending phone OTP...');
return apiFetch('/Auth/SendPhoneNumberOTP', { method: 'POST' });
}
export async function verifyEmail(code) {
console.log('[Auth] Verifying email with code:', code);
const token = AuthService.getToken();
return authFetch(`/Auth/VerifyEmail?code=${encodeURIComponent(code)}`, {}, token);
}
export async function verifyPhone(code) {
console.log('[Auth] Verifying phone with code:', code);
const token = AuthService.getToken();
return authFetch(`/Auth/VerifyPhoneNumber?code=${encodeURIComponent(code)}`, {}, token);
}
@ -899,15 +861,6 @@ export async function adminConfirmDeposit(reservationId, adminId, comment = null
comment: normalizedComment,
};
console.log('[API] AdminConfirmDeposit request', {
method: 'PUT',
endpoint,
payload,
adminIdSource: 'jwt-user-id',
hasToken: Boolean(token),
tokenPreview: token ? `${token.slice(0, 18)}...${token.slice(-8)}` : null,
});
const res = await fetch(endpoint, {
method: 'PUT',
headers: {
@ -920,13 +873,6 @@ export async function adminConfirmDeposit(reservationId, adminId, comment = null
const text = await res.text();
let data = null;
console.log('[API] AdminConfirmDeposit raw response', {
status: res.status,
ok: res.ok,
endpoint,
rawText: text,
});
try {
data = text ? JSON.parse(text) : null;
if (data && typeof data === 'object' && 'data' in data) {
@ -938,13 +884,6 @@ export async function adminConfirmDeposit(reservationId, adminId, comment = null
const message = typeof data === 'object' && data?.message ? data.message : null;
console.log('[API] AdminConfirmDeposit parsed response', {
status: res.status,
ok: res.ok,
message,
data,
});
return { status: res.status, data, ok: res.ok, message };
}
@ -1000,7 +939,6 @@ export async function getOwnerStatistics() {
// ─── Agent Registration ───
export async function registerRealEstateAgent(formData) {
console.log('[API] Registering real estate agent (multipart)');
const token = AuthService.getToken();
const res = await fetch(`${API_BASE}/RealEstateAgent/Add`, {
method: 'POST',
@ -1009,7 +947,12 @@ export async function registerRealEstateAgent(formData) {
});
const text = await res.text();
let data = null;
try { data = text ? JSON.parse(text) : null; if (data && typeof data === 'object' && 'data' in data) data = data.data; } catch { data = text; }
try {
data = text ? JSON.parse(text) : null;
if (data && typeof data === 'object' && 'data' in data) data = data.data;
} catch {
data = text;
}
return { status: res.status, data, ok: res.ok || res.status === 206, message: data?.message };
}
@ -1109,4 +1052,4 @@ export async function addTerm(name, description) {
method: 'POST',
body: JSON.stringify({ name, description }),
});
}
}