Skip to content

Commit d55858b

Browse files
committed
fix auth with api client
1 parent e35c475 commit d55858b

File tree

1 file changed

+45
-11
lines changed

1 file changed

+45
-11
lines changed

public/js/api-client.js

Lines changed: 45 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ export class ApiClient {
1414
// Get JWT token from localStorage
1515
const jwtToken = localStorage.getItem('jwt_token');
1616

17+
// Log token details for debugging (only in development)
18+
if (jwtToken) {
19+
console.log(`JWT Token check: Found token of length ${jwtToken ? jwtToken.length : 0}`);
20+
console.log(`JWT Token value: ${jwtToken === 'null' ? 'literal "null" string' : (jwtToken ? 'valid string' : 'empty')}`);
21+
}
22+
1723
// Validate token to prevent sending 'null' string
1824
if (jwtToken && jwtToken !== 'null' && jwtToken.length > 50) {
1925
return jwtToken;
@@ -22,6 +28,11 @@ export class ApiClient {
2228
// Log only once per session to avoid console spam
2329
if (!ApiClient._tokenWarningLogged) {
2430
console.warn('No valid JWT token available in localStorage');
31+
if (jwtToken) {
32+
console.warn(`Token validation failed: ${jwtToken === 'null' ? 'literal "null" string' : `length ${jwtToken.length} (too short)`}`);
33+
} else {
34+
console.warn('Token is undefined or null');
35+
}
2536
ApiClient._tokenWarningLogged = true;
2637
}
2738

@@ -162,7 +173,10 @@ export class ApiClient {
162173

163174
// Add Authorization header with JWT token if available
164175
if (jwtToken) {
176+
console.log(`API Client: Using JWT token of length ${jwtToken.length} for document history`);
165177
headers['Authorization'] = `Bearer ${jwtToken}`;
178+
} else {
179+
console.warn('API Client: No valid JWT token available for document history request');
166180
}
167181

168182
const response = await fetch(url.toString(), {
@@ -196,7 +210,10 @@ export class ApiClient {
196210

197211
// Add Authorization header with JWT token if available
198212
if (jwtToken) {
213+
console.log(`API Client: Using JWT token of length ${jwtToken.length} for createSubscription`);
199214
headers['Authorization'] = `Bearer ${jwtToken}`;
215+
} else {
216+
console.warn('API Client: No valid JWT token available for createSubscription request');
200217
}
201218

202219
const response = await fetch(`${this.baseUrl}/subscription`, {
@@ -261,8 +278,10 @@ export class ApiClient {
261278

262279
// Add Authorization header with JWT token if available
263280
if (jwtToken) {
264-
console.log(`API Client: Using JWT token of length ${jwtToken.length}`);
281+
console.log(`API Client: Using JWT token of length ${jwtToken.length} for binary request`);
265282
headers['Authorization'] = `Bearer ${jwtToken}`;
283+
} else {
284+
console.warn('API Client: No valid JWT token available for binary request');
266285
}
267286

268287
const response = await fetch(url, {
@@ -287,16 +306,19 @@ export class ApiClient {
287306
* @private
288307
*/
289308
static async fetchJsonResponse(url, body) {
290-
// Get JWT token from localStorage
291-
const jwtToken = localStorage.getItem('jwt_token');
309+
// Get a valid JWT token using our helper method
310+
const jwtToken = ApiClient._getValidJwtToken();
292311

293312
const headers = {
294313
'Content-Type': 'application/json',
295314
};
296315

297316
// Add Authorization header with JWT token if available
298317
if (jwtToken) {
318+
console.log(`API Client: Using JWT token of length ${jwtToken.length} for JSON request`);
299319
headers['Authorization'] = `Bearer ${jwtToken}`;
320+
} else {
321+
console.warn('API Client: No valid JWT token available for JSON request');
300322
}
301323

302324
const response = await fetch(url, {
@@ -344,12 +366,15 @@ export class ApiClient {
344366
'Accept': 'application/json',
345367
};
346368

347-
// Get JWT token from localStorage
348-
const jwtToken = localStorage.getItem('jwt_token');
369+
// Get a valid JWT token using our helper method
370+
const jwtToken = ApiClient._getValidJwtToken();
349371

350372
// Add Authorization header with JWT token if available
351373
if (jwtToken) {
374+
console.log(`API Client: Using JWT token of length ${jwtToken.length} for getApiKeys`);
352375
headers['Authorization'] = `Bearer ${jwtToken}`;
376+
} else {
377+
console.warn('API Client: No valid JWT token available for getApiKeys request');
353378
}
354379

355380
const response = await fetch(url, {
@@ -378,12 +403,15 @@ export class ApiClient {
378403
'Accept': 'application/json',
379404
};
380405

381-
// Get JWT token from localStorage
382-
const jwtToken = localStorage.getItem('jwt_token');
406+
// Get a valid JWT token using our helper method
407+
const jwtToken = ApiClient._getValidJwtToken();
383408

384409
// Add Authorization header with JWT token if available
385410
if (jwtToken) {
411+
console.log(`API Client: Using JWT token of length ${jwtToken.length} for createApiKey`);
386412
headers['Authorization'] = `Bearer ${jwtToken}`;
413+
} else {
414+
console.warn('API Client: No valid JWT token available for createApiKey request');
387415
}
388416

389417
const response = await fetch(url, {
@@ -414,12 +442,15 @@ export class ApiClient {
414442
'Accept': 'application/json',
415443
};
416444

417-
// Get JWT token from localStorage
418-
const jwtToken = localStorage.getItem('jwt_token');
445+
// Get a valid JWT token using our helper method
446+
const jwtToken = ApiClient._getValidJwtToken();
419447

420448
// Add Authorization header with JWT token if available
421449
if (jwtToken) {
450+
console.log(`API Client: Using JWT token of length ${jwtToken.length} for updateApiKey`);
422451
headers['Authorization'] = `Bearer ${jwtToken}`;
452+
} else {
453+
console.warn('API Client: No valid JWT token available for updateApiKey request');
423454
}
424455

425456
const response = await fetch(url, {
@@ -448,12 +479,15 @@ export class ApiClient {
448479
'Accept': 'application/json',
449480
};
450481

451-
// Get JWT token from localStorage
452-
const jwtToken = localStorage.getItem('jwt_token');
482+
// Get a valid JWT token using our helper method
483+
const jwtToken = ApiClient._getValidJwtToken();
453484

454485
// Add Authorization header with JWT token if available
455486
if (jwtToken) {
487+
console.log(`API Client: Using JWT token of length ${jwtToken.length} for deleteApiKey`);
456488
headers['Authorization'] = `Bearer ${jwtToken}`;
489+
} else {
490+
console.warn('API Client: No valid JWT token available for deleteApiKey request');
457491
}
458492

459493
const response = await fetch(url, {

0 commit comments

Comments
 (0)