@oxyhq/services 5.5.6 → 5.5.7
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.
- package/lib/commonjs/core/AuthManager.js +29 -3
- package/lib/commonjs/core/AuthManager.js.map +1 -1
- package/lib/commonjs/ui/hooks/useAuthFetch.js +16 -0
- package/lib/commonjs/ui/hooks/useAuthFetch.js.map +1 -1
- package/lib/module/core/AuthManager.js +29 -3
- package/lib/module/core/AuthManager.js.map +1 -1
- package/lib/module/ui/hooks/useAuthFetch.js +16 -0
- package/lib/module/ui/hooks/useAuthFetch.js.map +1 -1
- package/lib/typescript/core/AuthManager.d.ts.map +1 -1
- package/lib/typescript/ui/hooks/useAuthFetch.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/core/AuthManager.ts +26 -3
- package/src/ui/hooks/useAuthFetch.ts +20 -0
|
@@ -40,22 +40,46 @@ class AuthManager {
|
|
|
40
40
|
* This is the ONLY method that should be used to get tokens
|
|
41
41
|
*/
|
|
42
42
|
async getAccessToken() {
|
|
43
|
+
console.log('[AuthManager] getAccessToken called');
|
|
44
|
+
console.log('[AuthManager] Current state:', {
|
|
45
|
+
isAuthenticated: this.currentState.isAuthenticated,
|
|
46
|
+
activeSessionId: this.currentState.activeSessionId,
|
|
47
|
+
hasUser: !!this.currentState.user,
|
|
48
|
+
cachedToken: !!this.currentState.accessToken
|
|
49
|
+
});
|
|
43
50
|
try {
|
|
44
|
-
// If we
|
|
51
|
+
// If we have a cached token in state, return it
|
|
52
|
+
if (this.currentState.accessToken) {
|
|
53
|
+
console.log('[AuthManager] Returning cached token from state');
|
|
54
|
+
return this.currentState.accessToken;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
// If we already have a valid JWT token in service, return it
|
|
45
58
|
let token = this.oxyServices.getAccessToken();
|
|
46
59
|
if (token) {
|
|
60
|
+
console.log('[AuthManager] Found token in OxyServices');
|
|
61
|
+
// Cache it in our state for consistency
|
|
62
|
+
this.updateState({
|
|
63
|
+
accessToken: token
|
|
64
|
+
});
|
|
47
65
|
return token;
|
|
48
66
|
}
|
|
49
67
|
|
|
50
68
|
// If we have an active session, get token from session
|
|
51
69
|
if (this.currentState.activeSessionId) {
|
|
70
|
+
console.log('[AuthManager] Getting token from session:', this.currentState.activeSessionId);
|
|
52
71
|
const tokenData = await this.oxyServices.getTokenBySession(this.currentState.activeSessionId);
|
|
53
72
|
token = tokenData.accessToken;
|
|
54
73
|
|
|
55
|
-
// Cache it
|
|
74
|
+
// Cache it both in service and state
|
|
56
75
|
this.oxyServices.setTokens(token, '');
|
|
76
|
+
this.updateState({
|
|
77
|
+
accessToken: token
|
|
78
|
+
});
|
|
79
|
+
console.log('[AuthManager] Successfully retrieved and cached token from session');
|
|
57
80
|
return token;
|
|
58
81
|
}
|
|
82
|
+
console.warn('[AuthManager] No way to get access token - not authenticated or no session');
|
|
59
83
|
return null;
|
|
60
84
|
} catch (error) {
|
|
61
85
|
console.error('[AuthManager] Failed to get access token:', error);
|
|
@@ -217,7 +241,9 @@ class AuthManager {
|
|
|
217
241
|
* Check if user is authenticated
|
|
218
242
|
*/
|
|
219
243
|
isAuthenticated() {
|
|
220
|
-
|
|
244
|
+
const result = this.currentState.isAuthenticated;
|
|
245
|
+
console.log('[AuthManager] isAuthenticated check:', result);
|
|
246
|
+
return result;
|
|
221
247
|
}
|
|
222
248
|
|
|
223
249
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["AuthManager","currentState","isAuthenticated","accessToken","user","activeSessionId","sessions","isLoading","error","constructor","config","oxyServices","onStateChange","getState","getAccessToken","token","tokenData","getTokenBySession","setTokens","
|
|
1
|
+
{"version":3,"names":["AuthManager","currentState","isAuthenticated","accessToken","user","activeSessionId","sessions","isLoading","error","constructor","config","oxyServices","onStateChange","getState","getAccessToken","console","log","hasUser","cachedToken","token","updateState","tokenData","getTokenBySession","setTokens","warn","login","username","password","deviceName","response","secureLogin","sessionId","getUserBySession","getSessionsBySessionId","message","signUp","email","logout","targetSessionId","sessionToLogout","logoutSecureSession","clearAuthState","updatedSessions","filter","s","initialize","validation","validateSession","valid","refreshToken","Error","result","getCurrentUser","getActiveSessionId","getBaseURL","refreshSessions","getSessions","switchSession","removeSession","logoutAll","logoutAllSecureSessions","updates","exports"],"sourceRoot":"../../../src","sources":["core/AuthManager.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -27,6 +27,10 @@ function useAuthFetch() {
|
|
|
27
27
|
logout,
|
|
28
28
|
signUp
|
|
29
29
|
} = (0, _OxyContext.useOxy)();
|
|
30
|
+
console.log('[useAuthFetch] Hook initialized');
|
|
31
|
+
console.log('[useAuthFetch] authManager:', !!authManager);
|
|
32
|
+
console.log('[useAuthFetch] isAuthenticated:', isAuthenticated);
|
|
33
|
+
console.log('[useAuthFetch] user:', !!user);
|
|
30
34
|
const authFetch = (0, _react.useCallback)(async (input, init) => {
|
|
31
35
|
const url = resolveURL(input, authManager.getBaseURL());
|
|
32
36
|
const options = await addAuthHeaders(init, authManager);
|
|
@@ -121,18 +125,30 @@ function resolveURL(input, baseURL) {
|
|
|
121
125
|
}
|
|
122
126
|
async function addAuthHeaders(init, authManager) {
|
|
123
127
|
const headers = new Headers(init?.headers);
|
|
128
|
+
console.log('[AuthFetch] addAuthHeaders called');
|
|
129
|
+
console.log('[AuthFetch] Has authManager:', !!authManager);
|
|
130
|
+
console.log('[AuthFetch] AuthManager type:', typeof authManager);
|
|
131
|
+
console.log('[AuthFetch] Has Authorization header already:', headers.has('Authorization'));
|
|
124
132
|
if (authManager && !headers.has('Authorization')) {
|
|
125
133
|
try {
|
|
134
|
+
console.log('[AuthFetch] AuthManager.isAuthenticated():', authManager.isAuthenticated());
|
|
126
135
|
const accessToken = await authManager.getAccessToken();
|
|
136
|
+
console.log('[AuthFetch] Got access token:', !!accessToken);
|
|
127
137
|
if (accessToken) {
|
|
128
138
|
headers.set('Authorization', `Bearer ${accessToken}`);
|
|
139
|
+
console.log('[AuthFetch] Added Authorization header successfully');
|
|
129
140
|
} else if (authManager.isAuthenticated()) {
|
|
141
|
+
console.error('[AuthFetch] User is authenticated but no token available');
|
|
130
142
|
throw new Error('Authentication state inconsistent. Please login again.');
|
|
143
|
+
} else {
|
|
144
|
+
console.log('[AuthFetch] User not authenticated, skipping auth header');
|
|
131
145
|
}
|
|
132
146
|
} catch (error) {
|
|
133
147
|
console.error('[AuthFetch] Failed to get access token:', error);
|
|
134
148
|
throw error;
|
|
135
149
|
}
|
|
150
|
+
} else {
|
|
151
|
+
console.log('[AuthFetch] Skipping auth header - authManager:', !!authManager, 'hasAuthHeader:', headers.has('Authorization'));
|
|
136
152
|
}
|
|
137
153
|
const body = init?.body;
|
|
138
154
|
const processedBody = body && typeof body === 'object' && !(body instanceof FormData) && !(body instanceof URLSearchParams) ? JSON.stringify(body) : body;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_OxyContext","useAuthFetch","authManager","isAuthenticated","user","login","logout","signUp","useOxy","authFetch","useCallback","input","init","url","resolveURL","getBaseURL","options","addAuthHeaders","response","fetch","status","refreshToken","retryOptions","refreshError","
|
|
1
|
+
{"version":3,"names":["_react","require","_OxyContext","useAuthFetch","authManager","isAuthenticated","user","login","logout","signUp","useOxy","console","log","authFetch","useCallback","input","init","url","resolveURL","getBaseURL","options","addAuthHeaders","response","fetch","status","refreshToken","retryOptions","refreshError","warn","Error","error","get","endpoint","method","handleJsonResponse","post","data","headers","body","JSON","stringify","undefined","put","del","fetchWithMethods","delete","baseURL","toString","startsWith","Headers","has","accessToken","getAccessToken","set","processedBody","FormData","URLSearchParams","ok","errorMessage","statusText","errorData","json","message","_default","exports","default"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAuthFetch.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -36,22 +36,46 @@ export class AuthManager {
|
|
|
36
36
|
* This is the ONLY method that should be used to get tokens
|
|
37
37
|
*/
|
|
38
38
|
async getAccessToken() {
|
|
39
|
+
console.log('[AuthManager] getAccessToken called');
|
|
40
|
+
console.log('[AuthManager] Current state:', {
|
|
41
|
+
isAuthenticated: this.currentState.isAuthenticated,
|
|
42
|
+
activeSessionId: this.currentState.activeSessionId,
|
|
43
|
+
hasUser: !!this.currentState.user,
|
|
44
|
+
cachedToken: !!this.currentState.accessToken
|
|
45
|
+
});
|
|
39
46
|
try {
|
|
40
|
-
// If we
|
|
47
|
+
// If we have a cached token in state, return it
|
|
48
|
+
if (this.currentState.accessToken) {
|
|
49
|
+
console.log('[AuthManager] Returning cached token from state');
|
|
50
|
+
return this.currentState.accessToken;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
// If we already have a valid JWT token in service, return it
|
|
41
54
|
let token = this.oxyServices.getAccessToken();
|
|
42
55
|
if (token) {
|
|
56
|
+
console.log('[AuthManager] Found token in OxyServices');
|
|
57
|
+
// Cache it in our state for consistency
|
|
58
|
+
this.updateState({
|
|
59
|
+
accessToken: token
|
|
60
|
+
});
|
|
43
61
|
return token;
|
|
44
62
|
}
|
|
45
63
|
|
|
46
64
|
// If we have an active session, get token from session
|
|
47
65
|
if (this.currentState.activeSessionId) {
|
|
66
|
+
console.log('[AuthManager] Getting token from session:', this.currentState.activeSessionId);
|
|
48
67
|
const tokenData = await this.oxyServices.getTokenBySession(this.currentState.activeSessionId);
|
|
49
68
|
token = tokenData.accessToken;
|
|
50
69
|
|
|
51
|
-
// Cache it
|
|
70
|
+
// Cache it both in service and state
|
|
52
71
|
this.oxyServices.setTokens(token, '');
|
|
72
|
+
this.updateState({
|
|
73
|
+
accessToken: token
|
|
74
|
+
});
|
|
75
|
+
console.log('[AuthManager] Successfully retrieved and cached token from session');
|
|
53
76
|
return token;
|
|
54
77
|
}
|
|
78
|
+
console.warn('[AuthManager] No way to get access token - not authenticated or no session');
|
|
55
79
|
return null;
|
|
56
80
|
} catch (error) {
|
|
57
81
|
console.error('[AuthManager] Failed to get access token:', error);
|
|
@@ -213,7 +237,9 @@ export class AuthManager {
|
|
|
213
237
|
* Check if user is authenticated
|
|
214
238
|
*/
|
|
215
239
|
isAuthenticated() {
|
|
216
|
-
|
|
240
|
+
const result = this.currentState.isAuthenticated;
|
|
241
|
+
console.log('[AuthManager] isAuthenticated check:', result);
|
|
242
|
+
return result;
|
|
217
243
|
}
|
|
218
244
|
|
|
219
245
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["AuthManager","currentState","isAuthenticated","accessToken","user","activeSessionId","sessions","isLoading","error","constructor","config","oxyServices","onStateChange","getState","getAccessToken","token","tokenData","getTokenBySession","setTokens","
|
|
1
|
+
{"version":3,"names":["AuthManager","currentState","isAuthenticated","accessToken","user","activeSessionId","sessions","isLoading","error","constructor","config","oxyServices","onStateChange","getState","getAccessToken","console","log","hasUser","cachedToken","token","updateState","tokenData","getTokenBySession","setTokens","warn","login","username","password","deviceName","response","secureLogin","sessionId","getUserBySession","getSessionsBySessionId","message","signUp","email","logout","targetSessionId","sessionToLogout","logoutSecureSession","clearAuthState","updatedSessions","filter","s","initialize","validation","validateSession","valid","refreshToken","Error","result","getCurrentUser","getActiveSessionId","getBaseURL","refreshSessions","getSessions","switchSession","removeSession","logoutAll","logoutAllSecureSessions","updates"],"sourceRoot":"../../../src","sources":["core/AuthManager.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -22,6 +22,10 @@ export function useAuthFetch() {
|
|
|
22
22
|
logout,
|
|
23
23
|
signUp
|
|
24
24
|
} = useOxy();
|
|
25
|
+
console.log('[useAuthFetch] Hook initialized');
|
|
26
|
+
console.log('[useAuthFetch] authManager:', !!authManager);
|
|
27
|
+
console.log('[useAuthFetch] isAuthenticated:', isAuthenticated);
|
|
28
|
+
console.log('[useAuthFetch] user:', !!user);
|
|
25
29
|
const authFetch = useCallback(async (input, init) => {
|
|
26
30
|
const url = resolveURL(input, authManager.getBaseURL());
|
|
27
31
|
const options = await addAuthHeaders(init, authManager);
|
|
@@ -116,18 +120,30 @@ function resolveURL(input, baseURL) {
|
|
|
116
120
|
}
|
|
117
121
|
async function addAuthHeaders(init, authManager) {
|
|
118
122
|
const headers = new Headers(init?.headers);
|
|
123
|
+
console.log('[AuthFetch] addAuthHeaders called');
|
|
124
|
+
console.log('[AuthFetch] Has authManager:', !!authManager);
|
|
125
|
+
console.log('[AuthFetch] AuthManager type:', typeof authManager);
|
|
126
|
+
console.log('[AuthFetch] Has Authorization header already:', headers.has('Authorization'));
|
|
119
127
|
if (authManager && !headers.has('Authorization')) {
|
|
120
128
|
try {
|
|
129
|
+
console.log('[AuthFetch] AuthManager.isAuthenticated():', authManager.isAuthenticated());
|
|
121
130
|
const accessToken = await authManager.getAccessToken();
|
|
131
|
+
console.log('[AuthFetch] Got access token:', !!accessToken);
|
|
122
132
|
if (accessToken) {
|
|
123
133
|
headers.set('Authorization', `Bearer ${accessToken}`);
|
|
134
|
+
console.log('[AuthFetch] Added Authorization header successfully');
|
|
124
135
|
} else if (authManager.isAuthenticated()) {
|
|
136
|
+
console.error('[AuthFetch] User is authenticated but no token available');
|
|
125
137
|
throw new Error('Authentication state inconsistent. Please login again.');
|
|
138
|
+
} else {
|
|
139
|
+
console.log('[AuthFetch] User not authenticated, skipping auth header');
|
|
126
140
|
}
|
|
127
141
|
} catch (error) {
|
|
128
142
|
console.error('[AuthFetch] Failed to get access token:', error);
|
|
129
143
|
throw error;
|
|
130
144
|
}
|
|
145
|
+
} else {
|
|
146
|
+
console.log('[AuthFetch] Skipping auth header - authManager:', !!authManager, 'hasAuthHeader:', headers.has('Authorization'));
|
|
131
147
|
}
|
|
132
148
|
const body = init?.body;
|
|
133
149
|
const processedBody = body && typeof body === 'object' && !(body instanceof FormData) && !(body instanceof URLSearchParams) ? JSON.stringify(body) : body;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useOxy","useAuthFetch","authManager","isAuthenticated","user","login","logout","signUp","authFetch","input","init","url","resolveURL","getBaseURL","options","addAuthHeaders","response","fetch","status","refreshToken","retryOptions","refreshError","
|
|
1
|
+
{"version":3,"names":["useCallback","useOxy","useAuthFetch","authManager","isAuthenticated","user","login","logout","signUp","console","log","authFetch","input","init","url","resolveURL","getBaseURL","options","addAuthHeaders","response","fetch","status","refreshToken","retryOptions","refreshError","warn","Error","error","get","endpoint","method","handleJsonResponse","post","data","headers","body","JSON","stringify","undefined","put","del","fetchWithMethods","delete","baseURL","toString","startsWith","Headers","has","accessToken","getAccessToken","set","processedBody","FormData","URLSearchParams","ok","errorMessage","statusText","errorData","json","message"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAuthFetch.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthManager.d.ts","sourceRoot":"","sources":["../../../src/core/AuthManager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,MAAM,WAAW,SAAS;IACxB,eAAe,EAAE,OAAO,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,IAAI,EAAE,GAAG,GAAG,IAAI,CAAC;IACjB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,EAAE,GAAG,EAAE,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC;CAC5C;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,aAAa,CAAC,CAA6B;IACnD,OAAO,CAAC,YAAY,CAQlB;gBAEU,MAAM,EAAE,UAAU;IAK9B;;OAEG;IACH,QAAQ,IAAI,SAAS;IAIrB;;;OAGG;IACG,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"AuthManager.d.ts","sourceRoot":"","sources":["../../../src/core/AuthManager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,MAAM,WAAW,SAAS;IACxB,eAAe,EAAE,OAAO,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,IAAI,EAAE,GAAG,GAAG,IAAI,CAAC;IACjB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,EAAE,GAAG,EAAE,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC;CAC5C;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,aAAa,CAAC,CAA6B;IACnD,OAAO,CAAC,YAAY,CAQlB;gBAEU,MAAM,EAAE,UAAU;IAK9B;;OAEG;IACH,QAAQ,IAAI,SAAS;IAIrB;;;OAGG;IACG,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA8C9C;;OAEG;IACG,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmCnF;;OAEG;IACG,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB9E;;OAEG;IACG,MAAM,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BrD;;OAEG;IACG,UAAU,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IA0C/D;;OAEG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBnC;;OAEG;IACH,eAAe,IAAI,OAAO;IAM1B;;OAEG;IACH,cAAc,IAAI,GAAG,GAAG,IAAI;IAI5B;;OAEG;IACH,kBAAkB,IAAI,MAAM,GAAG,IAAI;IAInC;;OAEG;IACH,UAAU,IAAI,MAAM;IAIpB;;OAEG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWtC;;OAEG;IACH,WAAW,IAAI,GAAG,EAAE;IAIpB;;OAEG;IACG,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BrD;;OAEG;IACG,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrD;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAchC;;OAEG;IACH,OAAO,CAAC,cAAc;IActB;;OAEG;IACH,OAAO,CAAC,WAAW;CAOpB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAuthFetch.d.ts","sourceRoot":"","sources":["../../../../src/ui/hooks/useAuthFetch.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,MAAM,WAAW,gBAAiB,SAAQ,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC;IACjE,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,MAAM,WAAW,YAAY;IAC3B,CAAC,KAAK,EAAE,WAAW,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvE,GAAG,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACpE,IAAI,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,gBAAgB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACjF,GAAG,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,gBAAgB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAChF,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACvE,eAAe,EAAE,OAAO,CAAC;IACzB,IAAI,EAAE,GAAG,CAAC;IACV,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5D,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CAC7E;AAED;;;GAGG;AACH,wBAAgB,YAAY,IAAI,YAAY,
|
|
1
|
+
{"version":3,"file":"useAuthFetch.d.ts","sourceRoot":"","sources":["../../../../src/ui/hooks/useAuthFetch.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,MAAM,WAAW,gBAAiB,SAAQ,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC;IACjE,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,MAAM,WAAW,YAAY;IAC3B,CAAC,KAAK,EAAE,WAAW,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvE,GAAG,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACpE,IAAI,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,gBAAgB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACjF,GAAG,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,gBAAgB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAChF,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACvE,eAAe,EAAE,OAAO,CAAC;IACzB,IAAI,EAAE,GAAG,CAAC;IACV,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5D,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CAC7E;AAED;;;GAGG;AACH,wBAAgB,YAAY,IAAI,YAAY,CAoF3C;AAwFD,eAAe,YAAY,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oxyhq/services",
|
|
3
|
-
"version": "5.5.
|
|
3
|
+
"version": "5.5.7",
|
|
4
4
|
"description": "Reusable OxyHQ module to handle authentication, user management, karma system, device-based session management and more 🚀",
|
|
5
5
|
"main": "lib/commonjs/node/index.js",
|
|
6
6
|
"module": "lib/module/node/index.js",
|
package/src/core/AuthManager.ts
CHANGED
|
@@ -52,23 +52,44 @@ export class AuthManager {
|
|
|
52
52
|
* This is the ONLY method that should be used to get tokens
|
|
53
53
|
*/
|
|
54
54
|
async getAccessToken(): Promise<string | null> {
|
|
55
|
+
console.log('[AuthManager] getAccessToken called');
|
|
56
|
+
console.log('[AuthManager] Current state:', {
|
|
57
|
+
isAuthenticated: this.currentState.isAuthenticated,
|
|
58
|
+
activeSessionId: this.currentState.activeSessionId,
|
|
59
|
+
hasUser: !!this.currentState.user,
|
|
60
|
+
cachedToken: !!this.currentState.accessToken
|
|
61
|
+
});
|
|
62
|
+
|
|
55
63
|
try {
|
|
56
|
-
// If we
|
|
64
|
+
// If we have a cached token in state, return it
|
|
65
|
+
if (this.currentState.accessToken) {
|
|
66
|
+
console.log('[AuthManager] Returning cached token from state');
|
|
67
|
+
return this.currentState.accessToken;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
// If we already have a valid JWT token in service, return it
|
|
57
71
|
let token = this.oxyServices.getAccessToken();
|
|
58
72
|
if (token) {
|
|
73
|
+
console.log('[AuthManager] Found token in OxyServices');
|
|
74
|
+
// Cache it in our state for consistency
|
|
75
|
+
this.updateState({ accessToken: token });
|
|
59
76
|
return token;
|
|
60
77
|
}
|
|
61
78
|
|
|
62
79
|
// If we have an active session, get token from session
|
|
63
80
|
if (this.currentState.activeSessionId) {
|
|
81
|
+
console.log('[AuthManager] Getting token from session:', this.currentState.activeSessionId);
|
|
64
82
|
const tokenData = await this.oxyServices.getTokenBySession(this.currentState.activeSessionId);
|
|
65
83
|
token = tokenData.accessToken;
|
|
66
84
|
|
|
67
|
-
// Cache it
|
|
85
|
+
// Cache it both in service and state
|
|
68
86
|
this.oxyServices.setTokens(token, '');
|
|
87
|
+
this.updateState({ accessToken: token });
|
|
88
|
+
console.log('[AuthManager] Successfully retrieved and cached token from session');
|
|
69
89
|
return token;
|
|
70
90
|
}
|
|
71
91
|
|
|
92
|
+
console.warn('[AuthManager] No way to get access token - not authenticated or no session');
|
|
72
93
|
return null;
|
|
73
94
|
} catch (error) {
|
|
74
95
|
console.error('[AuthManager] Failed to get access token:', error);
|
|
@@ -235,7 +256,9 @@ export class AuthManager {
|
|
|
235
256
|
* Check if user is authenticated
|
|
236
257
|
*/
|
|
237
258
|
isAuthenticated(): boolean {
|
|
238
|
-
|
|
259
|
+
const result = this.currentState.isAuthenticated;
|
|
260
|
+
console.log('[AuthManager] isAuthenticated check:', result);
|
|
261
|
+
return result;
|
|
239
262
|
}
|
|
240
263
|
|
|
241
264
|
/**
|
|
@@ -31,6 +31,11 @@ export interface AuthFetchAPI {
|
|
|
31
31
|
*/
|
|
32
32
|
export function useAuthFetch(): AuthFetchAPI {
|
|
33
33
|
const { authManager, isAuthenticated, user, login, logout, signUp } = useOxy();
|
|
34
|
+
|
|
35
|
+
console.log('[useAuthFetch] Hook initialized');
|
|
36
|
+
console.log('[useAuthFetch] authManager:', !!authManager);
|
|
37
|
+
console.log('[useAuthFetch] isAuthenticated:', isAuthenticated);
|
|
38
|
+
console.log('[useAuthFetch] user:', !!user);
|
|
34
39
|
|
|
35
40
|
const authFetch = useCallback(async (input: RequestInfo | URL, init?: AuthFetchOptions): Promise<Response> => {
|
|
36
41
|
const url = resolveURL(input, authManager.getBaseURL());
|
|
@@ -131,18 +136,33 @@ function resolveURL(input: RequestInfo | URL, baseURL: string): string {
|
|
|
131
136
|
async function addAuthHeaders(init?: AuthFetchOptions, authManager?: any): Promise<RequestInit> {
|
|
132
137
|
const headers = new Headers(init?.headers);
|
|
133
138
|
|
|
139
|
+
console.log('[AuthFetch] addAuthHeaders called');
|
|
140
|
+
console.log('[AuthFetch] Has authManager:', !!authManager);
|
|
141
|
+
console.log('[AuthFetch] AuthManager type:', typeof authManager);
|
|
142
|
+
console.log('[AuthFetch] Has Authorization header already:', headers.has('Authorization'));
|
|
143
|
+
|
|
134
144
|
if (authManager && !headers.has('Authorization')) {
|
|
135
145
|
try {
|
|
146
|
+
console.log('[AuthFetch] AuthManager.isAuthenticated():', authManager.isAuthenticated());
|
|
147
|
+
|
|
136
148
|
const accessToken = await authManager.getAccessToken();
|
|
149
|
+
console.log('[AuthFetch] Got access token:', !!accessToken);
|
|
150
|
+
|
|
137
151
|
if (accessToken) {
|
|
138
152
|
headers.set('Authorization', `Bearer ${accessToken}`);
|
|
153
|
+
console.log('[AuthFetch] Added Authorization header successfully');
|
|
139
154
|
} else if (authManager.isAuthenticated()) {
|
|
155
|
+
console.error('[AuthFetch] User is authenticated but no token available');
|
|
140
156
|
throw new Error('Authentication state inconsistent. Please login again.');
|
|
157
|
+
} else {
|
|
158
|
+
console.log('[AuthFetch] User not authenticated, skipping auth header');
|
|
141
159
|
}
|
|
142
160
|
} catch (error) {
|
|
143
161
|
console.error('[AuthFetch] Failed to get access token:', error);
|
|
144
162
|
throw error;
|
|
145
163
|
}
|
|
164
|
+
} else {
|
|
165
|
+
console.log('[AuthFetch] Skipping auth header - authManager:', !!authManager, 'hasAuthHeader:', headers.has('Authorization'));
|
|
146
166
|
}
|
|
147
167
|
|
|
148
168
|
const body = init?.body;
|