@oxyhq/services 5.20.2 → 5.20.3
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/mixins/OxyServices.popup.js +40 -1
- package/lib/commonjs/core/mixins/OxyServices.popup.js.map +1 -1
- package/lib/commonjs/ui/context/OxyContext.js +23 -1
- package/lib/commonjs/ui/context/OxyContext.js.map +1 -1
- package/lib/commonjs/ui/hooks/useAuth.js +10 -19
- package/lib/commonjs/ui/hooks/useAuth.js.map +1 -1
- package/lib/module/core/mixins/OxyServices.popup.js +40 -1
- package/lib/module/core/mixins/OxyServices.popup.js.map +1 -1
- package/lib/module/ui/context/OxyContext.js +23 -1
- package/lib/module/ui/context/OxyContext.js.map +1 -1
- package/lib/module/ui/hooks/useAuth.js +10 -19
- package/lib/module/ui/hooks/useAuth.js.map +1 -1
- package/lib/typescript/commonjs/core/mixins/OxyServices.popup.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/context/OxyContext.d.ts +11 -0
- package/lib/typescript/commonjs/ui/context/OxyContext.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/useAuth.d.ts.map +1 -1
- package/lib/typescript/module/core/mixins/OxyServices.popup.d.ts.map +1 -1
- package/lib/typescript/module/ui/context/OxyContext.d.ts +11 -0
- package/lib/typescript/module/ui/context/OxyContext.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/useAuth.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/core/mixins/OxyServices.popup.ts +39 -1
- package/src/ui/context/OxyContext.tsx +25 -0
- package/src/ui/hooks/useAuth.ts +10 -20
|
@@ -94,6 +94,22 @@ function OxyServicesPopupAuthMixin(Base) {
|
|
|
94
94
|
if (session && session.accessToken) {
|
|
95
95
|
this.httpService.setTokens(session.accessToken);
|
|
96
96
|
}
|
|
97
|
+
|
|
98
|
+
// Fetch user data using the session ID
|
|
99
|
+
// The callback page only sends sessionId/accessToken, not user data
|
|
100
|
+
if (session && session.sessionId && !session.user) {
|
|
101
|
+
try {
|
|
102
|
+
const userData = await this.makeRequest('GET', `/api/session/user/${session.sessionId}`, undefined, {
|
|
103
|
+
cache: false
|
|
104
|
+
});
|
|
105
|
+
if (userData) {
|
|
106
|
+
session.user = userData;
|
|
107
|
+
}
|
|
108
|
+
} catch (userError) {
|
|
109
|
+
console.warn('[PopupAuth] Failed to fetch user data:', userError);
|
|
110
|
+
// Continue without user data - caller can fetch separately
|
|
111
|
+
}
|
|
112
|
+
}
|
|
97
113
|
return session;
|
|
98
114
|
} catch (error) {
|
|
99
115
|
throw error;
|
|
@@ -199,8 +215,21 @@ function OxyServicesPopupAuthMixin(Base) {
|
|
|
199
215
|
reject(new _OxyServicesErrors.OxyAuthenticationError('Authentication timeout'));
|
|
200
216
|
}, timeout);
|
|
201
217
|
const messageHandler = event => {
|
|
218
|
+
const authUrl = this.constructor.AUTH_URL;
|
|
219
|
+
|
|
220
|
+
// Log all messages for debugging
|
|
221
|
+
if (event.data && typeof event.data === 'object' && event.data.type) {
|
|
222
|
+
console.log('[PopupAuth] Message received:', {
|
|
223
|
+
origin: event.origin,
|
|
224
|
+
expectedOrigin: authUrl,
|
|
225
|
+
type: event.data.type,
|
|
226
|
+
hasSession: !!event.data.session,
|
|
227
|
+
hasError: !!event.data.error
|
|
228
|
+
});
|
|
229
|
+
}
|
|
230
|
+
|
|
202
231
|
// CRITICAL: Verify origin to prevent XSS attacks
|
|
203
|
-
if (event.origin !==
|
|
232
|
+
if (event.origin !== authUrl) {
|
|
204
233
|
return;
|
|
205
234
|
}
|
|
206
235
|
const {
|
|
@@ -212,19 +241,29 @@ function OxyServicesPopupAuthMixin(Base) {
|
|
|
212
241
|
if (type !== 'oxy_auth_response') {
|
|
213
242
|
return;
|
|
214
243
|
}
|
|
244
|
+
console.log('[PopupAuth] Valid auth response:', {
|
|
245
|
+
state,
|
|
246
|
+
expectedState,
|
|
247
|
+
hasSession: !!session,
|
|
248
|
+
error
|
|
249
|
+
});
|
|
215
250
|
|
|
216
251
|
// Verify state parameter to prevent CSRF attacks
|
|
217
252
|
if (state !== expectedState) {
|
|
218
253
|
cleanup();
|
|
254
|
+
console.error('[PopupAuth] State mismatch');
|
|
219
255
|
reject(new _OxyServicesErrors.OxyAuthenticationError('Invalid state parameter. Possible CSRF attack.'));
|
|
220
256
|
return;
|
|
221
257
|
}
|
|
222
258
|
cleanup();
|
|
223
259
|
if (error) {
|
|
260
|
+
console.error('[PopupAuth] Auth error:', error);
|
|
224
261
|
reject(new _OxyServicesErrors.OxyAuthenticationError(error));
|
|
225
262
|
} else if (session) {
|
|
263
|
+
console.log('[PopupAuth] Session received successfully');
|
|
226
264
|
resolve(session);
|
|
227
265
|
} else {
|
|
266
|
+
console.error('[PopupAuth] No session in response');
|
|
228
267
|
reject(new _OxyServicesErrors.OxyAuthenticationError('No session received from authentication server'));
|
|
229
268
|
}
|
|
230
269
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_OxyServicesErrors","require","OxyServicesPopupAuthMixin","Base","constructor","args","AUTH_URL","POPUP_WIDTH","POPUP_HEIGHT","POPUP_TIMEOUT","SILENT_TIMEOUT","signInWithPopup","options","window","OxyAuthenticationError","state","generateState","nonce","generateNonce","storeAuthState","width","height","timeout","mode","authUrl","buildAuthUrl","clientId","location","origin","redirectUri","popup","openCenteredPopup","session","waitForPopupAuth","accessToken","httpService","setTokens","error","clearAuthState","signUpWithPopup","silentSignIn","iframe","document","createElement","style","display","position","border","silentUrl","encodeURIComponent","src","body","appendChild","waitForIframeAuth","removeChild","url","title","left","screenX","outerWidth","top","screenY","outerHeight","features","join","open","expectedState","Promise","resolve","reject","timeoutId","setTimeout","cleanup","messageHandler","event","type","data","pollInterval","setInterval","closed","clearTimeout","clearInterval","removeEventListener","close","addEventListener","expectedOrigin","params","URL","searchParams","set","toString","crypto","randomUUID","Date","now","Math","random","substring","sessionStorage","setItem","JSON","stringify","timestamp","removeItem"],"sourceRoot":"../../../../src","sources":["core/mixins/OxyServices.popup.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_OxyServicesErrors","require","OxyServicesPopupAuthMixin","Base","constructor","args","AUTH_URL","POPUP_WIDTH","POPUP_HEIGHT","POPUP_TIMEOUT","SILENT_TIMEOUT","signInWithPopup","options","window","OxyAuthenticationError","state","generateState","nonce","generateNonce","storeAuthState","width","height","timeout","mode","authUrl","buildAuthUrl","clientId","location","origin","redirectUri","popup","openCenteredPopup","session","waitForPopupAuth","accessToken","httpService","setTokens","sessionId","user","userData","makeRequest","undefined","cache","userError","console","warn","error","clearAuthState","signUpWithPopup","silentSignIn","iframe","document","createElement","style","display","position","border","silentUrl","encodeURIComponent","src","body","appendChild","waitForIframeAuth","removeChild","url","title","left","screenX","outerWidth","top","screenY","outerHeight","features","join","open","expectedState","Promise","resolve","reject","timeoutId","setTimeout","cleanup","messageHandler","event","data","type","log","expectedOrigin","hasSession","hasError","pollInterval","setInterval","closed","clearTimeout","clearInterval","removeEventListener","close","addEventListener","params","URL","searchParams","set","toString","crypto","randomUUID","Date","now","Math","random","substring","sessionStorage","setItem","JSON","stringify","timestamp","removeItem"],"sourceRoot":"../../../../src","sources":["core/mixins/OxyServices.popup.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -325,10 +325,26 @@ const OxyProvider = ({
|
|
|
325
325
|
}, [restoreSessionsFromStorage, storage]);
|
|
326
326
|
|
|
327
327
|
// Web SSO: Automatically check for cross-domain session on web platforms
|
|
328
|
+
// Also used for popup auth - updates all state and persists session
|
|
328
329
|
const handleWebSSOSession = (0, _react.useCallback)(async session => {
|
|
329
330
|
if (!session?.user || !session?.sessionId) {
|
|
331
|
+
if (__DEV__) {
|
|
332
|
+
_loggerUtils.logger.warn('handleWebSSOSession called with invalid session', {
|
|
333
|
+
component: 'OxyContext'
|
|
334
|
+
}, {
|
|
335
|
+
session
|
|
336
|
+
});
|
|
337
|
+
}
|
|
330
338
|
return;
|
|
331
339
|
}
|
|
340
|
+
if (__DEV__) {
|
|
341
|
+
_loggerUtils.logger.debug('handleWebSSOSession: Updating auth state', {
|
|
342
|
+
component: 'OxyContext'
|
|
343
|
+
}, {
|
|
344
|
+
sessionId: session.sessionId,
|
|
345
|
+
userId: session.user?.id
|
|
346
|
+
});
|
|
347
|
+
}
|
|
332
348
|
|
|
333
349
|
// Update sessions state
|
|
334
350
|
const clientSession = {
|
|
@@ -355,6 +371,11 @@ const OxyProvider = ({
|
|
|
355
371
|
sessionIds.push(session.sessionId);
|
|
356
372
|
await storage.setItem(storageKeys.sessionIds, JSON.stringify(sessionIds));
|
|
357
373
|
}
|
|
374
|
+
if (__DEV__) {
|
|
375
|
+
_loggerUtils.logger.debug('handleWebSSOSession: Session persisted to storage', {
|
|
376
|
+
component: 'OxyContext'
|
|
377
|
+
});
|
|
378
|
+
}
|
|
358
379
|
}
|
|
359
380
|
}, [updateSessions, setActiveSessionId, loginSuccess, onAuthStateChange, storage, storageKeys]);
|
|
360
381
|
|
|
@@ -458,6 +479,7 @@ const OxyProvider = ({
|
|
|
458
479
|
hasIdentity,
|
|
459
480
|
getPublicKey,
|
|
460
481
|
signIn,
|
|
482
|
+
handlePopupSession: handleWebSSOSession,
|
|
461
483
|
logout,
|
|
462
484
|
logoutAll,
|
|
463
485
|
switchSession: switchSessionForContext,
|
|
@@ -473,7 +495,7 @@ const OxyProvider = ({
|
|
|
473
495
|
useFollow: useFollowHook,
|
|
474
496
|
showBottomSheet: showBottomSheetForContext,
|
|
475
497
|
openAvatarPicker
|
|
476
|
-
}), [activeSessionId, signIn, currentLanguage, currentLanguageMetadata, currentLanguageName, currentNativeLanguageName, error, getDeviceSessions, getPublicKey, hasIdentity, isAuthenticated, isLoading, logout, logoutAll, logoutAllDeviceSessions, oxyServices, refreshSessionsWithUser, sessions, setLanguage, storage, switchSessionForContext, tokenReady, updateDeviceName, clearAllAccountData, useFollowHook, user, showBottomSheetForContext, openAvatarPicker]);
|
|
498
|
+
}), [activeSessionId, signIn, handleWebSSOSession, currentLanguage, currentLanguageMetadata, currentLanguageName, currentNativeLanguageName, error, getDeviceSessions, getPublicKey, hasIdentity, isAuthenticated, isLoading, logout, logoutAll, logoutAllDeviceSessions, oxyServices, refreshSessionsWithUser, sessions, setLanguage, storage, switchSessionForContext, tokenReady, updateDeviceName, clearAllAccountData, useFollowHook, user, showBottomSheetForContext, openAvatarPicker]);
|
|
477
499
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)(OxyContext.Provider, {
|
|
478
500
|
value: contextValue,
|
|
479
501
|
children: children
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_index","_keyManager","_sonner","_authStore","_shallow","_useSessionSocket","_useLanguageManagement","_useSessionManagement","_useAuthOperations","_useDeviceManagement","_storageHelpers","_errorHandlers","_bottomSheetManager","_reactQuery","_queryClient","_index2","_avatarUtils","_accountStore","_loggerUtils","_useWebSSO","_jsxRuntime","OxyContext","createContext","cachedUseFollowHook","loadUseFollowHook","useFollow","error","__DEV__","loggerUtil","warn","component","method","fallback","Error","OxyProvider","children","oxyServices","providedOxyServices","baseURL","authWebUrl","authRedirectUri","storageKeyPrefix","onAuthStateChange","onError","oxyServicesRef","useRef","current","OxyServices","user","isAuthenticated","isLoading","loginSuccess","loginFailure","logoutStore","useAuthStore","useShallow","state","logout","tokenReady","setTokenReady","useState","initializedRef","setAuthState","setState","logger","useCallback","message","err","console","storageKeys","useMemo","getStorageKeys","storageRef","storage","setStorage","useEffect","mounted","createPlatformStorage","then","storageInstance","catch","code","status","currentLanguage","metadata","currentLanguageMetadata","languageName","currentLanguageName","nativeLanguageName","currentNativeLanguageName","setLanguage","applyLanguagePreference","useLanguageManagement","languageKey","language","queryClient","useQueryClient","sessions","activeSessionId","setActiveSessionId","updateSessions","switchSession","refreshSessions","clearSessionState","saveActiveSessionId","trackRemovedSession","useSessionManagement","setAuthError","signIn","logoutAll","useAuthOperations","clearAllAccountData","clear","clearQueryCache","useAccountStore","getState","reset","clearCache","getDeviceSessions","logoutAllDeviceSessions","updateDeviceName","useDeviceManagement","useFollowHook","restoreSessionsFromStorage","storedSessionIdsJson","getItem","sessionIds","storedSessionIds","JSON","parse","storedActiveSessionId","validSessions","length","sessionId","validation","validateSession","useHeaderValidation","valid","now","Date","push","deviceId","expiresAt","getTime","toISOString","lastActive","userId","id","toString","isCurrent","validationError","isInvalidSessionError","isTimeoutOrNetworkError","debug","merge","switchError","removeItem","filter","session","String","handleWebSSOSession","clientSession","setItem","existingIds","includes","stringify","shouldTryWebSSO","isWebBrowser","useWebSSO","onSessionFound","enabled","activeSession","find","undefined","currentDeviceId","refreshSessionsWithUser","handleSessionRemoved","handleRemoteSignOut","toast","info","remoteError","useSessionSocket","getBaseURL","onRemoteSignOut","onSessionRemoved","switchSessionForContext","hasIdentity","KeyManager","getPublicKey","showBottomSheetForContext","screenOrConfig","globalShowBottomSheet","openAvatarPicker","screen","props","selectMode","multiSelect","disabledMimeTypes","afterSelect","onSelect","file","contentType","startsWith","translate","updateAvatarVisibility","updateProfileWithAvatar","avatar","success","e","contextValue","isTokenReady","isStorageReady","removeSession","showBottomSheet","jsx","Provider","value","exports","OxyContextProvider","useOxy","context","useContext","_default","default"],"sourceRoot":"../../../../src","sources":["ui/context/OxyContext.tsx"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_react","require","_index","_keyManager","_sonner","_authStore","_shallow","_useSessionSocket","_useLanguageManagement","_useSessionManagement","_useAuthOperations","_useDeviceManagement","_storageHelpers","_errorHandlers","_bottomSheetManager","_reactQuery","_queryClient","_index2","_avatarUtils","_accountStore","_loggerUtils","_useWebSSO","_jsxRuntime","OxyContext","createContext","cachedUseFollowHook","loadUseFollowHook","useFollow","error","__DEV__","loggerUtil","warn","component","method","fallback","Error","OxyProvider","children","oxyServices","providedOxyServices","baseURL","authWebUrl","authRedirectUri","storageKeyPrefix","onAuthStateChange","onError","oxyServicesRef","useRef","current","OxyServices","user","isAuthenticated","isLoading","loginSuccess","loginFailure","logoutStore","useAuthStore","useShallow","state","logout","tokenReady","setTokenReady","useState","initializedRef","setAuthState","setState","logger","useCallback","message","err","console","storageKeys","useMemo","getStorageKeys","storageRef","storage","setStorage","useEffect","mounted","createPlatformStorage","then","storageInstance","catch","code","status","currentLanguage","metadata","currentLanguageMetadata","languageName","currentLanguageName","nativeLanguageName","currentNativeLanguageName","setLanguage","applyLanguagePreference","useLanguageManagement","languageKey","language","queryClient","useQueryClient","sessions","activeSessionId","setActiveSessionId","updateSessions","switchSession","refreshSessions","clearSessionState","saveActiveSessionId","trackRemovedSession","useSessionManagement","setAuthError","signIn","logoutAll","useAuthOperations","clearAllAccountData","clear","clearQueryCache","useAccountStore","getState","reset","clearCache","getDeviceSessions","logoutAllDeviceSessions","updateDeviceName","useDeviceManagement","useFollowHook","restoreSessionsFromStorage","storedSessionIdsJson","getItem","sessionIds","storedSessionIds","JSON","parse","storedActiveSessionId","validSessions","length","sessionId","validation","validateSession","useHeaderValidation","valid","now","Date","push","deviceId","expiresAt","getTime","toISOString","lastActive","userId","id","toString","isCurrent","validationError","isInvalidSessionError","isTimeoutOrNetworkError","debug","merge","switchError","removeItem","filter","session","String","handleWebSSOSession","clientSession","setItem","existingIds","includes","stringify","shouldTryWebSSO","isWebBrowser","useWebSSO","onSessionFound","enabled","activeSession","find","undefined","currentDeviceId","refreshSessionsWithUser","handleSessionRemoved","handleRemoteSignOut","toast","info","remoteError","useSessionSocket","getBaseURL","onRemoteSignOut","onSessionRemoved","switchSessionForContext","hasIdentity","KeyManager","getPublicKey","showBottomSheetForContext","screenOrConfig","globalShowBottomSheet","openAvatarPicker","screen","props","selectMode","multiSelect","disabledMimeTypes","afterSelect","onSelect","file","contentType","startsWith","translate","updateAvatarVisibility","updateProfileWithAvatar","avatar","success","e","contextValue","isTokenReady","isStorageReady","handlePopupSession","removeSession","showBottomSheet","jsx","Provider","value","exports","OxyContextProvider","useOxy","context","useContext","_default","default"],"sourceRoot":"../../../../src","sources":["ui/context/OxyContext.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -55,6 +55,7 @@ function useAuth() {
|
|
|
55
55
|
isTokenReady,
|
|
56
56
|
error,
|
|
57
57
|
signIn: oxySignIn,
|
|
58
|
+
handlePopupSession,
|
|
58
59
|
logout,
|
|
59
60
|
logoutAll,
|
|
60
61
|
refreshSessions,
|
|
@@ -68,36 +69,26 @@ function useAuth() {
|
|
|
68
69
|
// Only auth.oxy.so has local login forms - accounts.oxy.so is a client app
|
|
69
70
|
const isIdentityProvider = (0, _useWebSSO.isWebBrowser)() && window.location.hostname === 'auth.oxy.so';
|
|
70
71
|
|
|
71
|
-
// Web (not on IdP): Use
|
|
72
|
+
// Web (not on IdP): Use popup-based authentication
|
|
73
|
+
// We skip FedCM here because:
|
|
74
|
+
// 1. Silent FedCM already ran on page load (via useWebSSO)
|
|
75
|
+
// 2. If user is clicking "Sign In", they need interactive auth
|
|
76
|
+
// 3. Doing FedCM first loses the "user gesture" needed for popups
|
|
72
77
|
if ((0, _useWebSSO.isWebBrowser)() && !publicKey && !isIdentityProvider) {
|
|
73
|
-
// Try FedCM first (instant if user already signed in at IdP)
|
|
74
|
-
if (oxyServices.isFedCMSupported?.()) {
|
|
75
|
-
try {
|
|
76
|
-
const fedcmSession = await oxyServices.signInWithFedCM?.();
|
|
77
|
-
if (fedcmSession?.user) {
|
|
78
|
-
return fedcmSession.user;
|
|
79
|
-
}
|
|
80
|
-
} catch (fedcmError) {
|
|
81
|
-
// FedCM failed (user not signed in at IdP, cancelled, etc.)
|
|
82
|
-
// Fall through to popup
|
|
83
|
-
console.debug('FedCM failed, falling back to popup:', fedcmError);
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
|
|
87
|
-
// Fallback to popup (opens auth.oxy.so in popup window)
|
|
88
78
|
try {
|
|
89
79
|
const popupSession = await oxyServices.signInWithPopup?.();
|
|
90
80
|
if (popupSession?.user) {
|
|
81
|
+
// Update context state with the session (this updates user, sessions, storage)
|
|
82
|
+
await handlePopupSession(popupSession);
|
|
91
83
|
return popupSession.user;
|
|
92
84
|
}
|
|
85
|
+
throw new Error('Sign-in failed. Please try again.');
|
|
93
86
|
} catch (popupError) {
|
|
94
|
-
// If popup blocked, suggest enabling popups
|
|
95
87
|
if (popupError instanceof Error && popupError.message.includes('blocked')) {
|
|
96
88
|
throw new Error('Popup blocked. Please allow popups for this site.');
|
|
97
89
|
}
|
|
98
90
|
throw popupError;
|
|
99
91
|
}
|
|
100
|
-
throw new Error('Sign-in failed. Please try again.');
|
|
101
92
|
}
|
|
102
93
|
|
|
103
94
|
// Native: Use cryptographic identity
|
|
@@ -131,7 +122,7 @@ function useAuth() {
|
|
|
131
122
|
return new Promise(() => {}); // Never resolves, page will redirect
|
|
132
123
|
}
|
|
133
124
|
throw new Error('No authentication method available');
|
|
134
|
-
}, [oxySignIn, hasIdentity, getPublicKey, showBottomSheet, oxyServices]);
|
|
125
|
+
}, [oxySignIn, hasIdentity, getPublicKey, showBottomSheet, oxyServices, handlePopupSession]);
|
|
135
126
|
const signOut = (0, _react.useCallback)(async () => {
|
|
136
127
|
await logout();
|
|
137
128
|
}, [logout]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_OxyContext","_useWebSSO","useAuth","user","isAuthenticated","isLoading","isTokenReady","error","signIn","oxySignIn","logout","logoutAll","refreshSessions","oxyServices","hasIdentity","getPublicKey","showBottomSheet","useOxy","useCallback","publicKey","isIdentityProvider","isWebBrowser","window","location","hostname","
|
|
1
|
+
{"version":3,"names":["_react","require","_OxyContext","_useWebSSO","useAuth","user","isAuthenticated","isLoading","isTokenReady","error","signIn","oxySignIn","handlePopupSession","logout","logoutAll","refreshSessions","oxyServices","hasIdentity","getPublicKey","showBottomSheet","useOxy","useCallback","publicKey","isIdentityProvider","isWebBrowser","window","location","hostname","popupSession","signInWithPopup","Error","popupError","message","includes","hasExisting","existingKey","Promise","_","reject","loginUrl","href","signOut","signOutAll","refresh","isReady"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAuth.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -90,6 +90,22 @@ export function OxyServicesPopupAuthMixin(Base) {
|
|
|
90
90
|
if (session && session.accessToken) {
|
|
91
91
|
this.httpService.setTokens(session.accessToken);
|
|
92
92
|
}
|
|
93
|
+
|
|
94
|
+
// Fetch user data using the session ID
|
|
95
|
+
// The callback page only sends sessionId/accessToken, not user data
|
|
96
|
+
if (session && session.sessionId && !session.user) {
|
|
97
|
+
try {
|
|
98
|
+
const userData = await this.makeRequest('GET', `/api/session/user/${session.sessionId}`, undefined, {
|
|
99
|
+
cache: false
|
|
100
|
+
});
|
|
101
|
+
if (userData) {
|
|
102
|
+
session.user = userData;
|
|
103
|
+
}
|
|
104
|
+
} catch (userError) {
|
|
105
|
+
console.warn('[PopupAuth] Failed to fetch user data:', userError);
|
|
106
|
+
// Continue without user data - caller can fetch separately
|
|
107
|
+
}
|
|
108
|
+
}
|
|
93
109
|
return session;
|
|
94
110
|
} catch (error) {
|
|
95
111
|
throw error;
|
|
@@ -195,8 +211,21 @@ export function OxyServicesPopupAuthMixin(Base) {
|
|
|
195
211
|
reject(new OxyAuthenticationError('Authentication timeout'));
|
|
196
212
|
}, timeout);
|
|
197
213
|
const messageHandler = event => {
|
|
214
|
+
const authUrl = this.constructor.AUTH_URL;
|
|
215
|
+
|
|
216
|
+
// Log all messages for debugging
|
|
217
|
+
if (event.data && typeof event.data === 'object' && event.data.type) {
|
|
218
|
+
console.log('[PopupAuth] Message received:', {
|
|
219
|
+
origin: event.origin,
|
|
220
|
+
expectedOrigin: authUrl,
|
|
221
|
+
type: event.data.type,
|
|
222
|
+
hasSession: !!event.data.session,
|
|
223
|
+
hasError: !!event.data.error
|
|
224
|
+
});
|
|
225
|
+
}
|
|
226
|
+
|
|
198
227
|
// CRITICAL: Verify origin to prevent XSS attacks
|
|
199
|
-
if (event.origin !==
|
|
228
|
+
if (event.origin !== authUrl) {
|
|
200
229
|
return;
|
|
201
230
|
}
|
|
202
231
|
const {
|
|
@@ -208,19 +237,29 @@ export function OxyServicesPopupAuthMixin(Base) {
|
|
|
208
237
|
if (type !== 'oxy_auth_response') {
|
|
209
238
|
return;
|
|
210
239
|
}
|
|
240
|
+
console.log('[PopupAuth] Valid auth response:', {
|
|
241
|
+
state,
|
|
242
|
+
expectedState,
|
|
243
|
+
hasSession: !!session,
|
|
244
|
+
error
|
|
245
|
+
});
|
|
211
246
|
|
|
212
247
|
// Verify state parameter to prevent CSRF attacks
|
|
213
248
|
if (state !== expectedState) {
|
|
214
249
|
cleanup();
|
|
250
|
+
console.error('[PopupAuth] State mismatch');
|
|
215
251
|
reject(new OxyAuthenticationError('Invalid state parameter. Possible CSRF attack.'));
|
|
216
252
|
return;
|
|
217
253
|
}
|
|
218
254
|
cleanup();
|
|
219
255
|
if (error) {
|
|
256
|
+
console.error('[PopupAuth] Auth error:', error);
|
|
220
257
|
reject(new OxyAuthenticationError(error));
|
|
221
258
|
} else if (session) {
|
|
259
|
+
console.log('[PopupAuth] Session received successfully');
|
|
222
260
|
resolve(session);
|
|
223
261
|
} else {
|
|
262
|
+
console.error('[PopupAuth] No session in response');
|
|
224
263
|
reject(new OxyAuthenticationError('No session received from authentication server'));
|
|
225
264
|
}
|
|
226
265
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["OxyAuthenticationError","OxyServicesPopupAuthMixin","Base","constructor","args","AUTH_URL","POPUP_WIDTH","POPUP_HEIGHT","POPUP_TIMEOUT","SILENT_TIMEOUT","signInWithPopup","options","window","state","generateState","nonce","generateNonce","storeAuthState","width","height","timeout","mode","authUrl","buildAuthUrl","clientId","location","origin","redirectUri","popup","openCenteredPopup","session","waitForPopupAuth","accessToken","httpService","setTokens","error","clearAuthState","signUpWithPopup","silentSignIn","iframe","document","createElement","style","display","position","border","silentUrl","encodeURIComponent","src","body","appendChild","waitForIframeAuth","removeChild","url","title","left","screenX","outerWidth","top","screenY","outerHeight","features","join","open","expectedState","Promise","resolve","reject","timeoutId","setTimeout","cleanup","messageHandler","event","type","data","pollInterval","setInterval","closed","clearTimeout","clearInterval","removeEventListener","close","addEventListener","expectedOrigin","params","URL","searchParams","set","toString","crypto","randomUUID","Date","now","Math","random","substring","sessionStorage","setItem","JSON","stringify","timestamp","removeItem","PopupAuthMixin"],"sourceRoot":"../../../../src","sources":["core/mixins/OxyServices.popup.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["OxyAuthenticationError","OxyServicesPopupAuthMixin","Base","constructor","args","AUTH_URL","POPUP_WIDTH","POPUP_HEIGHT","POPUP_TIMEOUT","SILENT_TIMEOUT","signInWithPopup","options","window","state","generateState","nonce","generateNonce","storeAuthState","width","height","timeout","mode","authUrl","buildAuthUrl","clientId","location","origin","redirectUri","popup","openCenteredPopup","session","waitForPopupAuth","accessToken","httpService","setTokens","sessionId","user","userData","makeRequest","undefined","cache","userError","console","warn","error","clearAuthState","signUpWithPopup","silentSignIn","iframe","document","createElement","style","display","position","border","silentUrl","encodeURIComponent","src","body","appendChild","waitForIframeAuth","removeChild","url","title","left","screenX","outerWidth","top","screenY","outerHeight","features","join","open","expectedState","Promise","resolve","reject","timeoutId","setTimeout","cleanup","messageHandler","event","data","type","log","expectedOrigin","hasSession","hasError","pollInterval","setInterval","closed","clearTimeout","clearInterval","removeEventListener","close","addEventListener","params","URL","searchParams","set","toString","crypto","randomUUID","Date","now","Math","random","substring","sessionStorage","setItem","JSON","stringify","timestamp","removeItem","PopupAuthMixin"],"sourceRoot":"../../../../src","sources":["core/mixins/OxyServices.popup.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -321,10 +321,26 @@ export const OxyProvider = ({
|
|
|
321
321
|
}, [restoreSessionsFromStorage, storage]);
|
|
322
322
|
|
|
323
323
|
// Web SSO: Automatically check for cross-domain session on web platforms
|
|
324
|
+
// Also used for popup auth - updates all state and persists session
|
|
324
325
|
const handleWebSSOSession = useCallback(async session => {
|
|
325
326
|
if (!session?.user || !session?.sessionId) {
|
|
327
|
+
if (__DEV__) {
|
|
328
|
+
loggerUtil.warn('handleWebSSOSession called with invalid session', {
|
|
329
|
+
component: 'OxyContext'
|
|
330
|
+
}, {
|
|
331
|
+
session
|
|
332
|
+
});
|
|
333
|
+
}
|
|
326
334
|
return;
|
|
327
335
|
}
|
|
336
|
+
if (__DEV__) {
|
|
337
|
+
loggerUtil.debug('handleWebSSOSession: Updating auth state', {
|
|
338
|
+
component: 'OxyContext'
|
|
339
|
+
}, {
|
|
340
|
+
sessionId: session.sessionId,
|
|
341
|
+
userId: session.user?.id
|
|
342
|
+
});
|
|
343
|
+
}
|
|
328
344
|
|
|
329
345
|
// Update sessions state
|
|
330
346
|
const clientSession = {
|
|
@@ -351,6 +367,11 @@ export const OxyProvider = ({
|
|
|
351
367
|
sessionIds.push(session.sessionId);
|
|
352
368
|
await storage.setItem(storageKeys.sessionIds, JSON.stringify(sessionIds));
|
|
353
369
|
}
|
|
370
|
+
if (__DEV__) {
|
|
371
|
+
loggerUtil.debug('handleWebSSOSession: Session persisted to storage', {
|
|
372
|
+
component: 'OxyContext'
|
|
373
|
+
});
|
|
374
|
+
}
|
|
354
375
|
}
|
|
355
376
|
}, [updateSessions, setActiveSessionId, loginSuccess, onAuthStateChange, storage, storageKeys]);
|
|
356
377
|
|
|
@@ -454,6 +475,7 @@ export const OxyProvider = ({
|
|
|
454
475
|
hasIdentity,
|
|
455
476
|
getPublicKey,
|
|
456
477
|
signIn,
|
|
478
|
+
handlePopupSession: handleWebSSOSession,
|
|
457
479
|
logout,
|
|
458
480
|
logoutAll,
|
|
459
481
|
switchSession: switchSessionForContext,
|
|
@@ -469,7 +491,7 @@ export const OxyProvider = ({
|
|
|
469
491
|
useFollow: useFollowHook,
|
|
470
492
|
showBottomSheet: showBottomSheetForContext,
|
|
471
493
|
openAvatarPicker
|
|
472
|
-
}), [activeSessionId, signIn, currentLanguage, currentLanguageMetadata, currentLanguageName, currentNativeLanguageName, error, getDeviceSessions, getPublicKey, hasIdentity, isAuthenticated, isLoading, logout, logoutAll, logoutAllDeviceSessions, oxyServices, refreshSessionsWithUser, sessions, setLanguage, storage, switchSessionForContext, tokenReady, updateDeviceName, clearAllAccountData, useFollowHook, user, showBottomSheetForContext, openAvatarPicker]);
|
|
494
|
+
}), [activeSessionId, signIn, handleWebSSOSession, currentLanguage, currentLanguageMetadata, currentLanguageName, currentNativeLanguageName, error, getDeviceSessions, getPublicKey, hasIdentity, isAuthenticated, isLoading, logout, logoutAll, logoutAllDeviceSessions, oxyServices, refreshSessionsWithUser, sessions, setLanguage, storage, switchSessionForContext, tokenReady, updateDeviceName, clearAllAccountData, useFollowHook, user, showBottomSheetForContext, openAvatarPicker]);
|
|
473
495
|
return /*#__PURE__*/_jsx(OxyContext.Provider, {
|
|
474
496
|
value: contextValue,
|
|
475
497
|
children: children
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["createContext","useCallback","useContext","useEffect","useMemo","useRef","useState","OxyServices","KeyManager","toast","useAuthStore","useShallow","useSessionSocket","useLanguageManagement","useSessionManagement","useAuthOperations","useDeviceManagement","getStorageKeys","createPlatformStorage","isInvalidSessionError","isTimeoutOrNetworkError","showBottomSheet","globalShowBottomSheet","useQueryClient","clearQueryCache","translate","updateAvatarVisibility","updateProfileWithAvatar","useAccountStore","logger","loggerUtil","useWebSSO","isWebBrowser","jsx","_jsx","OxyContext","cachedUseFollowHook","loadUseFollowHook","useFollow","require","error","__DEV__","warn","component","method","fallback","Error","OxyProvider","children","oxyServices","providedOxyServices","baseURL","authWebUrl","authRedirectUri","storageKeyPrefix","onAuthStateChange","onError","oxyServicesRef","current","user","isAuthenticated","isLoading","loginSuccess","loginFailure","logoutStore","state","logout","tokenReady","setTokenReady","initializedRef","setAuthState","setState","message","err","console","storageKeys","storageRef","storage","setStorage","mounted","then","storageInstance","catch","code","status","currentLanguage","metadata","currentLanguageMetadata","languageName","currentLanguageName","nativeLanguageName","currentNativeLanguageName","setLanguage","applyLanguagePreference","languageKey","language","queryClient","sessions","activeSessionId","setActiveSessionId","updateSessions","switchSession","refreshSessions","clearSessionState","saveActiveSessionId","trackRemovedSession","setAuthError","signIn","logoutAll","clearAllAccountData","clear","getState","reset","clearCache","getDeviceSessions","logoutAllDeviceSessions","updateDeviceName","useFollowHook","restoreSessionsFromStorage","storedSessionIdsJson","getItem","sessionIds","storedSessionIds","JSON","parse","storedActiveSessionId","validSessions","length","sessionId","validation","validateSession","useHeaderValidation","valid","now","Date","push","deviceId","expiresAt","getTime","toISOString","lastActive","userId","id","toString","isCurrent","validationError","debug","merge","switchError","removeItem","filter","session","String","handleWebSSOSession","clientSession","setItem","existingIds","includes","stringify","shouldTryWebSSO","onSessionFound","enabled","activeSession","find","undefined","currentDeviceId","refreshSessionsWithUser","handleSessionRemoved","handleRemoteSignOut","info","remoteError","getBaseURL","onRemoteSignOut","onSessionRemoved","switchSessionForContext","hasIdentity","getPublicKey","showBottomSheetForContext","screenOrConfig","openAvatarPicker","screen","props","selectMode","multiSelect","disabledMimeTypes","afterSelect","onSelect","file","contentType","startsWith","avatar","success","e","contextValue","isTokenReady","isStorageReady","removeSession","Provider","value","OxyContextProvider","useOxy","context"],"sourceRoot":"../../../../src","sources":["ui/context/OxyContext.tsx"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["createContext","useCallback","useContext","useEffect","useMemo","useRef","useState","OxyServices","KeyManager","toast","useAuthStore","useShallow","useSessionSocket","useLanguageManagement","useSessionManagement","useAuthOperations","useDeviceManagement","getStorageKeys","createPlatformStorage","isInvalidSessionError","isTimeoutOrNetworkError","showBottomSheet","globalShowBottomSheet","useQueryClient","clearQueryCache","translate","updateAvatarVisibility","updateProfileWithAvatar","useAccountStore","logger","loggerUtil","useWebSSO","isWebBrowser","jsx","_jsx","OxyContext","cachedUseFollowHook","loadUseFollowHook","useFollow","require","error","__DEV__","warn","component","method","fallback","Error","OxyProvider","children","oxyServices","providedOxyServices","baseURL","authWebUrl","authRedirectUri","storageKeyPrefix","onAuthStateChange","onError","oxyServicesRef","current","user","isAuthenticated","isLoading","loginSuccess","loginFailure","logoutStore","state","logout","tokenReady","setTokenReady","initializedRef","setAuthState","setState","message","err","console","storageKeys","storageRef","storage","setStorage","mounted","then","storageInstance","catch","code","status","currentLanguage","metadata","currentLanguageMetadata","languageName","currentLanguageName","nativeLanguageName","currentNativeLanguageName","setLanguage","applyLanguagePreference","languageKey","language","queryClient","sessions","activeSessionId","setActiveSessionId","updateSessions","switchSession","refreshSessions","clearSessionState","saveActiveSessionId","trackRemovedSession","setAuthError","signIn","logoutAll","clearAllAccountData","clear","getState","reset","clearCache","getDeviceSessions","logoutAllDeviceSessions","updateDeviceName","useFollowHook","restoreSessionsFromStorage","storedSessionIdsJson","getItem","sessionIds","storedSessionIds","JSON","parse","storedActiveSessionId","validSessions","length","sessionId","validation","validateSession","useHeaderValidation","valid","now","Date","push","deviceId","expiresAt","getTime","toISOString","lastActive","userId","id","toString","isCurrent","validationError","debug","merge","switchError","removeItem","filter","session","String","handleWebSSOSession","clientSession","setItem","existingIds","includes","stringify","shouldTryWebSSO","onSessionFound","enabled","activeSession","find","undefined","currentDeviceId","refreshSessionsWithUser","handleSessionRemoved","handleRemoteSignOut","info","remoteError","getBaseURL","onRemoteSignOut","onSessionRemoved","switchSessionForContext","hasIdentity","getPublicKey","showBottomSheetForContext","screenOrConfig","openAvatarPicker","screen","props","selectMode","multiSelect","disabledMimeTypes","afterSelect","onSelect","file","contentType","startsWith","avatar","success","e","contextValue","isTokenReady","isStorageReady","handlePopupSession","removeSession","Provider","value","OxyContextProvider","useOxy","context"],"sourceRoot":"../../../../src","sources":["ui/context/OxyContext.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -45,6 +45,7 @@ export function useAuth() {
|
|
|
45
45
|
isTokenReady,
|
|
46
46
|
error,
|
|
47
47
|
signIn: oxySignIn,
|
|
48
|
+
handlePopupSession,
|
|
48
49
|
logout,
|
|
49
50
|
logoutAll,
|
|
50
51
|
refreshSessions,
|
|
@@ -58,36 +59,26 @@ export function useAuth() {
|
|
|
58
59
|
// Only auth.oxy.so has local login forms - accounts.oxy.so is a client app
|
|
59
60
|
const isIdentityProvider = isWebBrowser() && window.location.hostname === 'auth.oxy.so';
|
|
60
61
|
|
|
61
|
-
// Web (not on IdP): Use
|
|
62
|
+
// Web (not on IdP): Use popup-based authentication
|
|
63
|
+
// We skip FedCM here because:
|
|
64
|
+
// 1. Silent FedCM already ran on page load (via useWebSSO)
|
|
65
|
+
// 2. If user is clicking "Sign In", they need interactive auth
|
|
66
|
+
// 3. Doing FedCM first loses the "user gesture" needed for popups
|
|
62
67
|
if (isWebBrowser() && !publicKey && !isIdentityProvider) {
|
|
63
|
-
// Try FedCM first (instant if user already signed in at IdP)
|
|
64
|
-
if (oxyServices.isFedCMSupported?.()) {
|
|
65
|
-
try {
|
|
66
|
-
const fedcmSession = await oxyServices.signInWithFedCM?.();
|
|
67
|
-
if (fedcmSession?.user) {
|
|
68
|
-
return fedcmSession.user;
|
|
69
|
-
}
|
|
70
|
-
} catch (fedcmError) {
|
|
71
|
-
// FedCM failed (user not signed in at IdP, cancelled, etc.)
|
|
72
|
-
// Fall through to popup
|
|
73
|
-
console.debug('FedCM failed, falling back to popup:', fedcmError);
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
|
|
77
|
-
// Fallback to popup (opens auth.oxy.so in popup window)
|
|
78
68
|
try {
|
|
79
69
|
const popupSession = await oxyServices.signInWithPopup?.();
|
|
80
70
|
if (popupSession?.user) {
|
|
71
|
+
// Update context state with the session (this updates user, sessions, storage)
|
|
72
|
+
await handlePopupSession(popupSession);
|
|
81
73
|
return popupSession.user;
|
|
82
74
|
}
|
|
75
|
+
throw new Error('Sign-in failed. Please try again.');
|
|
83
76
|
} catch (popupError) {
|
|
84
|
-
// If popup blocked, suggest enabling popups
|
|
85
77
|
if (popupError instanceof Error && popupError.message.includes('blocked')) {
|
|
86
78
|
throw new Error('Popup blocked. Please allow popups for this site.');
|
|
87
79
|
}
|
|
88
80
|
throw popupError;
|
|
89
81
|
}
|
|
90
|
-
throw new Error('Sign-in failed. Please try again.');
|
|
91
82
|
}
|
|
92
83
|
|
|
93
84
|
// Native: Use cryptographic identity
|
|
@@ -121,7 +112,7 @@ export function useAuth() {
|
|
|
121
112
|
return new Promise(() => {}); // Never resolves, page will redirect
|
|
122
113
|
}
|
|
123
114
|
throw new Error('No authentication method available');
|
|
124
|
-
}, [oxySignIn, hasIdentity, getPublicKey, showBottomSheet, oxyServices]);
|
|
115
|
+
}, [oxySignIn, hasIdentity, getPublicKey, showBottomSheet, oxyServices, handlePopupSession]);
|
|
125
116
|
const signOut = useCallback(async () => {
|
|
126
117
|
await logout();
|
|
127
118
|
}, [logout]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useOxy","isWebBrowser","useAuth","user","isAuthenticated","isLoading","isTokenReady","error","signIn","oxySignIn","logout","logoutAll","refreshSessions","oxyServices","hasIdentity","getPublicKey","showBottomSheet","publicKey","isIdentityProvider","window","location","hostname","
|
|
1
|
+
{"version":3,"names":["useCallback","useOxy","isWebBrowser","useAuth","user","isAuthenticated","isLoading","isTokenReady","error","signIn","oxySignIn","handlePopupSession","logout","logoutAll","refreshSessions","oxyServices","hasIdentity","getPublicKey","showBottomSheet","publicKey","isIdentityProvider","window","location","hostname","popupSession","signInWithPopup","Error","popupError","message","includes","hasExisting","existingKey","Promise","_","reject","loginUrl","href","signOut","signOutAll","refresh","isReady"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAuth.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OxyServices.popup.d.ts","sourceRoot":"","sources":["../../../../../src/core/mixins/OxyServices.popup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEjE,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;CAC3B;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,yBAAyB,CAAC,CAAC,SAAS,OAAO,eAAe,EAAE,IAAI,EAAE,CAAC;kBAE1D,GAAG,EAAE;QAS5B;;;;;;;;;;;;;;;;;;;;;;;;WAwBG;kCAC4B,gBAAgB,GAAQ,OAAO,CAAC,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"OxyServices.popup.d.ts","sourceRoot":"","sources":["../../../../../src/core/mixins/OxyServices.popup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEjE,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;CAC3B;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,yBAAyB,CAAC,CAAC,SAAS,OAAO,eAAe,EAAE,IAAI,EAAE,CAAC;kBAE1D,GAAG,EAAE;QAS5B;;;;;;;;;;;;;;;;;;;;;;;;WAwBG;kCAC4B,gBAAgB,GAAQ,OAAO,CAAC,oBAAoB,CAAC;QAmEpF;;;;;;;WAOG;kCAC4B,gBAAgB,GAAQ,OAAO,CAAC,oBAAoB,CAAC;QAIpF;;;;;;;;;;;;;;;;;;;;;;;;;;;;WA4BG;+BACyB,iBAAiB,GAAQ,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;QAoCzF;;;;WAIG;+BAC2B,MAAM,SAAS,MAAM,SAAS,MAAM,UAAU,MAAM,GAAG,MAAM,GAAG,IAAI;QAoBlG;;;;WAIG;gCAEM,MAAM,iBACE,MAAM,WACZ,MAAM,GACd,OAAO,CAAC,oBAAoB,CAAC;QA6EhC;;;;WAIG;kCAEO,iBAAiB,WAChB,MAAM,kBACC,MAAM,GACrB,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;QAgCvC;;;;WAIG;6BACyB;YAC1B,IAAI,EAAE,MAAM,CAAC;YACb,KAAK,EAAE,MAAM,CAAC;YACd,KAAK,EAAE,MAAM,CAAC;YACd,QAAQ,EAAE,MAAM,CAAC;YACjB,WAAW,EAAE,MAAM,CAAC;SACrB,GAAG,MAAM;QAUV;;;;WAIG;yBACqB,MAAM;QAO9B;;;;WAIG;yBACqB,MAAM;QAO9B;;;;WAIG;8BAC0B,MAAM,SAAS,MAAM,GAAG,IAAI;QAMzD;;;;WAIG;8BAC0B,MAAM,GAAG,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBAvP/B,CAAC;sBAGA,CAAC;yBAA6B,CAAC;;;;;;iBAwGnC,CAAP;qBAGK,CADR;;;;uBA1PoC,qBAAqB;0BAClB,GAAG;2BACF,GAAG;4BACF,KAAK;6BACJ,IAAI;;MAsY7C;AAGD,OAAO,EAAE,yBAAyB,IAAI,cAAc,EAAE,CAAC"}
|
|
@@ -22,6 +22,17 @@ export interface OxyContextState {
|
|
|
22
22
|
hasIdentity: () => Promise<boolean>;
|
|
23
23
|
getPublicKey: () => Promise<string | null>;
|
|
24
24
|
signIn: (publicKey: string, deviceName?: string) => Promise<User>;
|
|
25
|
+
/**
|
|
26
|
+
* Handle session from popup authentication
|
|
27
|
+
* Updates auth state, persists session to storage
|
|
28
|
+
*/
|
|
29
|
+
handlePopupSession: (session: {
|
|
30
|
+
sessionId: string;
|
|
31
|
+
accessToken?: string;
|
|
32
|
+
expiresAt?: string;
|
|
33
|
+
user: User;
|
|
34
|
+
deviceId?: string;
|
|
35
|
+
}) => Promise<void>;
|
|
25
36
|
logout: (targetSessionId?: string) => Promise<void>;
|
|
26
37
|
logoutAll: () => Promise<void>;
|
|
27
38
|
switchSession: (sessionId: string) => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OxyContext.d.ts","sourceRoot":"","sources":["../../../../../src/ui/context/OxyContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAQL,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAE9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAK1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAMvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAUtD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAClB,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,uBAAuB,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC,UAAU,CAAC,CAAC;IAC9E,mBAAmB,EAAE,MAAM,CAAC;IAC5B,yBAAyB,EAAE,MAAM,CAAC;IAGlC,WAAW,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,YAAY,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAG3C,MAAM,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"OxyContext.d.ts","sourceRoot":"","sources":["../../../../../src/ui/context/OxyContext.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAuth.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/useAuth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAGpD,MAAM,WAAW,SAAS;IACxB,4DAA4D;IAC5D,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAElB,oCAAoC;IACpC,eAAe,EAAE,OAAO,CAAC;IAEzB,4DAA4D;IAC5D,SAAS,EAAE,OAAO,CAAC;IAEnB,oDAAoD;IACpD,OAAO,EAAE,OAAO,CAAC;IAEjB,oCAAoC;IACpC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B;;;;OAIG;IACH,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9C;;OAEG;IACH,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7B;;OAEG;IACH,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhC;;OAEG;IACH,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,aAAc,SAAQ,SAAS,EAAE,WAAW;IAC3D,6DAA6D;IAC7D,WAAW,EAAE,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC;CACvD;AAED;;;;;;;;GAQG;AACH,wBAAgB,OAAO,IAAI,aAAa,
|
|
1
|
+
{"version":3,"file":"useAuth.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/useAuth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAGpD,MAAM,WAAW,SAAS;IACxB,4DAA4D;IAC5D,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAElB,oCAAoC;IACpC,eAAe,EAAE,OAAO,CAAC;IAEzB,4DAA4D;IAC5D,SAAS,EAAE,OAAO,CAAC;IAEnB,oDAAoD;IACpD,OAAO,EAAE,OAAO,CAAC;IAEjB,oCAAoC;IACpC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B;;;;OAIG;IACH,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9C;;OAEG;IACH,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7B;;OAEG;IACH,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhC;;OAEG;IACH,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,aAAc,SAAQ,SAAS,EAAE,WAAW;IAC3D,6DAA6D;IAC7D,WAAW,EAAE,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC;CACvD;AAED;;;;;;;;GAQG;AACH,wBAAgB,OAAO,IAAI,aAAa,CAgHvC;AAGD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OxyServices.popup.d.ts","sourceRoot":"","sources":["../../../../../src/core/mixins/OxyServices.popup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEjE,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;CAC3B;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,yBAAyB,CAAC,CAAC,SAAS,OAAO,eAAe,EAAE,IAAI,EAAE,CAAC;kBAE1D,GAAG,EAAE;QAS5B;;;;;;;;;;;;;;;;;;;;;;;;WAwBG;kCAC4B,gBAAgB,GAAQ,OAAO,CAAC,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"OxyServices.popup.d.ts","sourceRoot":"","sources":["../../../../../src/core/mixins/OxyServices.popup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEjE,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;CAC3B;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,yBAAyB,CAAC,CAAC,SAAS,OAAO,eAAe,EAAE,IAAI,EAAE,CAAC;kBAE1D,GAAG,EAAE;QAS5B;;;;;;;;;;;;;;;;;;;;;;;;WAwBG;kCAC4B,gBAAgB,GAAQ,OAAO,CAAC,oBAAoB,CAAC;QAmEpF;;;;;;;WAOG;kCAC4B,gBAAgB,GAAQ,OAAO,CAAC,oBAAoB,CAAC;QAIpF;;;;;;;;;;;;;;;;;;;;;;;;;;;;WA4BG;+BACyB,iBAAiB,GAAQ,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;QAoCzF;;;;WAIG;+BAC2B,MAAM,SAAS,MAAM,SAAS,MAAM,UAAU,MAAM,GAAG,MAAM,GAAG,IAAI;QAoBlG;;;;WAIG;gCAEM,MAAM,iBACE,MAAM,WACZ,MAAM,GACd,OAAO,CAAC,oBAAoB,CAAC;QA6EhC;;;;WAIG;kCAEO,iBAAiB,WAChB,MAAM,kBACC,MAAM,GACrB,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;QAgCvC;;;;WAIG;6BACyB;YAC1B,IAAI,EAAE,MAAM,CAAC;YACb,KAAK,EAAE,MAAM,CAAC;YACd,KAAK,EAAE,MAAM,CAAC;YACd,QAAQ,EAAE,MAAM,CAAC;YACjB,WAAW,EAAE,MAAM,CAAC;SACrB,GAAG,MAAM;QAUV;;;;WAIG;yBACqB,MAAM;QAO9B;;;;WAIG;yBACqB,MAAM;QAO9B;;;;WAIG;8BAC0B,MAAM,SAAS,MAAM,GAAG,IAAI;QAMzD;;;;WAIG;8BAC0B,MAAM,GAAG,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBAvP/B,CAAC;sBAGA,CAAC;yBAA6B,CAAC;;;;;;iBAwGnC,CAAP;qBAGK,CADR;;;;uBA1PoC,qBAAqB;0BAClB,GAAG;2BACF,GAAG;4BACF,KAAK;6BACJ,IAAI;;MAsY7C;AAGD,OAAO,EAAE,yBAAyB,IAAI,cAAc,EAAE,CAAC"}
|
|
@@ -22,6 +22,17 @@ export interface OxyContextState {
|
|
|
22
22
|
hasIdentity: () => Promise<boolean>;
|
|
23
23
|
getPublicKey: () => Promise<string | null>;
|
|
24
24
|
signIn: (publicKey: string, deviceName?: string) => Promise<User>;
|
|
25
|
+
/**
|
|
26
|
+
* Handle session from popup authentication
|
|
27
|
+
* Updates auth state, persists session to storage
|
|
28
|
+
*/
|
|
29
|
+
handlePopupSession: (session: {
|
|
30
|
+
sessionId: string;
|
|
31
|
+
accessToken?: string;
|
|
32
|
+
expiresAt?: string;
|
|
33
|
+
user: User;
|
|
34
|
+
deviceId?: string;
|
|
35
|
+
}) => Promise<void>;
|
|
25
36
|
logout: (targetSessionId?: string) => Promise<void>;
|
|
26
37
|
logoutAll: () => Promise<void>;
|
|
27
38
|
switchSession: (sessionId: string) => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OxyContext.d.ts","sourceRoot":"","sources":["../../../../../src/ui/context/OxyContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAQL,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAE9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAK1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAMvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAUtD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAClB,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,uBAAuB,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC,UAAU,CAAC,CAAC;IAC9E,mBAAmB,EAAE,MAAM,CAAC;IAC5B,yBAAyB,EAAE,MAAM,CAAC;IAGlC,WAAW,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,YAAY,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAG3C,MAAM,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"OxyContext.d.ts","sourceRoot":"","sources":["../../../../../src/ui/context/OxyContext.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAuth.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/useAuth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAGpD,MAAM,WAAW,SAAS;IACxB,4DAA4D;IAC5D,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAElB,oCAAoC;IACpC,eAAe,EAAE,OAAO,CAAC;IAEzB,4DAA4D;IAC5D,SAAS,EAAE,OAAO,CAAC;IAEnB,oDAAoD;IACpD,OAAO,EAAE,OAAO,CAAC;IAEjB,oCAAoC;IACpC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B;;;;OAIG;IACH,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9C;;OAEG;IACH,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7B;;OAEG;IACH,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhC;;OAEG;IACH,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,aAAc,SAAQ,SAAS,EAAE,WAAW;IAC3D,6DAA6D;IAC7D,WAAW,EAAE,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC;CACvD;AAED;;;;;;;;GAQG;AACH,wBAAgB,OAAO,IAAI,aAAa,
|
|
1
|
+
{"version":3,"file":"useAuth.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/useAuth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAGpD,MAAM,WAAW,SAAS;IACxB,4DAA4D;IAC5D,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAElB,oCAAoC;IACpC,eAAe,EAAE,OAAO,CAAC;IAEzB,4DAA4D;IAC5D,SAAS,EAAE,OAAO,CAAC;IAEnB,oDAAoD;IACpD,OAAO,EAAE,OAAO,CAAC;IAEjB,oCAAoC;IACpC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B;;;;OAIG;IACH,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9C;;OAEG;IACH,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7B;;OAEG;IACH,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhC;;OAEG;IACH,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,aAAc,SAAQ,SAAS,EAAE,WAAW;IAC3D,6DAA6D;IAC7D,WAAW,EAAE,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC;CACvD;AAED;;;;;;;;GAQG;AACH,wBAAgB,OAAO,IAAI,aAAa,CAgHvC;AAGD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oxyhq/services",
|
|
3
|
-
"version": "5.20.
|
|
3
|
+
"version": "5.20.3",
|
|
4
4
|
"description": "Reusable OxyHQ module to handle authentication, user management, karma system, device-based session management and more 🚀",
|
|
5
5
|
"main": "lib/commonjs/index.js",
|
|
6
6
|
"module": "lib/module/index.js",
|
|
@@ -111,6 +111,25 @@ export function OxyServicesPopupAuthMixin<T extends typeof OxyServicesBase>(Base
|
|
|
111
111
|
this.httpService.setTokens((session as any).accessToken);
|
|
112
112
|
}
|
|
113
113
|
|
|
114
|
+
// Fetch user data using the session ID
|
|
115
|
+
// The callback page only sends sessionId/accessToken, not user data
|
|
116
|
+
if (session && session.sessionId && !session.user) {
|
|
117
|
+
try {
|
|
118
|
+
const userData = await this.makeRequest<any>(
|
|
119
|
+
'GET',
|
|
120
|
+
`/api/session/user/${session.sessionId}`,
|
|
121
|
+
undefined,
|
|
122
|
+
{ cache: false }
|
|
123
|
+
);
|
|
124
|
+
if (userData) {
|
|
125
|
+
(session as any).user = userData;
|
|
126
|
+
}
|
|
127
|
+
} catch (userError) {
|
|
128
|
+
console.warn('[PopupAuth] Failed to fetch user data:', userError);
|
|
129
|
+
// Continue without user data - caller can fetch separately
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
|
|
114
133
|
return session;
|
|
115
134
|
} catch (error) {
|
|
116
135
|
throw error;
|
|
@@ -238,8 +257,21 @@ export function OxyServicesPopupAuthMixin<T extends typeof OxyServicesBase>(Base
|
|
|
238
257
|
}, timeout);
|
|
239
258
|
|
|
240
259
|
const messageHandler = (event: MessageEvent) => {
|
|
260
|
+
const authUrl = (this.constructor as any).AUTH_URL;
|
|
261
|
+
|
|
262
|
+
// Log all messages for debugging
|
|
263
|
+
if (event.data && typeof event.data === 'object' && event.data.type) {
|
|
264
|
+
console.log('[PopupAuth] Message received:', {
|
|
265
|
+
origin: event.origin,
|
|
266
|
+
expectedOrigin: authUrl,
|
|
267
|
+
type: event.data.type,
|
|
268
|
+
hasSession: !!event.data.session,
|
|
269
|
+
hasError: !!event.data.error,
|
|
270
|
+
});
|
|
271
|
+
}
|
|
272
|
+
|
|
241
273
|
// CRITICAL: Verify origin to prevent XSS attacks
|
|
242
|
-
if (event.origin !==
|
|
274
|
+
if (event.origin !== authUrl) {
|
|
243
275
|
return;
|
|
244
276
|
}
|
|
245
277
|
|
|
@@ -249,9 +281,12 @@ export function OxyServicesPopupAuthMixin<T extends typeof OxyServicesBase>(Base
|
|
|
249
281
|
return;
|
|
250
282
|
}
|
|
251
283
|
|
|
284
|
+
console.log('[PopupAuth] Valid auth response:', { state, expectedState, hasSession: !!session, error });
|
|
285
|
+
|
|
252
286
|
// Verify state parameter to prevent CSRF attacks
|
|
253
287
|
if (state !== expectedState) {
|
|
254
288
|
cleanup();
|
|
289
|
+
console.error('[PopupAuth] State mismatch');
|
|
255
290
|
reject(new OxyAuthenticationError('Invalid state parameter. Possible CSRF attack.'));
|
|
256
291
|
return;
|
|
257
292
|
}
|
|
@@ -259,10 +294,13 @@ export function OxyServicesPopupAuthMixin<T extends typeof OxyServicesBase>(Base
|
|
|
259
294
|
cleanup();
|
|
260
295
|
|
|
261
296
|
if (error) {
|
|
297
|
+
console.error('[PopupAuth] Auth error:', error);
|
|
262
298
|
reject(new OxyAuthenticationError(error));
|
|
263
299
|
} else if (session) {
|
|
300
|
+
console.log('[PopupAuth] Session received successfully');
|
|
264
301
|
resolve(session);
|
|
265
302
|
} else {
|
|
303
|
+
console.error('[PopupAuth] No session in response');
|
|
266
304
|
reject(new OxyAuthenticationError('No session received from authentication server'));
|
|
267
305
|
}
|
|
268
306
|
};
|
|
@@ -55,6 +55,18 @@ export interface OxyContextState {
|
|
|
55
55
|
// Authentication
|
|
56
56
|
signIn: (publicKey: string, deviceName?: string) => Promise<User>;
|
|
57
57
|
|
|
58
|
+
/**
|
|
59
|
+
* Handle session from popup authentication
|
|
60
|
+
* Updates auth state, persists session to storage
|
|
61
|
+
*/
|
|
62
|
+
handlePopupSession: (session: {
|
|
63
|
+
sessionId: string;
|
|
64
|
+
accessToken?: string;
|
|
65
|
+
expiresAt?: string;
|
|
66
|
+
user: User;
|
|
67
|
+
deviceId?: string;
|
|
68
|
+
}) => Promise<void>;
|
|
69
|
+
|
|
58
70
|
// Session management
|
|
59
71
|
logout: (targetSessionId?: string) => Promise<void>;
|
|
60
72
|
logoutAll: () => Promise<void>;
|
|
@@ -414,11 +426,19 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
|
|
|
414
426
|
}, [restoreSessionsFromStorage, storage]);
|
|
415
427
|
|
|
416
428
|
// Web SSO: Automatically check for cross-domain session on web platforms
|
|
429
|
+
// Also used for popup auth - updates all state and persists session
|
|
417
430
|
const handleWebSSOSession = useCallback(async (session: any) => {
|
|
418
431
|
if (!session?.user || !session?.sessionId) {
|
|
432
|
+
if (__DEV__) {
|
|
433
|
+
loggerUtil.warn('handleWebSSOSession called with invalid session', { component: 'OxyContext' }, { session });
|
|
434
|
+
}
|
|
419
435
|
return;
|
|
420
436
|
}
|
|
421
437
|
|
|
438
|
+
if (__DEV__) {
|
|
439
|
+
loggerUtil.debug('handleWebSSOSession: Updating auth state', { component: 'OxyContext' }, { sessionId: session.sessionId, userId: session.user?.id });
|
|
440
|
+
}
|
|
441
|
+
|
|
422
442
|
// Update sessions state
|
|
423
443
|
const clientSession = {
|
|
424
444
|
sessionId: session.sessionId,
|
|
@@ -443,6 +463,9 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
|
|
|
443
463
|
sessionIds.push(session.sessionId);
|
|
444
464
|
await storage.setItem(storageKeys.sessionIds, JSON.stringify(sessionIds));
|
|
445
465
|
}
|
|
466
|
+
if (__DEV__) {
|
|
467
|
+
loggerUtil.debug('handleWebSSOSession: Session persisted to storage', { component: 'OxyContext' });
|
|
468
|
+
}
|
|
446
469
|
}
|
|
447
470
|
}, [updateSessions, setActiveSessionId, loginSuccess, onAuthStateChange, storage, storageKeys]);
|
|
448
471
|
|
|
@@ -571,6 +594,7 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
|
|
|
571
594
|
hasIdentity,
|
|
572
595
|
getPublicKey,
|
|
573
596
|
signIn,
|
|
597
|
+
handlePopupSession: handleWebSSOSession,
|
|
574
598
|
logout,
|
|
575
599
|
logoutAll,
|
|
576
600
|
switchSession: switchSessionForContext,
|
|
@@ -589,6 +613,7 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
|
|
|
589
613
|
}), [
|
|
590
614
|
activeSessionId,
|
|
591
615
|
signIn,
|
|
616
|
+
handleWebSSOSession,
|
|
592
617
|
currentLanguage,
|
|
593
618
|
currentLanguageMetadata,
|
|
594
619
|
currentLanguageName,
|
package/src/ui/hooks/useAuth.ts
CHANGED
|
@@ -91,6 +91,7 @@ export function useAuth(): UseAuthReturn {
|
|
|
91
91
|
isTokenReady,
|
|
92
92
|
error,
|
|
93
93
|
signIn: oxySignIn,
|
|
94
|
+
handlePopupSession,
|
|
94
95
|
logout,
|
|
95
96
|
logoutAll,
|
|
96
97
|
refreshSessions,
|
|
@@ -106,37 +107,26 @@ export function useAuth(): UseAuthReturn {
|
|
|
106
107
|
const isIdentityProvider = isWebBrowser() &&
|
|
107
108
|
window.location.hostname === 'auth.oxy.so';
|
|
108
109
|
|
|
109
|
-
// Web (not on IdP): Use
|
|
110
|
+
// Web (not on IdP): Use popup-based authentication
|
|
111
|
+
// We skip FedCM here because:
|
|
112
|
+
// 1. Silent FedCM already ran on page load (via useWebSSO)
|
|
113
|
+
// 2. If user is clicking "Sign In", they need interactive auth
|
|
114
|
+
// 3. Doing FedCM first loses the "user gesture" needed for popups
|
|
110
115
|
if (isWebBrowser() && !publicKey && !isIdentityProvider) {
|
|
111
|
-
// Try FedCM first (instant if user already signed in at IdP)
|
|
112
|
-
if ((oxyServices as any).isFedCMSupported?.()) {
|
|
113
|
-
try {
|
|
114
|
-
const fedcmSession = await (oxyServices as any).signInWithFedCM?.();
|
|
115
|
-
if (fedcmSession?.user) {
|
|
116
|
-
return fedcmSession.user;
|
|
117
|
-
}
|
|
118
|
-
} catch (fedcmError) {
|
|
119
|
-
// FedCM failed (user not signed in at IdP, cancelled, etc.)
|
|
120
|
-
// Fall through to popup
|
|
121
|
-
console.debug('FedCM failed, falling back to popup:', fedcmError);
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
|
|
125
|
-
// Fallback to popup (opens auth.oxy.so in popup window)
|
|
126
116
|
try {
|
|
127
117
|
const popupSession = await (oxyServices as any).signInWithPopup?.();
|
|
128
118
|
if (popupSession?.user) {
|
|
119
|
+
// Update context state with the session (this updates user, sessions, storage)
|
|
120
|
+
await handlePopupSession(popupSession);
|
|
129
121
|
return popupSession.user;
|
|
130
122
|
}
|
|
123
|
+
throw new Error('Sign-in failed. Please try again.');
|
|
131
124
|
} catch (popupError) {
|
|
132
|
-
// If popup blocked, suggest enabling popups
|
|
133
125
|
if (popupError instanceof Error && popupError.message.includes('blocked')) {
|
|
134
126
|
throw new Error('Popup blocked. Please allow popups for this site.');
|
|
135
127
|
}
|
|
136
128
|
throw popupError;
|
|
137
129
|
}
|
|
138
|
-
|
|
139
|
-
throw new Error('Sign-in failed. Please try again.');
|
|
140
130
|
}
|
|
141
131
|
|
|
142
132
|
// Native: Use cryptographic identity
|
|
@@ -174,7 +164,7 @@ export function useAuth(): UseAuthReturn {
|
|
|
174
164
|
}
|
|
175
165
|
|
|
176
166
|
throw new Error('No authentication method available');
|
|
177
|
-
}, [oxySignIn, hasIdentity, getPublicKey, showBottomSheet, oxyServices]);
|
|
167
|
+
}, [oxySignIn, hasIdentity, getPublicKey, showBottomSheet, oxyServices, handlePopupSession]);
|
|
178
168
|
|
|
179
169
|
const signOut = useCallback(async (): Promise<void> => {
|
|
180
170
|
await logout();
|