@sudobility/auth_lib 0.0.41 → 0.0.43
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -3,6 +3,7 @@ import type { NetworkRequestOptions, NetworkResponse } from '@sudobility/types';
|
|
|
3
3
|
export interface FirebaseAuthNetworkServiceOptions {
|
|
4
4
|
onLogout?: () => void;
|
|
5
5
|
onTokenRefreshFailed?: (error: Error) => void;
|
|
6
|
+
tokenRefreshIntervalMs?: number;
|
|
6
7
|
}
|
|
7
8
|
export declare class FirebaseAuthNetworkService extends WebNetworkClient {
|
|
8
9
|
private serviceOptions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FirebaseAuthNetworkService.d.ts","sourceRoot":"","sources":["../../src/network/FirebaseAuthNetworkService.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"FirebaseAuthNetworkService.d.ts","sourceRoot":"","sources":["../../src/network/FirebaseAuthNetworkService.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAOhF,MAAM,WAAW,iCAAiC;IAEhD,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IAEtB,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAE9C,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAoED,qBAAa,0BAA2B,SAAQ,gBAAgB;IAC9D,OAAO,CAAC,cAAc,CAAgD;gBAE1D,OAAO,CAAC,EAAE,iCAAiC;IAUxC,OAAO,CAAC,CAAC,GAAG,OAAO,EAChC,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;CAsE/B"}
|
|
@@ -1,15 +1,35 @@
|
|
|
1
1
|
import { WebNetworkClient } from '@sudobility/di';
|
|
2
2
|
import { signOut } from 'firebase/auth';
|
|
3
3
|
import { getFirebaseAuth } from '../config/firebase-init';
|
|
4
|
-
|
|
4
|
+
const DEFAULT_TOKEN_REFRESH_INTERVAL_MS = 30 * 1000;
|
|
5
|
+
let cachedToken = null;
|
|
6
|
+
let tokenTimestamp = 0;
|
|
7
|
+
async function getAuthToken(forceRefresh = false, refreshIntervalMs = DEFAULT_TOKEN_REFRESH_INTERVAL_MS) {
|
|
5
8
|
const auth = getFirebaseAuth();
|
|
6
9
|
const user = auth?.currentUser;
|
|
7
|
-
if (!user)
|
|
10
|
+
if (!user) {
|
|
11
|
+
console.error('[FirebaseAuthNetworkService] getAuthToken: No current user');
|
|
12
|
+
cachedToken = null;
|
|
13
|
+
tokenTimestamp = 0;
|
|
8
14
|
return '';
|
|
15
|
+
}
|
|
16
|
+
const now = Date.now();
|
|
17
|
+
const tokenAge = now - tokenTimestamp;
|
|
18
|
+
const isStale = tokenAge > refreshIntervalMs;
|
|
19
|
+
if (!forceRefresh && !isStale && cachedToken) {
|
|
20
|
+
return cachedToken;
|
|
21
|
+
}
|
|
9
22
|
try {
|
|
10
|
-
|
|
23
|
+
const shouldForceRefresh = forceRefresh || isStale;
|
|
24
|
+
const token = await user.getIdToken(shouldForceRefresh);
|
|
25
|
+
cachedToken = token;
|
|
26
|
+
tokenTimestamp = now;
|
|
27
|
+
return token;
|
|
11
28
|
}
|
|
12
|
-
catch {
|
|
29
|
+
catch (error) {
|
|
30
|
+
console.error('[FirebaseAuthNetworkService] getAuthToken failed:', error);
|
|
31
|
+
cachedToken = null;
|
|
32
|
+
tokenTimestamp = 0;
|
|
13
33
|
return '';
|
|
14
34
|
}
|
|
15
35
|
}
|
|
@@ -37,24 +57,40 @@ export class FirebaseAuthNetworkService extends WebNetworkClient {
|
|
|
37
57
|
if (error && typeof error === 'object' && 'status' in error) {
|
|
38
58
|
const networkError = error;
|
|
39
59
|
if (networkError.status === 401) {
|
|
60
|
+
console.error('[FirebaseAuthNetworkService] 401 Unauthorized, attempting token refresh');
|
|
40
61
|
const freshToken = await getAuthToken(true);
|
|
41
62
|
if (freshToken) {
|
|
63
|
+
console.error('[FirebaseAuthNetworkService] Token refreshed, retrying request');
|
|
42
64
|
const retryHeaders = {
|
|
43
65
|
...options.headers,
|
|
44
66
|
Authorization: `Bearer ${freshToken}`,
|
|
45
67
|
};
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
68
|
+
try {
|
|
69
|
+
return await super.request(url, {
|
|
70
|
+
...options,
|
|
71
|
+
headers: retryHeaders,
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
catch (retryError) {
|
|
75
|
+
console.error('[FirebaseAuthNetworkService] Retry after token refresh failed:', retryError);
|
|
76
|
+
throw retryError;
|
|
77
|
+
}
|
|
50
78
|
}
|
|
51
79
|
else {
|
|
80
|
+
console.error('[FirebaseAuthNetworkService] Token refresh failed, no fresh token obtained');
|
|
52
81
|
this.serviceOptions?.onTokenRefreshFailed?.(new Error('Failed to refresh token'));
|
|
53
82
|
}
|
|
54
83
|
}
|
|
55
84
|
if (networkError.status === 403) {
|
|
85
|
+
console.error('[FirebaseAuthNetworkService] 403 Forbidden, logging user out');
|
|
56
86
|
await logoutUser(this.serviceOptions?.onLogout);
|
|
57
87
|
}
|
|
88
|
+
if (networkError.status !== 401 && networkError.status !== 403) {
|
|
89
|
+
console.error(`[FirebaseAuthNetworkService] HTTP ${networkError.status}:`, networkError.message);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
console.error('[FirebaseAuthNetworkService] Network error:', error);
|
|
58
94
|
}
|
|
59
95
|
throw error;
|
|
60
96
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FirebaseAuthNetworkService.js","sourceRoot":"","sources":["../../src/network/FirebaseAuthNetworkService.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"FirebaseAuthNetworkService.js","sourceRoot":"","sources":["../../src/network/FirebaseAuthNetworkService.ts"],"names":[],"mappings":"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"}
|