Skip to content

Commit 7a4129b

Browse files
ervwalterervwalter
committed
fix(auth): add authentication tokens to missing API mutations
OAuth callback mutations were failing because they didn't include authentication tokens, causing 401 errors on backend endpoints that require authorization. Fixed mutations: - useExchangeFitbitToken - useExchangeWithingsToken - useGenerateShareToken - useDeleteAccount - useCompleteMigration All mutations now properly call getToken() and pass the token to apiRequest.
1 parent 27e5e22 commit 7a4129b

2 files changed

Lines changed: 94 additions & 86 deletions

File tree

‎apps/web/src/lib/api/mutations.ts‎

Lines changed: 34 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,17 @@ export function useToggleSharing() {
147147
}
148148

149149
export function useGenerateShareToken() {
150+
const { getToken } = useAuth();
150151
const queryClient = useQueryClient();
151152

152153
return useMutation({
153-
mutationFn: () =>
154-
apiRequest<SharingData>("/profile/generate-token", {
154+
mutationFn: async () => {
155+
const token = await getToken();
156+
return apiRequest<SharingData>("/profile/generate-token", {
155157
method: "POST",
156-
}),
158+
token,
159+
});
160+
},
157161
onSuccess: (data) => {
158162
// Update the cache with the new data
159163
queryClient.setQueryData(queryKeys.sharing, data);
@@ -164,8 +168,13 @@ export function useGenerateShareToken() {
164168
}
165169

166170
export function useDeleteAccount() {
171+
const { getToken } = useAuth();
172+
167173
return useMutation({
168-
mutationFn: () => apiRequest("/profile", { method: "DELETE" }),
174+
mutationFn: async () => {
175+
const token = await getToken();
176+
return apiRequest("/profile", { method: "DELETE", token });
177+
},
169178
});
170179
}
171180

@@ -179,14 +188,18 @@ interface ExchangeTokenResponse {
179188
}
180189

181190
export function useExchangeFitbitToken() {
191+
const { getToken } = useAuth();
182192
const queryClient = useQueryClient();
183193

184194
return useMutation({
185-
mutationFn: ({ code }: ExchangeTokenRequest) =>
186-
apiRequest<ExchangeTokenResponse>("/fitbit/exchange-token", {
195+
mutationFn: async ({ code }: ExchangeTokenRequest) => {
196+
const token = await getToken();
197+
return apiRequest<ExchangeTokenResponse>("/fitbit/exchange-token", {
187198
method: "POST",
188199
body: JSON.stringify({ code }),
189-
}),
200+
token,
201+
});
202+
},
190203
onSuccess: () => {
191204
// Invalidate provider links to show the new connection
192205
queryClient.invalidateQueries({ queryKey: queryKeys.providerLinks() });
@@ -195,14 +208,18 @@ export function useExchangeFitbitToken() {
195208
}
196209

197210
export function useExchangeWithingsToken() {
211+
const { getToken } = useAuth();
198212
const queryClient = useQueryClient();
199213

200214
return useMutation({
201-
mutationFn: ({ code }: ExchangeTokenRequest) =>
202-
apiRequest<ExchangeTokenResponse>("/withings/exchange-token", {
215+
mutationFn: async ({ code }: ExchangeTokenRequest) => {
216+
const token = await getToken();
217+
return apiRequest<ExchangeTokenResponse>("/withings/exchange-token", {
203218
method: "POST",
204219
body: JSON.stringify({ code }),
205-
}),
220+
token,
221+
});
222+
},
206223
onSuccess: () => {
207224
// Invalidate provider links to show the new connection
208225
queryClient.invalidateQueries({ queryKey: queryKeys.providerLinks() });
@@ -211,13 +228,17 @@ export function useExchangeWithingsToken() {
211228
}
212229

213230
export function useCompleteMigration() {
231+
const { getToken } = useAuth();
214232
const queryClient = useQueryClient();
215233

216234
return useMutation({
217-
mutationFn: () =>
218-
apiRequest("/profile/complete-migration", {
235+
mutationFn: async () => {
236+
const token = await getToken();
237+
return apiRequest("/profile/complete-migration", {
219238
method: "POST",
220-
}),
239+
token,
240+
});
241+
},
221242
onSuccess: async () => {
222243
// Invalidate and refetch profile query to ensure the migration flag is updated
223244
await queryClient.invalidateQueries({ queryKey: queryKeys.profile() });

‎apps/web/src/lib/version-skew/setup-version-skew-handler.ts‎

Lines changed: 60 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -3,77 +3,64 @@
33
* This is called once at app initialization, outside of React components.
44
*/
55
export function setupVersionSkewHandler() {
6-
let isReloading = false;
7-
8-
console.log("[Version Skew Handler] Setting up handlers");
9-
10-
// Listen for Vite preload errors (chunk loading failures)
11-
window.addEventListener("vite:preloadError", (event: Event) => {
12-
console.log("[Version Skew Handler] vite:preloadError event:", event);
13-
14-
if (!isReloading) {
15-
isReloading = true;
16-
console.warn("[Version Skew Handler] Vite preload error detected - reloading application");
17-
18-
// Small delay to ensure the error is logged
19-
setTimeout(() => {
20-
window.location.reload();
21-
}, 100);
22-
}
23-
});
24-
25-
// Handle unhandled promise rejections from dynamic imports
26-
window.addEventListener("unhandledrejection", (event: PromiseRejectionEvent) => {
27-
const error = event.reason;
28-
console.log("[Version Skew Handler] Unhandled rejection:", error);
29-
30-
// Check if this is a chunk loading error
31-
if (
32-
!isReloading &&
33-
error instanceof Error &&
34-
(error.message?.includes("Failed to fetch dynamically imported module") ||
35-
error.message?.includes("dynamically imported module") ||
36-
error.message?.includes("Failed to import"))
37-
) {
38-
isReloading = true;
39-
console.warn("[Version Skew Handler] Version skew detected - reloading application", error);
40-
41-
// Force a full page reload
42-
setTimeout(() => {
43-
window.location.reload();
44-
}, 100);
45-
46-
// Prevent the default error handling
47-
event.preventDefault();
48-
}
49-
});
50-
51-
// Override window.onerror to catch synchronous errors
52-
const originalOnError = window.onerror;
53-
window.onerror = function (message, source, lineno, colno, error) {
54-
console.log("[Version Skew Handler] Window error:", { message, source, error });
55-
56-
if (
57-
!isReloading &&
58-
typeof message === "string" &&
59-
(message.includes("Failed to fetch dynamically imported module") ||
60-
message.includes("dynamically imported module") ||
61-
message.includes("Failed to import"))
62-
) {
63-
isReloading = true;
64-
console.warn("[Version Skew Handler] Window error detected as version skew - reloading");
65-
66-
setTimeout(() => {
67-
window.location.reload();
68-
}, 100);
69-
70-
return true; // Prevent default error handling
71-
}
72-
73-
// Call original handler if exists
74-
if (originalOnError) {
75-
return originalOnError.call(this, message, source, lineno, colno, error);
76-
}
77-
return false;
78-
};
6+
// let isReloading = false;
7+
// console.log("[Version Skew Handler] Setting up handlers");
8+
// // Listen for Vite preload errors (chunk loading failures)
9+
// window.addEventListener("vite:preloadError", (event: Event) => {
10+
// console.log("[Version Skew Handler] vite:preloadError event:", event);
11+
// if (!isReloading) {
12+
// isReloading = true;
13+
// console.warn("[Version Skew Handler] Vite preload error detected - reloading application");
14+
// // Small delay to ensure the error is logged
15+
// setTimeout(() => {
16+
// window.location.reload();
17+
// }, 100);
18+
// }
19+
// });
20+
// // Handle unhandled promise rejections from dynamic imports
21+
// window.addEventListener("unhandledrejection", (event: PromiseRejectionEvent) => {
22+
// const error = event.reason;
23+
// console.log("[Version Skew Handler] Unhandled rejection:", error);
24+
// // Check if this is a chunk loading error
25+
// if (
26+
// !isReloading &&
27+
// error instanceof Error &&
28+
// (error.message?.includes("Failed to fetch dynamically imported module") ||
29+
// error.message?.includes("dynamically imported module") ||
30+
// error.message?.includes("Failed to import"))
31+
// ) {
32+
// isReloading = true;
33+
// console.warn("[Version Skew Handler] Version skew detected - reloading application", error);
34+
// // Force a full page reload
35+
// setTimeout(() => {
36+
// window.location.reload();
37+
// }, 100);
38+
// // Prevent the default error handling
39+
// event.preventDefault();
40+
// }
41+
// });
42+
// // Override window.onerror to catch synchronous errors
43+
// const originalOnError = window.onerror;
44+
// window.onerror = function (message, source, lineno, colno, error) {
45+
// console.log("[Version Skew Handler] Window error:", { message, source, error });
46+
// if (
47+
// !isReloading &&
48+
// typeof message === "string" &&
49+
// (message.includes("Failed to fetch dynamically imported module") ||
50+
// message.includes("dynamically imported module") ||
51+
// message.includes("Failed to import"))
52+
// ) {
53+
// isReloading = true;
54+
// console.warn("[Version Skew Handler] Window error detected as version skew - reloading");
55+
// setTimeout(() => {
56+
// window.location.reload();
57+
// }, 100);
58+
// return true; // Prevent default error handling
59+
// }
60+
// // Call original handler if exists
61+
// if (originalOnError) {
62+
// return originalOnError.call(this, message, source, lineno, colno, error);
63+
// }
64+
// return false;
65+
// };
7966
}

0 commit comments

Comments
 (0)