@oxyhq/services 5.20.1 → 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.fedcm.js +26 -6
- package/lib/commonjs/core/mixins/OxyServices.fedcm.js.map +1 -1
- 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 +15 -15
- package/lib/commonjs/ui/hooks/useAuth.js.map +1 -1
- package/lib/module/core/mixins/OxyServices.fedcm.js +26 -6
- package/lib/module/core/mixins/OxyServices.fedcm.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 +15 -15
- package/lib/module/ui/hooks/useAuth.js.map +1 -1
- package/lib/typescript/commonjs/core/mixins/OxyServices.fedcm.d.ts +3 -7
- package/lib/typescript/commonjs/core/mixins/OxyServices.fedcm.d.ts.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.fedcm.d.ts +3 -7
- package/lib/typescript/module/core/mixins/OxyServices.fedcm.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.fedcm.ts +26 -6
- package/src/core/mixins/OxyServices.popup.ts +39 -1
- package/src/ui/context/OxyContext.tsx +25 -0
- package/src/ui/hooks/useAuth.ts +15 -20
|
@@ -9,6 +9,7 @@ var _OxyServicesErrors = require("../OxyServices.errors.js");
|
|
|
9
9
|
// FedCM only allows one navigator.credentials.get request at a time
|
|
10
10
|
let fedCMRequestInProgress = false;
|
|
11
11
|
let fedCMRequestPromise = null;
|
|
12
|
+
let currentMediationMode = null;
|
|
12
13
|
|
|
13
14
|
/**
|
|
14
15
|
* Federated Credential Management (FedCM) Authentication Mixin
|
|
@@ -181,18 +182,36 @@ function OxyServicesFedCMMixin(Base) {
|
|
|
181
182
|
* Uses a global lock to prevent concurrent requests, as FedCM only
|
|
182
183
|
* allows one navigator.credentials.get request at a time.
|
|
183
184
|
*
|
|
185
|
+
* Interactive requests (optional/required) wait for any silent request to finish first.
|
|
186
|
+
*
|
|
184
187
|
* @private
|
|
185
188
|
*/
|
|
186
189
|
async requestIdentityCredential(options) {
|
|
187
|
-
|
|
190
|
+
const requestedMediation = options.mediation || 'optional';
|
|
191
|
+
const isInteractive = requestedMediation !== 'silent';
|
|
192
|
+
|
|
193
|
+
// If a request is already in progress...
|
|
188
194
|
if (fedCMRequestInProgress && fedCMRequestPromise) {
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
195
|
+
// If current request is silent and new request is interactive,
|
|
196
|
+
// wait for silent to finish, then make the interactive request
|
|
197
|
+
if (currentMediationMode === 'silent' && isInteractive) {
|
|
198
|
+
try {
|
|
199
|
+
await fedCMRequestPromise;
|
|
200
|
+
} catch {
|
|
201
|
+
// Ignore silent request errors
|
|
202
|
+
}
|
|
203
|
+
// Now fall through to make the interactive request
|
|
204
|
+
} else {
|
|
205
|
+
// Same type of request - wait for the existing one
|
|
206
|
+
try {
|
|
207
|
+
return await fedCMRequestPromise;
|
|
208
|
+
} catch {
|
|
209
|
+
return null;
|
|
210
|
+
}
|
|
193
211
|
}
|
|
194
212
|
}
|
|
195
213
|
fedCMRequestInProgress = true;
|
|
214
|
+
currentMediationMode = requestedMediation;
|
|
196
215
|
const controller = new AbortController();
|
|
197
216
|
const timeout = setTimeout(() => controller.abort(), this.constructor.FEDCM_TIMEOUT);
|
|
198
217
|
fedCMRequestPromise = (async () => {
|
|
@@ -209,7 +228,7 @@ function OxyServicesFedCMMixin(Base) {
|
|
|
209
228
|
})
|
|
210
229
|
}]
|
|
211
230
|
},
|
|
212
|
-
mediation:
|
|
231
|
+
mediation: requestedMediation,
|
|
213
232
|
signal: controller.signal
|
|
214
233
|
});
|
|
215
234
|
if (!credential || credential.type !== 'identity') {
|
|
@@ -222,6 +241,7 @@ function OxyServicesFedCMMixin(Base) {
|
|
|
222
241
|
clearTimeout(timeout);
|
|
223
242
|
fedCMRequestInProgress = false;
|
|
224
243
|
fedCMRequestPromise = null;
|
|
244
|
+
currentMediationMode = null;
|
|
225
245
|
}
|
|
226
246
|
})();
|
|
227
247
|
return fedCMRequestPromise;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_OxyServicesErrors","require","fedCMRequestInProgress","fedCMRequestPromise","OxyServicesFedCMMixin","Base","constructor","args","DEFAULT_CONFIG_URL","FEDCM_TIMEOUT","isFedCMSupported","window","navigator","signInWithFedCM","options","OxyAuthenticationError","nonce","generateNonce","clientId","getClientId","credential","requestIdentityCredential","configURL","context","token","session","exchangeIdTokenForSession","accessToken","httpService","setTokens","error","name","silentSignInWithFedCM","mediation","controller","AbortController","timeout","setTimeout","abort","credentials","get","identity","providers","loginHint","signal","type","clearTimeout","idToken","makeRequest","id_token","cache","revokeFedCMCredential","IdentityCredential","logout","getFedCMConfig","enabled","crypto","randomUUID","Date","now","Math","random","toString","substring","location","origin"],"sourceRoot":"../../../../src","sources":["core/mixins/OxyServices.fedcm.ts"],"mappings":";;;;;;AACA,IAAAA,kBAAA,GAAAC,OAAA;AAcA;AACA;AACA,IAAIC,sBAAsB,GAAG,KAAK;AAClC,IAAIC,mBAAwC,GAAG,IAAI;;
|
|
1
|
+
{"version":3,"names":["_OxyServicesErrors","require","fedCMRequestInProgress","fedCMRequestPromise","currentMediationMode","OxyServicesFedCMMixin","Base","constructor","args","DEFAULT_CONFIG_URL","FEDCM_TIMEOUT","isFedCMSupported","window","navigator","signInWithFedCM","options","OxyAuthenticationError","nonce","generateNonce","clientId","getClientId","credential","requestIdentityCredential","configURL","context","token","session","exchangeIdTokenForSession","accessToken","httpService","setTokens","error","name","silentSignInWithFedCM","mediation","requestedMediation","isInteractive","controller","AbortController","timeout","setTimeout","abort","credentials","get","identity","providers","loginHint","signal","type","clearTimeout","idToken","makeRequest","id_token","cache","revokeFedCMCredential","IdentityCredential","logout","getFedCMConfig","enabled","crypto","randomUUID","Date","now","Math","random","toString","substring","location","origin"],"sourceRoot":"../../../../src","sources":["core/mixins/OxyServices.fedcm.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -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,26 +69,25 @@ 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
78
|
try {
|
|
74
|
-
// Try FedCM first (instant if user already signed in)
|
|
75
|
-
if (oxyServices.isFedCMSupported?.()) {
|
|
76
|
-
const fedcmSession = await oxyServices.signInWithFedCM?.();
|
|
77
|
-
if (fedcmSession?.user) {
|
|
78
|
-
return fedcmSession.user;
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
// Fallback to popup (opens auth.oxy.so in popup window)
|
|
83
79
|
const popupSession = await oxyServices.signInWithPopup?.();
|
|
84
80
|
if (popupSession?.user) {
|
|
81
|
+
// Update context state with the session (this updates user, sessions, storage)
|
|
82
|
+
await handlePopupSession(popupSession);
|
|
85
83
|
return popupSession.user;
|
|
86
84
|
}
|
|
87
|
-
throw new Error('Sign-in failed');
|
|
88
|
-
} catch (
|
|
89
|
-
|
|
90
|
-
|
|
85
|
+
throw new Error('Sign-in failed. Please try again.');
|
|
86
|
+
} catch (popupError) {
|
|
87
|
+
if (popupError instanceof Error && popupError.message.includes('blocked')) {
|
|
88
|
+
throw new Error('Popup blocked. Please allow popups for this site.');
|
|
89
|
+
}
|
|
90
|
+
throw popupError;
|
|
91
91
|
}
|
|
92
92
|
}
|
|
93
93
|
|
|
@@ -122,7 +122,7 @@ function useAuth() {
|
|
|
122
122
|
return new Promise(() => {}); // Never resolves, page will redirect
|
|
123
123
|
}
|
|
124
124
|
throw new Error('No authentication method available');
|
|
125
|
-
}, [oxySignIn, hasIdentity, getPublicKey, showBottomSheet, oxyServices]);
|
|
125
|
+
}, [oxySignIn, hasIdentity, getPublicKey, showBottomSheet, oxyServices, handlePopupSession]);
|
|
126
126
|
const signOut = (0, _react.useCallback)(async () => {
|
|
127
127
|
await logout();
|
|
128
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":[]}
|
|
@@ -5,6 +5,7 @@ import { OxyAuthenticationError } from "../OxyServices.errors.js";
|
|
|
5
5
|
// FedCM only allows one navigator.credentials.get request at a time
|
|
6
6
|
let fedCMRequestInProgress = false;
|
|
7
7
|
let fedCMRequestPromise = null;
|
|
8
|
+
let currentMediationMode = null;
|
|
8
9
|
|
|
9
10
|
/**
|
|
10
11
|
* Federated Credential Management (FedCM) Authentication Mixin
|
|
@@ -177,18 +178,36 @@ export function OxyServicesFedCMMixin(Base) {
|
|
|
177
178
|
* Uses a global lock to prevent concurrent requests, as FedCM only
|
|
178
179
|
* allows one navigator.credentials.get request at a time.
|
|
179
180
|
*
|
|
181
|
+
* Interactive requests (optional/required) wait for any silent request to finish first.
|
|
182
|
+
*
|
|
180
183
|
* @private
|
|
181
184
|
*/
|
|
182
185
|
async requestIdentityCredential(options) {
|
|
183
|
-
|
|
186
|
+
const requestedMediation = options.mediation || 'optional';
|
|
187
|
+
const isInteractive = requestedMediation !== 'silent';
|
|
188
|
+
|
|
189
|
+
// If a request is already in progress...
|
|
184
190
|
if (fedCMRequestInProgress && fedCMRequestPromise) {
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
191
|
+
// If current request is silent and new request is interactive,
|
|
192
|
+
// wait for silent to finish, then make the interactive request
|
|
193
|
+
if (currentMediationMode === 'silent' && isInteractive) {
|
|
194
|
+
try {
|
|
195
|
+
await fedCMRequestPromise;
|
|
196
|
+
} catch {
|
|
197
|
+
// Ignore silent request errors
|
|
198
|
+
}
|
|
199
|
+
// Now fall through to make the interactive request
|
|
200
|
+
} else {
|
|
201
|
+
// Same type of request - wait for the existing one
|
|
202
|
+
try {
|
|
203
|
+
return await fedCMRequestPromise;
|
|
204
|
+
} catch {
|
|
205
|
+
return null;
|
|
206
|
+
}
|
|
189
207
|
}
|
|
190
208
|
}
|
|
191
209
|
fedCMRequestInProgress = true;
|
|
210
|
+
currentMediationMode = requestedMediation;
|
|
192
211
|
const controller = new AbortController();
|
|
193
212
|
const timeout = setTimeout(() => controller.abort(), this.constructor.FEDCM_TIMEOUT);
|
|
194
213
|
fedCMRequestPromise = (async () => {
|
|
@@ -205,7 +224,7 @@ export function OxyServicesFedCMMixin(Base) {
|
|
|
205
224
|
})
|
|
206
225
|
}]
|
|
207
226
|
},
|
|
208
|
-
mediation:
|
|
227
|
+
mediation: requestedMediation,
|
|
209
228
|
signal: controller.signal
|
|
210
229
|
});
|
|
211
230
|
if (!credential || credential.type !== 'identity') {
|
|
@@ -218,6 +237,7 @@ export function OxyServicesFedCMMixin(Base) {
|
|
|
218
237
|
clearTimeout(timeout);
|
|
219
238
|
fedCMRequestInProgress = false;
|
|
220
239
|
fedCMRequestPromise = null;
|
|
240
|
+
currentMediationMode = null;
|
|
221
241
|
}
|
|
222
242
|
})();
|
|
223
243
|
return fedCMRequestPromise;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["OxyAuthenticationError","fedCMRequestInProgress","fedCMRequestPromise","OxyServicesFedCMMixin","Base","constructor","args","DEFAULT_CONFIG_URL","FEDCM_TIMEOUT","isFedCMSupported","window","navigator","signInWithFedCM","options","nonce","generateNonce","clientId","getClientId","credential","requestIdentityCredential","configURL","context","token","session","exchangeIdTokenForSession","accessToken","httpService","setTokens","error","name","silentSignInWithFedCM","mediation","controller","AbortController","timeout","setTimeout","abort","credentials","get","identity","providers","loginHint","signal","type","clearTimeout","idToken","makeRequest","id_token","cache","revokeFedCMCredential","IdentityCredential","logout","getFedCMConfig","enabled","crypto","randomUUID","Date","now","Math","random","toString","substring","location","origin","FedCMMixin"],"sourceRoot":"../../../../src","sources":["core/mixins/OxyServices.fedcm.ts"],"mappings":";;AACA,SAASA,sBAAsB,QAAQ,0BAAuB;AAc9D;AACA;AACA,IAAIC,sBAAsB,GAAG,KAAK;AAClC,IAAIC,mBAAwC,GAAG,IAAI;;
|
|
1
|
+
{"version":3,"names":["OxyAuthenticationError","fedCMRequestInProgress","fedCMRequestPromise","currentMediationMode","OxyServicesFedCMMixin","Base","constructor","args","DEFAULT_CONFIG_URL","FEDCM_TIMEOUT","isFedCMSupported","window","navigator","signInWithFedCM","options","nonce","generateNonce","clientId","getClientId","credential","requestIdentityCredential","configURL","context","token","session","exchangeIdTokenForSession","accessToken","httpService","setTokens","error","name","silentSignInWithFedCM","mediation","requestedMediation","isInteractive","controller","AbortController","timeout","setTimeout","abort","credentials","get","identity","providers","loginHint","signal","type","clearTimeout","idToken","makeRequest","id_token","cache","revokeFedCMCredential","IdentityCredential","logout","getFedCMConfig","enabled","crypto","randomUUID","Date","now","Math","random","toString","substring","location","origin","FedCMMixin"],"sourceRoot":"../../../../src","sources":["core/mixins/OxyServices.fedcm.ts"],"mappings":"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","ignoreList":[]}
|