From 989137211efcf7a47bcb489761344aa96fa621f2 Mon Sep 17 00:00:00 2001 From: Mo Tarbin Date: Thu, 2 Jan 2025 23:10:36 -0500 Subject: [PATCH] chore: Update Fetcher and TokenManager to use API v1 --- src/utils/Fetcher.jsx | 10 +++++----- src/utils/TokenManager.jsx | 4 ++-- src/views/Chores/ChoreCard.jsx | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/utils/Fetcher.jsx b/src/utils/Fetcher.jsx index 9fedd62..c5a80d5 100644 --- a/src/utils/Fetcher.jsx +++ b/src/utils/Fetcher.jsx @@ -22,7 +22,8 @@ const signUp = (username, password, displayName, email) => { } const UpdatePassword = newPassword => { - return fetch(`/users/change_password`, { + const baseURL = apiManager.getApiURL() + return fetch(`${baseURL}/users/change_password`, { method: 'PUT', headers: HEADERS(), body: JSON.stringify({ password: newPassword }), @@ -403,21 +404,20 @@ const ResetPassword = email => { } const UpdateDueDate = (id, dueDate) => { - return Fetch(`/chores/${chore.id}/dueDate`, { + return Fetch(`/chores/${id}/dueDate`, { method: 'PUT', headers: { 'Content-Type': 'application/json', }, body: JSON.stringify({ - dueDate: newDate ? new Date(newDate).toISOString() : null, - UpdatedBy: activeUserId, + dueDate: dueDate ? new Date(dueDate).toISOString() : null, }), }) } const RefreshToken = () => { const basedURL = apiManager.getApiURL() - return fetch(basedURL + '/auth/refresh', { + return fetch(`${basedURL}/auth/refresh`, { method: 'GET', headers: HEADERS(), }) diff --git a/src/utils/TokenManager.jsx b/src/utils/TokenManager.jsx index aba09cc..d33467c 100644 --- a/src/utils/TokenManager.jsx +++ b/src/utils/TokenManager.jsx @@ -6,7 +6,7 @@ import { Preferences } from '@capacitor/preferences' class ApiManager { constructor() { - this.customServerURL = API_URL + this.customServerURL = `${API_URL}/api/v1` this.initialized = false } async init() { @@ -17,7 +17,7 @@ class ApiManager { key: 'customServerUrl', }) - this.customServerURL = serverURL || API_URL + this.customServerURL = `${serverURL || API_URL}/api/v1` this.initialized = true } getApiURL() { diff --git a/src/views/Chores/ChoreCard.jsx b/src/views/Chores/ChoreCard.jsx index bbf9503..a41ba69 100644 --- a/src/views/Chores/ChoreCard.jsx +++ b/src/views/Chores/ChoreCard.jsx @@ -204,7 +204,7 @@ const ChoreCard = ({ alert('Please select a performer') return } - UpdateDueDate.then(response => { + UpdateDueDate(chore.id, newDate).then(response => { if (response.ok) { response.json().then(data => { const newChore = data.res