@oxyhq/services 10.2.9 → 10.2.11
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/ui/components/ActingAsBanner.js +2 -1
- package/lib/commonjs/ui/components/ActingAsBanner.js.map +1 -1
- package/lib/commonjs/ui/components/StepBasedScreen.js +19 -10
- package/lib/commonjs/ui/components/StepBasedScreen.js.map +1 -1
- package/lib/commonjs/ui/context/hooks/useAuthOperations.js +38 -122
- package/lib/commonjs/ui/context/hooks/useAuthOperations.js.map +1 -1
- package/lib/commonjs/ui/hooks/mutations/useAccountMutations.js +9 -7
- package/lib/commonjs/ui/hooks/mutations/useAccountMutations.js.map +1 -1
- package/lib/commonjs/ui/hooks/useDeviceAccounts.js +20 -25
- package/lib/commonjs/ui/hooks/useDeviceAccounts.js.map +1 -1
- package/lib/commonjs/ui/hooks/useProfileEditing.js +19 -10
- package/lib/commonjs/ui/hooks/useProfileEditing.js.map +1 -1
- package/lib/commonjs/ui/screens/AppInfoScreen.js +1 -2
- package/lib/commonjs/ui/screens/AppInfoScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/AvatarCropScreen.js +52 -4
- package/lib/commonjs/ui/screens/AvatarCropScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/ConnectedAppsScreen.js +1 -2
- package/lib/commonjs/ui/screens/ConnectedAppsScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/EditProfileFieldScreen.js +11 -13
- package/lib/commonjs/ui/screens/EditProfileFieldScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/FeedbackScreen.js +2 -3
- package/lib/commonjs/ui/screens/FeedbackScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/HelpSupportScreen.js +2 -2
- package/lib/commonjs/ui/screens/HelpSupportScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/HistoryViewScreen.js +2 -2
- package/lib/commonjs/ui/screens/HistoryViewScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/LanguageSelectorScreen.js +2 -3
- package/lib/commonjs/ui/screens/LanguageSelectorScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/LegalDocumentsScreen.js +2 -2
- package/lib/commonjs/ui/screens/LegalDocumentsScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/ManageAccountScreen.js +1 -2
- package/lib/commonjs/ui/screens/ManageAccountScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/NotificationsScreen.js +2 -2
- package/lib/commonjs/ui/screens/NotificationsScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/PaymentGatewayScreen.js +2 -2
- package/lib/commonjs/ui/screens/PaymentGatewayScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/PreferencesScreen.js +2 -2
- package/lib/commonjs/ui/screens/PreferencesScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/ProfileScreen.js +4 -3
- package/lib/commonjs/ui/screens/ProfileScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/SavesCollectionsScreen.js +3 -4
- package/lib/commonjs/ui/screens/SavesCollectionsScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/trust/TrustCenterScreen.js +2 -2
- package/lib/commonjs/ui/screens/trust/TrustCenterScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/trust/TrustFAQScreen.js +2 -2
- package/lib/commonjs/ui/screens/trust/TrustFAQScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/trust/TrustRewardsScreen.js +2 -2
- package/lib/commonjs/ui/screens/trust/TrustRewardsScreen.js.map +1 -1
- package/lib/commonjs/ui/stores/authStore.js.map +1 -1
- package/lib/commonjs/ui/utils/avatarUtils.js +1 -1
- package/lib/commonjs/ui/utils/avatarUtils.js.map +1 -1
- package/lib/module/ui/components/ActingAsBanner.js +2 -1
- package/lib/module/ui/components/ActingAsBanner.js.map +1 -1
- package/lib/module/ui/components/StepBasedScreen.js +19 -10
- package/lib/module/ui/components/StepBasedScreen.js.map +1 -1
- package/lib/module/ui/context/hooks/useAuthOperations.js +38 -122
- package/lib/module/ui/context/hooks/useAuthOperations.js.map +1 -1
- package/lib/module/ui/hooks/mutations/useAccountMutations.js +9 -7
- package/lib/module/ui/hooks/mutations/useAccountMutations.js.map +1 -1
- package/lib/module/ui/hooks/useDeviceAccounts.js +20 -25
- package/lib/module/ui/hooks/useDeviceAccounts.js.map +1 -1
- package/lib/module/ui/hooks/useProfileEditing.js +19 -10
- package/lib/module/ui/hooks/useProfileEditing.js.map +1 -1
- package/lib/module/ui/screens/AppInfoScreen.js +1 -1
- package/lib/module/ui/screens/AppInfoScreen.js.map +1 -1
- package/lib/module/ui/screens/AvatarCropScreen.js +52 -4
- package/lib/module/ui/screens/AvatarCropScreen.js.map +1 -1
- package/lib/module/ui/screens/ConnectedAppsScreen.js +1 -1
- package/lib/module/ui/screens/ConnectedAppsScreen.js.map +1 -1
- package/lib/module/ui/screens/EditProfileFieldScreen.js +10 -11
- package/lib/module/ui/screens/EditProfileFieldScreen.js.map +1 -1
- package/lib/module/ui/screens/FeedbackScreen.js +1 -1
- package/lib/module/ui/screens/FeedbackScreen.js.map +1 -1
- package/lib/module/ui/screens/HelpSupportScreen.js +1 -1
- package/lib/module/ui/screens/HelpSupportScreen.js.map +1 -1
- package/lib/module/ui/screens/HistoryViewScreen.js +1 -1
- package/lib/module/ui/screens/HistoryViewScreen.js.map +1 -1
- package/lib/module/ui/screens/LanguageSelectorScreen.js +1 -1
- package/lib/module/ui/screens/LanguageSelectorScreen.js.map +1 -1
- package/lib/module/ui/screens/LegalDocumentsScreen.js +1 -1
- package/lib/module/ui/screens/LegalDocumentsScreen.js.map +1 -1
- package/lib/module/ui/screens/ManageAccountScreen.js +1 -1
- package/lib/module/ui/screens/ManageAccountScreen.js.map +1 -1
- package/lib/module/ui/screens/NotificationsScreen.js +1 -1
- package/lib/module/ui/screens/NotificationsScreen.js.map +1 -1
- package/lib/module/ui/screens/PaymentGatewayScreen.js +1 -1
- package/lib/module/ui/screens/PaymentGatewayScreen.js.map +1 -1
- package/lib/module/ui/screens/PreferencesScreen.js +1 -1
- package/lib/module/ui/screens/PreferencesScreen.js.map +1 -1
- package/lib/module/ui/screens/ProfileScreen.js +5 -4
- package/lib/module/ui/screens/ProfileScreen.js.map +1 -1
- package/lib/module/ui/screens/SavesCollectionsScreen.js +2 -3
- package/lib/module/ui/screens/SavesCollectionsScreen.js.map +1 -1
- package/lib/module/ui/screens/trust/TrustCenterScreen.js +1 -1
- package/lib/module/ui/screens/trust/TrustCenterScreen.js.map +1 -1
- package/lib/module/ui/screens/trust/TrustFAQScreen.js +1 -1
- package/lib/module/ui/screens/trust/TrustFAQScreen.js.map +1 -1
- package/lib/module/ui/screens/trust/TrustRewardsScreen.js +1 -1
- package/lib/module/ui/screens/trust/TrustRewardsScreen.js.map +1 -1
- package/lib/module/ui/stores/authStore.js.map +1 -1
- package/lib/module/ui/utils/avatarUtils.js +1 -1
- package/lib/module/ui/utils/avatarUtils.js.map +1 -1
- package/lib/typescript/commonjs/ui/components/ActingAsBanner.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/components/StepBasedScreen.d.ts +5 -3
- package/lib/typescript/commonjs/ui/components/StepBasedScreen.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/context/hooks/useAuthOperations.d.ts +1 -1
- package/lib/typescript/commonjs/ui/context/hooks/useAuthOperations.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/mutations/useAccountMutations.d.ts +52 -6
- package/lib/typescript/commonjs/ui/hooks/mutations/useAccountMutations.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/useDeviceAccounts.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/useProfileEditing.d.ts +22 -18
- package/lib/typescript/commonjs/ui/hooks/useProfileEditing.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/screens/AvatarCropScreen.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/screens/EditProfileFieldScreen.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/screens/SavesCollectionsScreen.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/stores/authStore.d.ts +2 -10
- package/lib/typescript/commonjs/ui/stores/authStore.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/types/navigation.d.ts +0 -1
- package/lib/typescript/commonjs/ui/types/navigation.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/utils/avatarUtils.d.ts +2 -1
- package/lib/typescript/commonjs/ui/utils/avatarUtils.d.ts.map +1 -1
- package/lib/typescript/module/ui/components/ActingAsBanner.d.ts.map +1 -1
- package/lib/typescript/module/ui/components/StepBasedScreen.d.ts +5 -3
- package/lib/typescript/module/ui/components/StepBasedScreen.d.ts.map +1 -1
- package/lib/typescript/module/ui/context/hooks/useAuthOperations.d.ts +1 -1
- package/lib/typescript/module/ui/context/hooks/useAuthOperations.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/mutations/useAccountMutations.d.ts +52 -6
- package/lib/typescript/module/ui/hooks/mutations/useAccountMutations.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/useDeviceAccounts.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/useProfileEditing.d.ts +22 -18
- package/lib/typescript/module/ui/hooks/useProfileEditing.d.ts.map +1 -1
- package/lib/typescript/module/ui/screens/AvatarCropScreen.d.ts.map +1 -1
- package/lib/typescript/module/ui/screens/EditProfileFieldScreen.d.ts.map +1 -1
- package/lib/typescript/module/ui/screens/SavesCollectionsScreen.d.ts.map +1 -1
- package/lib/typescript/module/ui/stores/authStore.d.ts +2 -10
- package/lib/typescript/module/ui/stores/authStore.d.ts.map +1 -1
- package/lib/typescript/module/ui/types/navigation.d.ts +0 -1
- package/lib/typescript/module/ui/types/navigation.d.ts.map +1 -1
- package/lib/typescript/module/ui/utils/avatarUtils.d.ts +2 -1
- package/lib/typescript/module/ui/utils/avatarUtils.d.ts.map +1 -1
- package/package.json +3 -2
- package/src/ui/components/ActingAsBanner.tsx +2 -4
- package/src/ui/components/StepBasedScreen.tsx +37 -22
- package/src/ui/context/hooks/useAuthOperations.ts +51 -144
- package/src/ui/hooks/mutations/useAccountMutations.ts +9 -8
- package/src/ui/hooks/useDeviceAccounts.ts +20 -24
- package/src/ui/hooks/useProfileEditing.ts +43 -30
- package/src/ui/screens/AppInfoScreen.tsx +1 -1
- package/src/ui/screens/AvatarCropScreen.tsx +67 -4
- package/src/ui/screens/ConnectedAppsScreen.tsx +1 -1
- package/src/ui/screens/EditProfileFieldScreen.tsx +24 -14
- package/src/ui/screens/FeedbackScreen.tsx +1 -1
- package/src/ui/screens/HelpSupportScreen.tsx +1 -1
- package/src/ui/screens/HistoryViewScreen.tsx +1 -1
- package/src/ui/screens/LanguageSelectorScreen.tsx +1 -1
- package/src/ui/screens/LegalDocumentsScreen.tsx +1 -1
- package/src/ui/screens/ManageAccountScreen.tsx +1 -1
- package/src/ui/screens/NotificationsScreen.tsx +1 -1
- package/src/ui/screens/PaymentGatewayScreen.tsx +1 -1
- package/src/ui/screens/PreferencesScreen.tsx +1 -1
- package/src/ui/screens/ProfileScreen.tsx +4 -4
- package/src/ui/screens/SavesCollectionsScreen.tsx +3 -6
- package/src/ui/screens/trust/TrustCenterScreen.tsx +1 -1
- package/src/ui/screens/trust/TrustFAQScreen.tsx +1 -1
- package/src/ui/screens/trust/TrustRewardsScreen.tsx +1 -1
- package/src/ui/stores/authStore.ts +4 -13
- package/src/ui/types/navigation.ts +0 -4
- package/src/ui/utils/avatarUtils.ts +3 -2
- package/lib/commonjs/ui/styles/spacing.js +0 -68
- package/lib/commonjs/ui/styles/spacing.js.map +0 -1
- package/lib/commonjs/ui/utils/themeUtils.js +0 -37
- package/lib/commonjs/ui/utils/themeUtils.js.map +0 -1
- package/lib/module/ui/styles/spacing.js +0 -16
- package/lib/module/ui/styles/spacing.js.map +0 -1
- package/lib/module/ui/utils/themeUtils.js +0 -13
- package/lib/module/ui/utils/themeUtils.js.map +0 -1
- package/lib/typescript/commonjs/ui/styles/spacing.d.ts +0 -13
- package/lib/typescript/commonjs/ui/styles/spacing.d.ts.map +0 -1
- package/lib/typescript/commonjs/ui/utils/themeUtils.d.ts +0 -11
- package/lib/typescript/commonjs/ui/utils/themeUtils.d.ts.map +0 -1
- package/lib/typescript/module/ui/styles/spacing.d.ts +0 -13
- package/lib/typescript/module/ui/styles/spacing.d.ts.map +0 -1
- package/lib/typescript/module/ui/utils/themeUtils.d.ts +0 -11
- package/lib/typescript/module/ui/utils/themeUtils.d.ts.map +0 -1
- package/src/ui/styles/spacing.ts +0 -22
- package/src/ui/utils/themeUtils.ts +0 -18
|
@@ -7,10 +7,13 @@ import { useTheme } from '@oxyhq/bloom/theme';
|
|
|
7
7
|
import { createAuthStyles } from "../styles/authStyles.js";
|
|
8
8
|
import { screenContentStyle } from "../constants/spacing.js";
|
|
9
9
|
import { useSafeAreaInsets } from 'react-native-safe-area-context';
|
|
10
|
-
|
|
11
|
-
/** Style map type used throughout step-based screens */
|
|
12
|
-
// biome-ignore lint/suspicious/noExplicitAny: styles object contains mixed ViewStyle/TextStyle with platform-specific properties
|
|
13
10
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
11
|
+
function isVoidCallback(value) {
|
|
12
|
+
return typeof value === 'function';
|
|
13
|
+
}
|
|
14
|
+
function isAuthenticatedCallback(value) {
|
|
15
|
+
return typeof value === 'function';
|
|
16
|
+
}
|
|
14
17
|
// Individual animated progress dot
|
|
15
18
|
const AnimatedProgressDot = ({
|
|
16
19
|
isActive,
|
|
@@ -360,15 +363,23 @@ const StepBasedScreen = ({
|
|
|
360
363
|
const currentStepConfig = steps[currentStep];
|
|
361
364
|
const CurrentStepComponent = currentStepConfig?.component;
|
|
362
365
|
const updateCurrentStepData = useCallback(data => updateStepData(currentStep, data), [currentStep, updateStepData]);
|
|
366
|
+
const normalizedTheme = typeof theme === 'string' ? theme : undefined;
|
|
367
|
+
const normalizedGoBack = isVoidCallback(goBack) ? goBack : undefined;
|
|
368
|
+
const normalizedOnAuthenticated = isAuthenticatedCallback(onAuthenticated) ? onAuthenticated : undefined;
|
|
369
|
+
const baseStepProps = useMemo(() => ({
|
|
370
|
+
theme: normalizedTheme,
|
|
371
|
+
navigate,
|
|
372
|
+
goBack: normalizedGoBack,
|
|
373
|
+
onAuthenticated: normalizedOnAuthenticated
|
|
374
|
+
}), [normalizedTheme, navigate, normalizedGoBack, normalizedOnAuthenticated]);
|
|
363
375
|
const stepProps = useMemo(() => ({
|
|
364
376
|
...currentStepConfig?.props,
|
|
377
|
+
// Step data - spread before base props so navigation/auth props remain stable.
|
|
378
|
+
...state.stepData[currentStep],
|
|
365
379
|
// Common props
|
|
380
|
+
...baseStepProps,
|
|
366
381
|
colors,
|
|
367
382
|
styles,
|
|
368
|
-
theme,
|
|
369
|
-
navigate,
|
|
370
|
-
goBack,
|
|
371
|
-
onAuthenticated,
|
|
372
383
|
oxyServices,
|
|
373
384
|
// Step navigation
|
|
374
385
|
nextStep,
|
|
@@ -376,12 +387,10 @@ const StepBasedScreen = ({
|
|
|
376
387
|
goToStep,
|
|
377
388
|
currentStep: currentStep,
|
|
378
389
|
totalSteps: steps.length,
|
|
379
|
-
// Step data - spread the step data properties directly as props
|
|
380
|
-
...state.stepData[currentStep],
|
|
381
390
|
// Step data management
|
|
382
391
|
updateStepData: updateCurrentStepData,
|
|
383
392
|
allStepData: state.stepData
|
|
384
|
-
}), [currentStepConfig?.props, colors, styles,
|
|
393
|
+
}), [currentStepConfig?.props, baseStepProps, colors, styles, oxyServices, nextStep, prevStep, goToStep, currentStep, state.stepData, steps.length, updateCurrentStepData]);
|
|
385
394
|
|
|
386
395
|
// Pure content wrapper - all layout is handled by BottomSheetRouter
|
|
387
396
|
// This component only renders content, no layout calculations
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useState","useRef","useCallback","useMemo","useEffect","View","Platform","Animated","useSharedValue","useAnimatedStyle","withTiming","useTheme","createAuthStyles","screenContentStyle","useSafeAreaInsets","jsx","_jsx","jsxs","_jsxs","AnimatedProgressDot","isActive","colors","styles","width","backgroundColor","primary","border","value","duration","animatedStyle","style","progressDot","ProgressIndicator","currentStep","totalSteps","progressContainer","children","Array","from","length","_","index","StepBasedScreen","steps","initialStep","showProgressIndicator","enableAnimations","onStepChange","onComplete","stepData","navigate","goBack","onAuthenticated","theme","oxyServices","stepControllerRef","currentScreen","getNavigationProps","state","setState","bloomTheme","themeString","mode","authColors","text","background","inputBackground","backgroundSecondary","placeholder","textTertiary","error","success","warning","secondaryText","textSecondary","insets","modernHeader","alignItems","marginBottom","modernTitle","fontWeight","OS","undefined","fontSize","lineHeight","textAlign","modernSubtitle","opacity","modernInputContainer","button","flexDirection","justifyContent","paddingVertical","paddingHorizontal","borderRadius","marginVertical","gap","select","web","boxShadow","default","shadowOffset","height","shadowOpacity","shadowRadius","elevation","buttonText","color","card","letterSpacing","footerText","footerTextContainer","marginTop","linkText","textDecorationLine","marginHorizontal","onStepChangeRef","onCompleteRef","current","prevState","updateStepData","stepIndex","data","prev","nextStepData","slice","__DEV__","console","warn","currentStepConfig","onEnter","onExit","nextStep","canProceed","nextStepIndex","navigationProps","extractedProps","Object","assign","step0Data","currentStepData","username","userProfile","email","prevStep","goToStep","canGoBack","CurrentStepComponent","component","updateCurrentStepData","stepProps","props","allStepData","contentStyle","paddingBottom","bottom","stepContainer"],"sourceRoot":"../../../../src","sources":["ui/components/StepBasedScreen.tsx"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["useState","useRef","useCallback","useMemo","useEffect","View","Platform","Animated","useSharedValue","useAnimatedStyle","withTiming","useTheme","createAuthStyles","screenContentStyle","useSafeAreaInsets","jsx","_jsx","jsxs","_jsxs","isVoidCallback","value","isAuthenticatedCallback","AnimatedProgressDot","isActive","colors","styles","width","backgroundColor","primary","border","duration","animatedStyle","style","progressDot","ProgressIndicator","currentStep","totalSteps","progressContainer","children","Array","from","length","_","index","StepBasedScreen","steps","initialStep","showProgressIndicator","enableAnimations","onStepChange","onComplete","stepData","navigate","goBack","onAuthenticated","theme","oxyServices","stepControllerRef","currentScreen","getNavigationProps","state","setState","bloomTheme","themeString","mode","authColors","text","background","inputBackground","backgroundSecondary","placeholder","textTertiary","error","success","warning","secondaryText","textSecondary","insets","modernHeader","alignItems","marginBottom","modernTitle","fontWeight","OS","undefined","fontSize","lineHeight","textAlign","modernSubtitle","opacity","modernInputContainer","button","flexDirection","justifyContent","paddingVertical","paddingHorizontal","borderRadius","marginVertical","gap","select","web","boxShadow","default","shadowOffset","height","shadowOpacity","shadowRadius","elevation","buttonText","color","card","letterSpacing","footerText","footerTextContainer","marginTop","linkText","textDecorationLine","marginHorizontal","onStepChangeRef","onCompleteRef","current","prevState","updateStepData","stepIndex","data","prev","nextStepData","slice","__DEV__","console","warn","currentStepConfig","onEnter","onExit","nextStep","canProceed","nextStepIndex","navigationProps","extractedProps","Object","assign","step0Data","currentStepData","username","userProfile","email","prevStep","goToStep","canGoBack","CurrentStepComponent","component","updateCurrentStepData","normalizedTheme","normalizedGoBack","normalizedOnAuthenticated","baseStepProps","stepProps","props","allStepData","contentStyle","paddingBottom","bottom","stepContainer"],"sourceRoot":"../../../../src","sources":["ui/components/StepBasedScreen.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -7,11 +7,6 @@ import { handleAuthError, isInvalidSessionError } from "../../utils/errorHandler
|
|
|
7
7
|
import { SignatureService } from '@oxyhq/core';
|
|
8
8
|
import { isWebBrowser } from "../../hooks/useWebSSO.js";
|
|
9
9
|
import { clearActiveAuthuser, clearSsoBounceState } from "../../utils/activeAuthuser.js";
|
|
10
|
-
|
|
11
|
-
/** Type guard for error objects with optional code and status properties */
|
|
12
|
-
function isErrorWithCodeOrStatus(error) {
|
|
13
|
-
return typeof error === 'object' && error !== null;
|
|
14
|
-
}
|
|
15
10
|
const LOGIN_ERROR_CODE = 'LOGIN_ERROR';
|
|
16
11
|
const LOGOUT_ERROR_CODE = 'LOGOUT_ERROR';
|
|
17
12
|
const LOGOUT_ALL_ERROR_CODE = 'LOGOUT_ALL_ERROR';
|
|
@@ -22,7 +17,6 @@ const LOGOUT_ALL_ERROR_CODE = 'LOGOUT_ALL_ERROR';
|
|
|
22
17
|
*/
|
|
23
18
|
export const useAuthOperations = ({
|
|
24
19
|
oxyServices,
|
|
25
|
-
storage,
|
|
26
20
|
sessions,
|
|
27
21
|
activeSessionId,
|
|
28
22
|
setActiveSessionId,
|
|
@@ -44,36 +38,15 @@ export const useAuthOperations = ({
|
|
|
44
38
|
sessionsRef.current = sessions;
|
|
45
39
|
|
|
46
40
|
/**
|
|
47
|
-
* Internal function to perform challenge-response sign in
|
|
41
|
+
* Internal function to perform challenge-response sign in.
|
|
48
42
|
*/
|
|
49
43
|
const performSignIn = useCallback(async publicKey => {
|
|
50
44
|
const deviceFingerprintObj = DeviceManager.getDeviceFingerprint();
|
|
51
45
|
const deviceFingerprint = JSON.stringify(deviceFingerprintObj);
|
|
52
46
|
const deviceInfo = await DeviceManager.getDeviceInfo();
|
|
53
47
|
const deviceName = deviceInfo.deviceName || DeviceManager.getDefaultDeviceName();
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
// Try to request challenge from server (online)
|
|
58
|
-
try {
|
|
59
|
-
const challengeResponse = await oxyServices.requestChallenge(publicKey);
|
|
60
|
-
challenge = challengeResponse.challenge;
|
|
61
|
-
} catch (error) {
|
|
62
|
-
// Network error - generate challenge locally for offline sign-in
|
|
63
|
-
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
64
|
-
const isNetworkError = errorMessage.includes('Network') || errorMessage.includes('network') || errorMessage.includes('Failed to fetch') || errorMessage.includes('fetch failed') || isErrorWithCodeOrStatus(error) && error.code === 'NETWORK_ERROR' || isErrorWithCodeOrStatus(error) && error.status === 0;
|
|
65
|
-
if (isNetworkError) {
|
|
66
|
-
if (__DEV__ && logger) {
|
|
67
|
-
logger('Network unavailable, performing offline sign-in');
|
|
68
|
-
}
|
|
69
|
-
// Generate challenge locally
|
|
70
|
-
challenge = await SignatureService.generateChallenge();
|
|
71
|
-
isOffline = true;
|
|
72
|
-
} else {
|
|
73
|
-
// Re-throw non-network errors
|
|
74
|
-
throw error;
|
|
75
|
-
}
|
|
76
|
-
}
|
|
48
|
+
const challengeResponse = await oxyServices.requestChallenge(publicKey);
|
|
49
|
+
const challenge = challengeResponse.challenge;
|
|
77
50
|
|
|
78
51
|
// Note: Biometric authentication check should be handled by the app layer
|
|
79
52
|
// (e.g., accounts app) before calling signIn. The biometric preference is stored
|
|
@@ -86,115 +59,58 @@ export const useAuthOperations = ({
|
|
|
86
59
|
} = await SignatureService.signChallenge(challenge);
|
|
87
60
|
let fullUser;
|
|
88
61
|
let sessionResponse;
|
|
89
|
-
if (isOffline) {
|
|
90
|
-
// Offline sign-in: create local session and minimal user object
|
|
91
|
-
if (__DEV__ && logger) {
|
|
92
|
-
logger('Creating offline session');
|
|
93
|
-
}
|
|
94
62
|
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
const expiresAt = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString(); // 7 days
|
|
63
|
+
// `verifyChallenge` plants the first access token internally, mirroring
|
|
64
|
+
// `claimSessionByToken`, so the client is authenticated as soon as this
|
|
65
|
+
// resolves.
|
|
66
|
+
sessionResponse = await oxyServices.verifyChallenge(publicKey, challenge, signature, timestamp, deviceName, deviceFingerprint);
|
|
100
67
|
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
id: publicKey,
|
|
104
|
-
// Use publicKey as id (per migration document)
|
|
105
|
-
publicKey,
|
|
106
|
-
username: '',
|
|
107
|
-
privacySettings: {}
|
|
108
|
-
};
|
|
109
|
-
sessionResponse = {
|
|
110
|
-
sessionId: localSessionId,
|
|
111
|
-
deviceId: localDeviceId,
|
|
112
|
-
expiresAt,
|
|
113
|
-
user: {
|
|
114
|
-
id: publicKey,
|
|
115
|
-
username: ''
|
|
116
|
-
}
|
|
117
|
-
};
|
|
68
|
+
// Get full user data
|
|
69
|
+
fullUser = await oxyServices.getUserBySession(sessionResponse.sessionId);
|
|
118
70
|
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
isCurrent: true
|
|
127
|
-
};
|
|
128
|
-
setActiveSessionId(localSessionId);
|
|
129
|
-
await saveActiveSessionId(localSessionId);
|
|
130
|
-
updateSessions([offlineSession], {
|
|
131
|
-
merge: true
|
|
71
|
+
// Fetch device sessions
|
|
72
|
+
let allDeviceSessions = [];
|
|
73
|
+
try {
|
|
74
|
+
allDeviceSessions = await fetchSessionsWithFallback(oxyServices, sessionResponse.sessionId, {
|
|
75
|
+
fallbackDeviceId: sessionResponse.deviceId,
|
|
76
|
+
fallbackUserId: fullUser.id,
|
|
77
|
+
logger
|
|
132
78
|
});
|
|
133
|
-
|
|
134
|
-
// Mark session as offline for later sync
|
|
135
|
-
if (storage) {
|
|
136
|
-
await storage.setItem(`oxy_session_${localSessionId}_offline`, 'true');
|
|
137
|
-
}
|
|
79
|
+
} catch (error) {
|
|
138
80
|
if (__DEV__ && logger) {
|
|
139
|
-
logger('
|
|
81
|
+
logger('Failed to fetch device sessions after login', error);
|
|
140
82
|
}
|
|
141
|
-
}
|
|
142
|
-
// Online sign-in: use normal flow.
|
|
143
|
-
// Verify and create session. `verifyChallenge` plants the first
|
|
144
|
-
// access token (and refresh token) from the `/auth/verify` response
|
|
145
|
-
// body internally — mirroring `claimSessionByToken` — so the client is
|
|
146
|
-
// authenticated as soon as this resolves. Session IDs are not public
|
|
147
|
-
// token-minting credentials; a token-less verify response simply leaves
|
|
148
|
-
// the client without a bearer here.
|
|
149
|
-
sessionResponse = await oxyServices.verifyChallenge(publicKey, challenge, signature, timestamp, deviceName, deviceFingerprint);
|
|
150
|
-
|
|
151
|
-
// Get full user data
|
|
152
|
-
fullUser = await oxyServices.getUserBySession(sessionResponse.sessionId);
|
|
83
|
+
}
|
|
153
84
|
|
|
154
|
-
|
|
155
|
-
|
|
85
|
+
// Check for existing session for same user and switch to it to avoid duplicates
|
|
86
|
+
const existingSession = allDeviceSessions.find(session => session.userId?.toString() === fullUser.id?.toString() && session.sessionId !== sessionResponse.sessionId);
|
|
87
|
+
if (existingSession) {
|
|
88
|
+
// Switch to existing session instead of creating duplicate
|
|
156
89
|
try {
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
logger
|
|
161
|
-
});
|
|
162
|
-
} catch (error) {
|
|
90
|
+
await oxyServices.logoutSession(sessionResponse.sessionId, sessionResponse.sessionId);
|
|
91
|
+
} catch (logoutError) {
|
|
92
|
+
// Non-critical - continue to switch session even if logout fails
|
|
163
93
|
if (__DEV__ && logger) {
|
|
164
|
-
logger('Failed to
|
|
165
|
-
}
|
|
166
|
-
}
|
|
167
|
-
|
|
168
|
-
// Check for existing session for same user and switch to it to avoid duplicates
|
|
169
|
-
const existingSession = allDeviceSessions.find(session => session.userId?.toString() === fullUser.id?.toString() && session.sessionId !== sessionResponse.sessionId);
|
|
170
|
-
if (existingSession) {
|
|
171
|
-
// Switch to existing session instead of creating duplicate
|
|
172
|
-
try {
|
|
173
|
-
await oxyServices.logoutSession(sessionResponse.sessionId, sessionResponse.sessionId);
|
|
174
|
-
} catch (logoutError) {
|
|
175
|
-
// Non-critical - continue to switch session even if logout fails
|
|
176
|
-
if (__DEV__ && logger) {
|
|
177
|
-
logger('Failed to logout duplicate session, continuing with switch', logoutError);
|
|
178
|
-
}
|
|
94
|
+
logger('Failed to logout duplicate session, continuing with switch', logoutError);
|
|
179
95
|
}
|
|
180
|
-
await switchSession(existingSession.sessionId);
|
|
181
|
-
updateSessions(allDeviceSessions.filter(session => session.sessionId !== sessionResponse.sessionId), {
|
|
182
|
-
merge: false
|
|
183
|
-
});
|
|
184
|
-
onAuthStateChange?.(fullUser);
|
|
185
|
-
return fullUser;
|
|
186
96
|
}
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
merge: true
|
|
97
|
+
await switchSession(existingSession.sessionId);
|
|
98
|
+
updateSessions(allDeviceSessions.filter(session => session.sessionId !== sessionResponse.sessionId), {
|
|
99
|
+
merge: false
|
|
191
100
|
});
|
|
101
|
+
onAuthStateChange?.(fullUser);
|
|
102
|
+
return fullUser;
|
|
192
103
|
}
|
|
104
|
+
setActiveSessionId(sessionResponse.sessionId);
|
|
105
|
+
await saveActiveSessionId(sessionResponse.sessionId);
|
|
106
|
+
updateSessions(allDeviceSessions, {
|
|
107
|
+
merge: true
|
|
108
|
+
});
|
|
193
109
|
await applyLanguagePreference(fullUser);
|
|
194
110
|
loginSuccess(fullUser);
|
|
195
111
|
onAuthStateChange?.(fullUser);
|
|
196
112
|
return fullUser;
|
|
197
|
-
}, [applyLanguagePreference, logger, loginSuccess, onAuthStateChange, oxyServices, saveActiveSessionId, setActiveSessionId, switchSession, updateSessions
|
|
113
|
+
}, [applyLanguagePreference, logger, loginSuccess, onAuthStateChange, oxyServices, saveActiveSessionId, setActiveSessionId, switchSession, updateSessions]);
|
|
198
114
|
|
|
199
115
|
/**
|
|
200
116
|
* Sign in with existing public key
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useRef","DeviceManager","fetchSessionsWithFallback","handleAuthError","isInvalidSessionError","SignatureService","isWebBrowser","clearActiveAuthuser","clearSsoBounceState","
|
|
1
|
+
{"version":3,"names":["useCallback","useRef","DeviceManager","fetchSessionsWithFallback","handleAuthError","isInvalidSessionError","SignatureService","isWebBrowser","clearActiveAuthuser","clearSsoBounceState","LOGIN_ERROR_CODE","LOGOUT_ERROR_CODE","LOGOUT_ALL_ERROR_CODE","useAuthOperations","oxyServices","sessions","activeSessionId","setActiveSessionId","updateSessions","saveActiveSessionId","clearSessionState","switchSession","applyLanguagePreference","onAuthStateChange","onError","loginSuccess","loginFailure","logoutStore","setAuthState","logger","sessionsRef","current","performSignIn","publicKey","deviceFingerprintObj","getDeviceFingerprint","deviceFingerprint","JSON","stringify","deviceInfo","getDeviceInfo","deviceName","getDefaultDeviceName","challengeResponse","requestChallenge","challenge","signature","timestamp","signChallenge","fullUser","sessionResponse","verifyChallenge","getUserBySession","sessionId","allDeviceSessions","fallbackDeviceId","deviceId","fallbackUserId","id","error","__DEV__","existingSession","find","session","userId","toString","logoutSession","logoutError","filter","merge","signIn","isLoading","message","defaultMessage","code","setAuthError","msg","logout","targetSessionId","sessionToLogout","targetSession","s","targetAuthuser","authuser","logoutSessionByAuthuser","filteredSessions","length","isInvalid","status","undefined","logoutAll","Error","logoutAllSessionsViaCookie","logoutAllSessions"],"sourceRoot":"../../../../../src","sources":["ui/context/hooks/useAuthOperations.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -36,17 +36,19 @@ export const useUpdateProfile = () => {
|
|
|
36
36
|
|
|
37
37
|
// Optimistically update
|
|
38
38
|
if (previousUser) {
|
|
39
|
-
|
|
39
|
+
const optimisticUser = {
|
|
40
40
|
...previousUser,
|
|
41
|
-
...updates
|
|
42
|
-
|
|
41
|
+
...updates,
|
|
42
|
+
name: updates.name ? {
|
|
43
|
+
...previousUser.name,
|
|
44
|
+
...updates.name
|
|
45
|
+
} : previousUser.name
|
|
46
|
+
};
|
|
47
|
+
queryClient.setQueryData(queryKeys.accounts.current(), optimisticUser);
|
|
43
48
|
|
|
44
49
|
// Also update profile query if sessionId is available
|
|
45
50
|
if (activeSessionId) {
|
|
46
|
-
queryClient.setQueryData(queryKeys.users.profile(activeSessionId),
|
|
47
|
-
...previousUser,
|
|
48
|
-
...updates
|
|
49
|
-
});
|
|
51
|
+
queryClient.setQueryData(queryKeys.users.profile(activeSessionId), optimisticUser);
|
|
50
52
|
}
|
|
51
53
|
}
|
|
52
54
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useMutation","useQueryClient","authenticatedApiCall","queryKeys","invalidateAccountQueries","invalidateConnectedAppsQueries","invalidateUserQueries","invalidateSessionQueries","mutationKeys","useOxy","toast","refreshAvatarInStore","useAuthStore","useUpdateProfile","oxyServices","activeSessionId","user","queryClient","mutationKey","account","updateProfile","mutationFn","updates","onMutate","cancelQueries","queryKey","accounts","current","previousUser","getQueryData","setQueryData","users","profile","onError","error","context","changedKeys","Object","keys","partialRollback","reduce","acc","key","currentProfile","Error","message","onSuccess","data","getState","setUser","avatar","useUploadAvatar","uploadAvatar","file","uploadResult","assetUpload","fileId","id","optimisticUser","uri","_file","previousAvatar","success","useUpdateAccountSettings","mutation","updateSettings","currentUser","userId","updatedPrivacy","updatePrivacySettings","privacySettings","settings","previousPrivacy","partialPrivacyRollback","onSettled","invalidateQueries","mutate","mutateAsync","useUpdatePrivacySettings","targetUserId","privacy","previousPrivacySettings","length","currentPrivacy","incoming","requested","previous","updatedUser","useUpdateNotificationPreferences","updateNotificationPreferences","preferences","notificationPreferences","_preferences","useUpdateUserPreferences","updateUserPreferences","userPreferences","useRevokeAuthorizedApp","connectedApps","revoke","origin","revokeAuthorizedApp","useUploadFile","uploadFile","visibility","metadata","onProgress"],"sourceRoot":"../../../../../src","sources":["ui/hooks/mutations/useAccountMutations.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["useMutation","useQueryClient","authenticatedApiCall","queryKeys","invalidateAccountQueries","invalidateConnectedAppsQueries","invalidateUserQueries","invalidateSessionQueries","mutationKeys","useOxy","toast","refreshAvatarInStore","useAuthStore","useUpdateProfile","oxyServices","activeSessionId","user","queryClient","mutationKey","account","updateProfile","mutationFn","updates","onMutate","cancelQueries","queryKey","accounts","current","previousUser","getQueryData","optimisticUser","name","setQueryData","users","profile","onError","error","context","changedKeys","Object","keys","partialRollback","reduce","acc","key","currentProfile","Error","message","onSuccess","data","getState","setUser","avatar","useUploadAvatar","uploadAvatar","file","uploadResult","assetUpload","fileId","id","uri","_file","previousAvatar","success","useUpdateAccountSettings","mutation","updateSettings","currentUser","userId","updatedPrivacy","updatePrivacySettings","privacySettings","settings","previousPrivacy","partialPrivacyRollback","onSettled","invalidateQueries","mutate","mutateAsync","useUpdatePrivacySettings","targetUserId","privacy","previousPrivacySettings","length","currentPrivacy","incoming","requested","previous","updatedUser","useUpdateNotificationPreferences","updateNotificationPreferences","preferences","notificationPreferences","_preferences","useUpdateUserPreferences","updateUserPreferences","userPreferences","useRevokeAuthorizedApp","connectedApps","revoke","origin","revokeAuthorizedApp","useUploadFile","uploadFile","visibility","metadata","onProgress"],"sourceRoot":"../../../../../src","sources":["ui/hooks/mutations/useAccountMutations.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -198,19 +198,16 @@ export function useDeviceAccounts() {
|
|
|
198
198
|
let built;
|
|
199
199
|
if (fromSharedApex) {
|
|
200
200
|
// Shared apex path: every entry carries a real per-account user.
|
|
201
|
-
built = sharedAccounts.
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
const accountUser = entry.user
|
|
206
|
-
id: '',
|
|
207
|
-
username: ''
|
|
208
|
-
};
|
|
201
|
+
built = sharedAccounts.flatMap(entry => {
|
|
202
|
+
if (!entry.user) {
|
|
203
|
+
return [];
|
|
204
|
+
}
|
|
205
|
+
const accountUser = entry.user;
|
|
209
206
|
const displayName = getAccountDisplayName(accountUser, locale);
|
|
210
207
|
const handle = getAccountFallbackHandle(accountUser);
|
|
211
|
-
const email = entry.user
|
|
208
|
+
const email = entry.user.email ?? null;
|
|
212
209
|
const secondaryHandle = handle ? `@${handle}` : null;
|
|
213
|
-
return {
|
|
210
|
+
return [{
|
|
214
211
|
sessionId: entry.sessionId,
|
|
215
212
|
authuser: entry.authuser,
|
|
216
213
|
// Provisional; finalised by `markCurrentAccount` below so the
|
|
@@ -220,38 +217,36 @@ export function useDeviceAccounts() {
|
|
|
220
217
|
// Real email, or null (NEVER synthesized). The UI uses the
|
|
221
218
|
// `@handle` line only when email is genuinely absent.
|
|
222
219
|
email: email ?? secondaryHandle,
|
|
223
|
-
avatarUrl: resolveAvatarUrl(entry.user
|
|
224
|
-
color: entry.user
|
|
220
|
+
avatarUrl: resolveAvatarUrl(entry.user.avatar),
|
|
221
|
+
color: entry.user.color ?? null,
|
|
225
222
|
user: accountUser
|
|
226
|
-
};
|
|
223
|
+
}];
|
|
227
224
|
});
|
|
228
225
|
} else {
|
|
229
226
|
// Local fallback path: build from the SDK's multi-session store. The
|
|
230
227
|
// active session row gets the full loaded `user`; inactive fallback
|
|
231
228
|
// rows carry only what the `ClientSession` exposes (no synthesized
|
|
232
229
|
// identity — they show the active user's data only when active).
|
|
233
|
-
built = (sessions ?? []).
|
|
230
|
+
built = (sessions ?? []).flatMap(session => {
|
|
234
231
|
const isCurrent = session.sessionId === activeSessionId;
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
232
|
+
if (!isCurrent || !user) {
|
|
233
|
+
return [];
|
|
234
|
+
}
|
|
235
|
+
const accountUser = user;
|
|
239
236
|
const displayName = getAccountDisplayName(accountUser, locale);
|
|
240
237
|
const handle = getAccountFallbackHandle(accountUser);
|
|
241
|
-
const email =
|
|
238
|
+
const email = user.email ?? null;
|
|
242
239
|
const secondaryHandle = handle ? `@${handle}` : null;
|
|
243
|
-
|
|
244
|
-
const color = isCurrent && user?.color ? user.color : null;
|
|
245
|
-
return {
|
|
240
|
+
return [{
|
|
246
241
|
sessionId: session.sessionId,
|
|
247
242
|
authuser: session.authuser,
|
|
248
243
|
isCurrent,
|
|
249
244
|
displayName,
|
|
250
245
|
email: email ?? secondaryHandle,
|
|
251
|
-
avatarUrl: resolveAvatarUrl(avatar),
|
|
252
|
-
color,
|
|
246
|
+
avatarUrl: resolveAvatarUrl(user.avatar),
|
|
247
|
+
color: user.color ?? null,
|
|
253
248
|
user: accountUser
|
|
254
|
-
};
|
|
249
|
+
}];
|
|
255
250
|
});
|
|
256
251
|
}
|
|
257
252
|
|