@oxy.so/services 13.6.0 → 13.7.0
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/AccountLanguageBoundary.js +35 -0
- package/lib/commonjs/ui/components/AccountLanguageBoundary.js.map +1 -0
- package/lib/commonjs/ui/components/LanguageBridge.js +37 -34
- package/lib/commonjs/ui/components/LanguageBridge.js.map +1 -1
- package/lib/commonjs/ui/components/OxyProvider.js +19 -26
- package/lib/commonjs/ui/components/OxyProvider.js.map +1 -1
- package/lib/commonjs/ui/components/signIn/OxySignUpPanel.js +8 -2
- package/lib/commonjs/ui/components/signIn/OxySignUpPanel.js.map +1 -1
- package/lib/commonjs/ui/context/OxyContext.js +19 -2
- package/lib/commonjs/ui/context/OxyContext.js.map +1 -1
- package/lib/commonjs/ui/hooks/useEntryLink.js +97 -0
- package/lib/commonjs/ui/hooks/useEntryLink.js.map +1 -0
- package/lib/commonjs/ui/hooks/useLanguageManagement.js +45 -14
- package/lib/commonjs/ui/hooks/useLanguageManagement.js.map +1 -1
- package/lib/commonjs/ui/utils/entryLink.js +54 -0
- package/lib/commonjs/ui/utils/entryLink.js.map +1 -0
- package/lib/module/ui/components/AccountLanguageBoundary.js +32 -0
- package/lib/module/ui/components/AccountLanguageBoundary.js.map +1 -0
- package/lib/module/ui/components/LanguageBridge.js +38 -35
- package/lib/module/ui/components/LanguageBridge.js.map +1 -1
- package/lib/module/ui/components/OxyProvider.js +18 -27
- package/lib/module/ui/components/OxyProvider.js.map +1 -1
- package/lib/module/ui/components/signIn/OxySignUpPanel.js +8 -2
- package/lib/module/ui/components/signIn/OxySignUpPanel.js.map +1 -1
- package/lib/module/ui/context/OxyContext.js +19 -2
- package/lib/module/ui/context/OxyContext.js.map +1 -1
- package/lib/module/ui/hooks/useEntryLink.js +94 -0
- package/lib/module/ui/hooks/useEntryLink.js.map +1 -0
- package/lib/module/ui/hooks/useLanguageManagement.js +45 -14
- package/lib/module/ui/hooks/useLanguageManagement.js.map +1 -1
- package/lib/module/ui/utils/entryLink.js +49 -0
- package/lib/module/ui/utils/entryLink.js.map +1 -0
- package/lib/typescript/commonjs/ui/components/AccountLanguageBoundary.d.ts +8 -0
- package/lib/typescript/commonjs/ui/components/AccountLanguageBoundary.d.ts.map +1 -0
- package/lib/typescript/commonjs/ui/components/LanguageBridge.d.ts +7 -17
- package/lib/typescript/commonjs/ui/components/LanguageBridge.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/components/OxyProvider.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/components/signIn/OxySignUpPanel.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/context/OxyContext.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/context/oxyContextTypes.d.ts +5 -0
- package/lib/typescript/commonjs/ui/context/oxyContextTypes.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/useEntryLink.d.ts +15 -0
- package/lib/typescript/commonjs/ui/hooks/useEntryLink.d.ts.map +1 -0
- package/lib/typescript/commonjs/ui/hooks/useLanguageManagement.d.ts +5 -1
- package/lib/typescript/commonjs/ui/hooks/useLanguageManagement.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/types/navigation.d.ts +4 -0
- package/lib/typescript/commonjs/ui/types/navigation.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/utils/entryLink.d.ts +8 -0
- package/lib/typescript/commonjs/ui/utils/entryLink.d.ts.map +1 -0
- package/lib/typescript/module/ui/components/AccountLanguageBoundary.d.ts +8 -0
- package/lib/typescript/module/ui/components/AccountLanguageBoundary.d.ts.map +1 -0
- package/lib/typescript/module/ui/components/LanguageBridge.d.ts +7 -17
- package/lib/typescript/module/ui/components/LanguageBridge.d.ts.map +1 -1
- package/lib/typescript/module/ui/components/OxyProvider.d.ts.map +1 -1
- package/lib/typescript/module/ui/components/signIn/OxySignUpPanel.d.ts.map +1 -1
- package/lib/typescript/module/ui/context/OxyContext.d.ts.map +1 -1
- package/lib/typescript/module/ui/context/oxyContextTypes.d.ts +5 -0
- package/lib/typescript/module/ui/context/oxyContextTypes.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/useEntryLink.d.ts +15 -0
- package/lib/typescript/module/ui/hooks/useEntryLink.d.ts.map +1 -0
- package/lib/typescript/module/ui/hooks/useLanguageManagement.d.ts +5 -1
- package/lib/typescript/module/ui/hooks/useLanguageManagement.d.ts.map +1 -1
- package/lib/typescript/module/ui/types/navigation.d.ts +4 -0
- package/lib/typescript/module/ui/types/navigation.d.ts.map +1 -1
- package/lib/typescript/module/ui/utils/entryLink.d.ts +8 -0
- package/lib/typescript/module/ui/utils/entryLink.d.ts.map +1 -0
- package/package.json +5 -5
- package/src/ui/components/AccountLanguageBoundary.tsx +35 -0
- package/src/ui/components/LanguageBridge.tsx +43 -39
- package/src/ui/components/OxyProvider.tsx +18 -24
- package/src/ui/components/__tests__/AccountLanguageBoundary.test.tsx +87 -0
- package/src/ui/components/__tests__/LanguageBridge.test.tsx +80 -60
- package/src/ui/components/signIn/OxySignUpPanel.tsx +9 -1
- package/src/ui/context/OxyContext.tsx +21 -1
- package/src/ui/context/oxyContextTypes.ts +5 -0
- package/src/ui/hooks/useEntryLink.ts +103 -0
- package/src/ui/hooks/useLanguageManagement.ts +53 -18
- package/src/ui/types/navigation.ts +4 -0
- package/src/ui/utils/__tests__/entryLink.test.ts +30 -0
- package/src/ui/utils/entryLink.ts +61 -0
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
import { FALLBACK_LOCALE, getPrimaryLanguage } from '@oxy.so/core';
|
|
4
|
+
import { useOxy } from "../context/oxyRuntimeContext.js";
|
|
5
|
+
import { useCurrentUser } from "../hooks/queries/useAccountQueries.js";
|
|
6
|
+
import { LanguageBridge } from "./LanguageBridge.js";
|
|
7
|
+
|
|
8
|
+
/** Owner preferences are not part of the public device/account summary. */
|
|
9
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
10
|
+
export function AccountLanguageBoundary({
|
|
11
|
+
language,
|
|
12
|
+
children
|
|
13
|
+
}) {
|
|
14
|
+
const {
|
|
15
|
+
canUsePrivateApi,
|
|
16
|
+
user,
|
|
17
|
+
currentLanguage
|
|
18
|
+
} = useOxy();
|
|
19
|
+
const profile = useCurrentUser({
|
|
20
|
+
enabled: canUsePrivateApi
|
|
21
|
+
});
|
|
22
|
+
// The query mirrors its result into the account runtime in an effect. Wait for
|
|
23
|
+
// that projection as well as the request, so the bridge never publishes the
|
|
24
|
+
// compact session's fallback locale in the frame before its real preference.
|
|
25
|
+
const accountReady = !user || !canUsePrivateApi || profile.fetchStatus === 'paused' || user.languages !== undefined || profile.isError || profile.dataUpdatedAt > 0 && profile.data?.id === user.id && currentLanguage === (getPrimaryLanguage(profile.data) ?? FALLBACK_LOCALE);
|
|
26
|
+
return /*#__PURE__*/_jsx(LanguageBridge, {
|
|
27
|
+
config: language,
|
|
28
|
+
accountReady: accountReady,
|
|
29
|
+
children: children
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=AccountLanguageBoundary.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["FALLBACK_LOCALE","getPrimaryLanguage","useOxy","useCurrentUser","LanguageBridge","jsx","_jsx","AccountLanguageBoundary","language","children","canUsePrivateApi","user","currentLanguage","profile","enabled","accountReady","fetchStatus","languages","undefined","isError","dataUpdatedAt","data","id","config"],"sourceRoot":"../../../../src","sources":["ui/components/AccountLanguageBoundary.tsx"],"mappings":";;AACA,SAASA,eAAe,EAAEC,kBAAkB,QAAQ,cAAc;AAClE,SAASC,MAAM,QAAQ,iCAA8B;AACrD,SAASC,cAAc,QAAQ,uCAAoC;AAEnE,SAASC,cAAc,QAAQ,qBAAkB;;AAEjD;AAAA,SAAAC,GAAA,IAAAC,IAAA;AACA,OAAO,SAASC,uBAAuBA,CAAC;EACtCC,QAAQ;EACRC;AAIF,CAAC,EAAE;EACD,MAAM;IAAEC,gBAAgB;IAAEC,IAAI;IAAEC;EAAgB,CAAC,GAAGV,MAAM,CAAC,CAAC;EAC5D,MAAMW,OAAO,GAAGV,cAAc,CAAC;IAAEW,OAAO,EAAEJ;EAAiB,CAAC,CAAC;EAC7D;EACA;EACA;EACA,MAAMK,YAAY,GAChB,CAACJ,IAAI,IACL,CAACD,gBAAgB,IACjBG,OAAO,CAACG,WAAW,KAAK,QAAQ,IAChCL,IAAI,CAACM,SAAS,KAAKC,SAAS,IAC5BL,OAAO,CAACM,OAAO,IACdN,OAAO,CAACO,aAAa,GAAG,CAAC,IACxBP,OAAO,CAACQ,IAAI,EAAEC,EAAE,KAAKX,IAAI,CAACW,EAAE,IAC5BV,eAAe,MAAMX,kBAAkB,CAACY,OAAO,CAACQ,IAAI,CAAC,IAAIrB,eAAe,CAAE;EAC9E,oBACEM,IAAA,CAACF,cAAc;IAACmB,MAAM,EAAEf,QAAS;IAACO,YAAY,EAAEA,YAAa;IAAAN,QAAA,EAC1DA;EAAQ,CACK,CAAC;AAErB","ignoreList":[]}
|
|
@@ -1,47 +1,50 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import { useEffect,
|
|
3
|
+
import { useEffect, useRef, useState } from 'react';
|
|
4
4
|
import { coerceToSupportedLocale } from '@oxy.so/core';
|
|
5
5
|
import { useOxy } from "../context/oxyRuntimeContext.js";
|
|
6
|
-
/**
|
|
7
|
-
* `OxyProvider`'s language config prop, realized. Oxy decides which
|
|
8
|
-
* language an account (or, signed out, the device/guest locale) should see;
|
|
9
|
-
* this is the ONE place that decision reaches the host app's own i18n library
|
|
10
|
-
* — so an app never re-derives or imperatively tracks a language of its own,
|
|
11
|
-
* and never mounts anything extra to get it. It owns only its translation
|
|
12
|
-
* catalogs.
|
|
13
|
-
*
|
|
14
|
-
* `currentLanguage` may name a locale the host app never shipped a catalog
|
|
15
|
-
* for — {@link coerceToSupportedLocale} narrows it to the closest one the app
|
|
16
|
-
* actually has (exact match, then same base language, then `fallbackLocale`).
|
|
17
|
-
*
|
|
18
|
-
* Renders nothing. Mounted by `OxyProvider` INSIDE `OxyRuntimeProvider` only
|
|
19
|
-
* when this config is supplied, so an app with no i18n of its own pays
|
|
20
|
-
* nothing.
|
|
21
|
-
*/
|
|
6
|
+
/** The SDK resolves the entry/account locale before exposing translated app content. */
|
|
22
7
|
export function LanguageBridge({
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
onError
|
|
8
|
+
config,
|
|
9
|
+
accountReady = true,
|
|
10
|
+
children
|
|
27
11
|
}) {
|
|
28
12
|
const {
|
|
29
|
-
currentLanguage
|
|
13
|
+
currentLanguage,
|
|
14
|
+
isLanguageReady,
|
|
15
|
+
isAuthResolved
|
|
30
16
|
} = useOxy();
|
|
31
|
-
const resolvedLocale =
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
const onChangeRef = useRef(onChange);
|
|
37
|
-
onChangeRef.current = onChange;
|
|
38
|
-
const onErrorRef = useRef(onError);
|
|
39
|
-
onErrorRef.current = onError;
|
|
17
|
+
const resolvedLocale = config ? coerceToSupportedLocale(currentLanguage, config.supportedLocales, config.fallbackLocale) : currentLanguage;
|
|
18
|
+
const configRef = useRef(config);
|
|
19
|
+
configRef.current = config;
|
|
20
|
+
const pendingChange = useRef(Promise.resolve());
|
|
21
|
+
const [prepared, setPrepared] = useState(false);
|
|
40
22
|
useEffect(() => {
|
|
41
|
-
|
|
42
|
-
|
|
23
|
+
if (!isLanguageReady || !isAuthResolved || !accountReady) return;
|
|
24
|
+
let active = true;
|
|
25
|
+
// A slow earlier catalog must finish before a later locale is committed.
|
|
26
|
+
// Children stay mounted after boot: changing language never destroys route state.
|
|
27
|
+
pendingChange.current = pendingChange.current.then(async () => {
|
|
28
|
+
if (!active) return;
|
|
29
|
+
const current = configRef.current;
|
|
30
|
+
try {
|
|
31
|
+
await current?.onChange(resolvedLocale);
|
|
32
|
+
} catch (error) {
|
|
33
|
+
current?.onError?.(error, resolvedLocale);
|
|
34
|
+
if (current && resolvedLocale !== current.fallbackLocale) {
|
|
35
|
+
try {
|
|
36
|
+
await current.onChange(current.fallbackLocale);
|
|
37
|
+
} catch (fallbackError) {
|
|
38
|
+
current.onError?.(fallbackError, current.fallbackLocale);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
if (active) setPrepared(true);
|
|
43
43
|
});
|
|
44
|
-
|
|
45
|
-
|
|
44
|
+
return () => {
|
|
45
|
+
active = false;
|
|
46
|
+
};
|
|
47
|
+
}, [accountReady, isAuthResolved, isLanguageReady, resolvedLocale]);
|
|
48
|
+
return !config || prepared ? children : null;
|
|
46
49
|
}
|
|
47
50
|
//# sourceMappingURL=LanguageBridge.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useEffect","
|
|
1
|
+
{"version":3,"names":["useEffect","useRef","useState","coerceToSupportedLocale","useOxy","LanguageBridge","config","accountReady","children","currentLanguage","isLanguageReady","isAuthResolved","resolvedLocale","supportedLocales","fallbackLocale","configRef","current","pendingChange","Promise","resolve","prepared","setPrepared","active","then","onChange","error","onError","fallbackError"],"sourceRoot":"../../../../src","sources":["ui/components/LanguageBridge.tsx"],"mappings":";;AAAA,SAASA,SAAS,EAAEC,MAAM,EAAEC,QAAQ,QAAwB,OAAO;AACnE,SAASC,uBAAuB,QAAQ,cAAc;AACtD,SAASC,MAAM,QAAQ,iCAA8B;AAGrD;AACA,OAAO,SAASC,cAAcA,CAAC;EAC7BC,MAAM;EACNC,YAAY,GAAG,IAAI;EACnBC;AAKF,CAAC,EAAE;EACD,MAAM;IAAEC,eAAe;IAAEC,eAAe;IAAEC;EAAe,CAAC,GAAGP,MAAM,CAAC,CAAC;EACrE,MAAMQ,cAAc,GAAGN,MAAM,GACzBH,uBAAuB,CAACM,eAAe,EAAEH,MAAM,CAACO,gBAAgB,EAAEP,MAAM,CAACQ,cAAc,CAAC,GACxFL,eAAe;EACnB,MAAMM,SAAS,GAAGd,MAAM,CAACK,MAAM,CAAC;EAChCS,SAAS,CAACC,OAAO,GAAGV,MAAM;EAC1B,MAAMW,aAAa,GAAGhB,MAAM,CAACiB,OAAO,CAACC,OAAO,CAAC,CAAC,CAAC;EAC/C,MAAM,CAACC,QAAQ,EAAEC,WAAW,CAAC,GAAGnB,QAAQ,CAAC,KAAK,CAAC;EAE/CF,SAAS,CAAC,MAAM;IACd,IAAI,CAACU,eAAe,IAAI,CAACC,cAAc,IAAI,CAACJ,YAAY,EAAE;IAC1D,IAAIe,MAAM,GAAG,IAAI;IACjB;IACA;IACAL,aAAa,CAACD,OAAO,GAAGC,aAAa,CAACD,OAAO,CAACO,IAAI,CAAC,YAAY;MAC7D,IAAI,CAACD,MAAM,EAAE;MACb,MAAMN,OAAO,GAAGD,SAAS,CAACC,OAAO;MACjC,IAAI;QACF,MAAMA,OAAO,EAAEQ,QAAQ,CAACZ,cAAc,CAAC;MACzC,CAAC,CAAC,OAAOa,KAAK,EAAE;QACdT,OAAO,EAAEU,OAAO,GAAGD,KAAK,EAAEb,cAAc,CAAC;QACzC,IAAII,OAAO,IAAIJ,cAAc,KAAKI,OAAO,CAACF,cAAc,EAAE;UACxD,IAAI;YACF,MAAME,OAAO,CAACQ,QAAQ,CAACR,OAAO,CAACF,cAAc,CAAC;UAChD,CAAC,CAAC,OAAOa,aAAa,EAAE;YACtBX,OAAO,CAACU,OAAO,GAAGC,aAAa,EAAEX,OAAO,CAACF,cAAc,CAAC;UAC1D;QACF;MACF;MACA,IAAIQ,MAAM,EAAED,WAAW,CAAC,IAAI,CAAC;IAC/B,CAAC,CAAC;IACF,OAAO,MAAM;MACXC,MAAM,GAAG,KAAK;IAChB,CAAC;EACH,CAAC,EAAE,CAACf,YAAY,EAAEI,cAAc,EAAED,eAAe,EAAEE,cAAc,CAAC,CAAC;EAEnE,OAAO,CAACN,MAAM,IAAIc,QAAQ,GAAGZ,QAAQ,GAAG,IAAI;AAC9C","ignoreList":[]}
|
|
@@ -17,23 +17,10 @@ import { isNetConnectivityOnline } from "../utils/netConnectivity.js";
|
|
|
17
17
|
import { KeyboardBoundary } from './KeyboardBoundary';
|
|
18
18
|
import { SafeAreaRoot } from "./SafeAreaRoot.js";
|
|
19
19
|
import { ProductAnalyticsObserver } from "../analytics/productAnalytics.js";
|
|
20
|
-
import {
|
|
20
|
+
import { AccountLanguageBoundary } from "./AccountLanguageBoundary.js";
|
|
21
21
|
import { BloomLocaleBridge } from "./BloomLocaleBridge.js";
|
|
22
|
-
import { useOxy } from "../context/oxyRuntimeContext.js";
|
|
23
|
-
import { useCurrentUser } from "../hooks/queries/useAccountQueries.js";
|
|
24
22
|
import { SupervisionStateObserver } from "../hooks/queries/useSupervision.js";
|
|
25
|
-
|
|
26
|
-
/** Hydrate owner preferences after the bearer is ready, including on cold boot. */
|
|
27
23
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
28
|
-
function AccountProfileObserver() {
|
|
29
|
-
const {
|
|
30
|
-
canUsePrivateApi
|
|
31
|
-
} = useOxy();
|
|
32
|
-
useCurrentUser({
|
|
33
|
-
enabled: canUsePrivateApi
|
|
34
|
-
});
|
|
35
|
-
return null;
|
|
36
|
-
}
|
|
37
24
|
const bootStyles = StyleSheet.create({
|
|
38
25
|
providerRoot: {
|
|
39
26
|
flex: 1
|
|
@@ -114,7 +101,8 @@ const OxyProvider = ({
|
|
|
114
101
|
accountQueries,
|
|
115
102
|
requireAuth = 'off',
|
|
116
103
|
backgroundSession = false,
|
|
117
|
-
language
|
|
104
|
+
language,
|
|
105
|
+
campaignAttribution = false
|
|
118
106
|
}) => {
|
|
119
107
|
const support = useMemo(() => ({
|
|
120
108
|
onAskAlia,
|
|
@@ -265,23 +253,26 @@ const OxyProvider = ({
|
|
|
265
253
|
sessionMode: sessionMode,
|
|
266
254
|
webAuthMode: webAuthMode,
|
|
267
255
|
backgroundSession: backgroundSession,
|
|
256
|
+
legacyLanguageKeys: language?.legacyStorageKeys,
|
|
257
|
+
captureCampaignAttribution: campaignAttribution,
|
|
268
258
|
platformStorage: platformStorage,
|
|
269
259
|
accountQueries: accountQueries,
|
|
270
260
|
onAuthStateChange: onAuthStateChange,
|
|
271
|
-
children: [/*#__PURE__*/_jsx(
|
|
261
|
+
children: [/*#__PURE__*/_jsx(SupervisionStateObserver, {}), productAnalytics ? /*#__PURE__*/_jsx(ProductAnalyticsObserver, {
|
|
272
262
|
analytics: productAnalytics
|
|
273
|
-
}) : null,
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
263
|
+
}) : null, /*#__PURE__*/_jsx(AccountLanguageBoundary, {
|
|
264
|
+
language: language,
|
|
265
|
+
children: /*#__PURE__*/_jsxs(BloomLocaleBridge, {
|
|
266
|
+
children: [/*#__PURE__*/_jsx(OxySupportContext.Provider, {
|
|
267
|
+
value: support,
|
|
268
|
+
children: /*#__PURE__*/_jsx(SurfaceProvider, {
|
|
269
|
+
children: requireAuth === 'off' ? children : /*#__PURE__*/_jsx(RequireOxyAuth, {
|
|
270
|
+
prompt: requireAuth,
|
|
271
|
+
children: children
|
|
272
|
+
})
|
|
282
273
|
})
|
|
283
|
-
})
|
|
284
|
-
})
|
|
274
|
+
}), /*#__PURE__*/_jsx(ToastOutlet, {})]
|
|
275
|
+
})
|
|
285
276
|
})]
|
|
286
277
|
})
|
|
287
278
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["OxySupportContext","loadScreens","useEffect","useRef","useState","useMemo","AppState","Platform","StyleSheet","GestureHandlerRootView","OxyRuntimeProvider","QueryClientProvider","focusManager","onlineManager","SurfaceProvider","ToastOutlet","logger","loggerUtil","RequireOxyAuth","attachQueryPersistence","createQueryClient","createMemoryStorage","createPlatformStorage","isNetConnectivityOnline","KeyboardBoundary","SafeAreaRoot","ProductAnalyticsObserver","
|
|
1
|
+
{"version":3,"names":["OxySupportContext","loadScreens","useEffect","useRef","useState","useMemo","AppState","Platform","StyleSheet","GestureHandlerRootView","OxyRuntimeProvider","QueryClientProvider","focusManager","onlineManager","SurfaceProvider","ToastOutlet","logger","loggerUtil","RequireOxyAuth","attachQueryPersistence","createQueryClient","createMemoryStorage","createPlatformStorage","isNetConnectivityOnline","KeyboardBoundary","SafeAreaRoot","ProductAnalyticsObserver","AccountLanguageBoundary","BloomLocaleBridge","SupervisionStateObserver","jsx","_jsx","jsxs","_jsxs","bootStyles","create","providerRoot","flex","isWeb","OS","OxyProvider","oxyServices","children","onAuthStateChange","onAskAlia","documentationUrl","aliaAvatar","oxyOneArtwork","productAnalytics","storageKeyPrefix","clientId","baseURL","authWebUrl","authRedirectUri","authorizeBaseUrl","sessionMode","webAuthMode","queryClient","providedQueryClient","accountQueries","requireAuth","backgroundSession","language","campaignAttribution","support","catch","undefined","queryClientRef","persistenceUnsubRef","ownsQueryClientRef","accountQueriesRef","platformStorage","setPlatformStorage","current","client","mounted","bootstrap","storage","error","__DEV__","warn","component","persistence","unsubscribe","restored","handleVisibilityChange","setFocused","document","visibilityState","addEventListener","removeEventListener","subscription","state","remove","cleanup","setupNetworkMonitoring","setOnline","navigator","onLine","handleOnline","handleOffline","window","NetInfo","default","fetch","coreContent","legacyLanguageKeys","legacyStorageKeys","captureCampaignAttribution","analytics","Provider","value","prompt","style"],"sourceRoot":"../../../../src","sources":["ui/components/OxyProvider.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -45,7 +45,9 @@ export const OxySignUpPanel = ({
|
|
|
45
45
|
const {
|
|
46
46
|
oxyServices,
|
|
47
47
|
handleWebSession,
|
|
48
|
-
accountDialogController
|
|
48
|
+
accountDialogController,
|
|
49
|
+
currentLanguage,
|
|
50
|
+
campaignAttribution
|
|
49
51
|
} = useOxy();
|
|
50
52
|
const snapshot = useAccountDialogSnapshot(accountDialogController);
|
|
51
53
|
const flowOwner = host === 'dialog' ? accountDialogController : null;
|
|
@@ -121,7 +123,11 @@ export const OxySignUpPanel = ({
|
|
|
121
123
|
const session = await oxyServices.auth.signUp({
|
|
122
124
|
username: username.trim(),
|
|
123
125
|
email,
|
|
124
|
-
emailTicket: ticket
|
|
126
|
+
emailTicket: ticket,
|
|
127
|
+
languages: [currentLanguage],
|
|
128
|
+
...(campaignAttribution ? {
|
|
129
|
+
campaignAttribution
|
|
130
|
+
} : {})
|
|
125
131
|
});
|
|
126
132
|
await handleWebSession(session);
|
|
127
133
|
writeSignInFlow(flowOwner, SIGN_UP_FLOW_KEY, undefined);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useEffect","useState","Linking","Platform","toast","SIGN_IN_ERROR_CODES","emailAddressCheck","checkContract","useOxy","useAccountDialogSnapshot","useI18n","getCommonsAcquisitionUrl","isWebBrowser","SubtleLink","OxyAuthScreen","OxyAuthScreenHeader","OxyAuthTerms","readSignInFlow","writeSignInFlow","AccountFlowAction","AccountFlowField","AccountFlowNote","AccountFlowProgress","EmailCodeStep","describeSignInError","errorCode","isTicketExpired","jsx","_jsx","jsxs","_jsxs","COMMONS_CREATE_IDENTITY_URL","SIGN_UP_FLOW_KEY","OxySignUpPanel","onSignedIn","onSignIn","host","t","oxyServices","handleWebSession","accountDialogController","snapshot","flowOwner","saved","step","setStep","name","username","setUsername","email","setEmail","pending","setPending","error","setError","run","work","catch","reason","UsernameTakenError","finally","submitUsername","handle","trim","available","auth","checkUsername","sendCode","address","verificationId","startVerification","purpose","submitEmail","createAccount","ticket","session","signUp","emailTicket","undefined","usernameTaken","createInCommons","url","commonsAvailability","OS","Promise","resolve","then","openURL","progressSteps","progress","current","steps","testID","description","onConfirmed","onResend","back","label","onPress","children","title","value","onChange","onSubmit","disabled","placeholder","autoComplete","keyboardType","Error"],"sourceRoot":"../../../../../src","sources":["ui/components/signIn/OxySignUpPanel.tsx"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAGA,SAASA,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAC3C,SAASC,OAAO,EAAEC,QAAQ,QAAQ,cAAc;AAChD,SAASC,KAAK,QAAQ,qBAAqB;AAE3C,SAASC,mBAAmB,EAAEC,iBAAiB,EAAEC,aAAa,QAAQ,0BAA0B;AAChG,SAASC,MAAM,QAAQ,oCAAiC;AACxD,SAASC,wBAAwB,QAAQ,sCAAmC;AAC5E,SAASC,OAAO,QAAQ,wBAAqB;AAC7C,SAASC,wBAAwB,QAAQ,kCAA+B;AACxE,SAASC,YAAY,QAAQ,6BAA0B;AACvD,SAASC,UAAU,QAAQ,8BAA2B;AACtD,SAASC,aAAa,EAAEC,mBAAmB,EAAEC,YAAY,QAAQ,oBAAiB;AAClF,SAASC,cAAc,EAAEC,eAAe,QAAQ,sBAAmB;AACnE,SACEC,iBAAiB,EACjBC,gBAAgB,EAChBC,eAAe,EACfC,mBAAmB,EACnBC,aAAa,EACbC,mBAAmB,EACnBC,SAAS,EACTC,eAAe,QACV,uBAAoB;;AAE3B;AAAA,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AACA,MAAMC,2BAA2B,GAAG,8BAA8B;;AAgBlE;;AAMA,MAAMC,gBAAgB,GAAG,QAAQ;AAEjC,OAAO,MAAMC,cAA6C,GAAGA,CAAC;EAC5DC,UAAU;EACVC,QAAQ;EACRC,IAAI,GAAG;AACT,CAAC,KAAK;EACJ,MAAM;IAAEC;EAAE,CAAC,GAAG3B,OAAO,CAAC,CAAC;EACvB,MAAM;
|
|
1
|
+
{"version":3,"names":["useEffect","useState","Linking","Platform","toast","SIGN_IN_ERROR_CODES","emailAddressCheck","checkContract","useOxy","useAccountDialogSnapshot","useI18n","getCommonsAcquisitionUrl","isWebBrowser","SubtleLink","OxyAuthScreen","OxyAuthScreenHeader","OxyAuthTerms","readSignInFlow","writeSignInFlow","AccountFlowAction","AccountFlowField","AccountFlowNote","AccountFlowProgress","EmailCodeStep","describeSignInError","errorCode","isTicketExpired","jsx","_jsx","jsxs","_jsxs","COMMONS_CREATE_IDENTITY_URL","SIGN_UP_FLOW_KEY","OxySignUpPanel","onSignedIn","onSignIn","host","t","oxyServices","handleWebSession","accountDialogController","currentLanguage","campaignAttribution","snapshot","flowOwner","saved","step","setStep","name","username","setUsername","email","setEmail","pending","setPending","error","setError","run","work","catch","reason","UsernameTakenError","finally","submitUsername","handle","trim","available","auth","checkUsername","sendCode","address","verificationId","startVerification","purpose","submitEmail","createAccount","ticket","session","signUp","emailTicket","languages","undefined","usernameTaken","createInCommons","url","commonsAvailability","OS","Promise","resolve","then","openURL","progressSteps","progress","current","steps","testID","description","onConfirmed","onResend","back","label","onPress","children","title","value","onChange","onSubmit","disabled","placeholder","autoComplete","keyboardType","Error"],"sourceRoot":"../../../../../src","sources":["ui/components/signIn/OxySignUpPanel.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -24,6 +24,7 @@ import { hasPersistedSessionCredential, loadPersistedDeviceCredential } from "..
|
|
|
24
24
|
import { createTokenLossRecovery, TOKEN_RECOVERY_BACKOFF_MS } from "../session/tokenLossRecovery.js";
|
|
25
25
|
import { createCachedBootStore } from "../session/cachedBoot.js";
|
|
26
26
|
import { bindAuthStoreToRuntime } from "../stores/authStore.js";
|
|
27
|
+
import { useEntryLink } from "../hooks/useEntryLink.js";
|
|
27
28
|
import { useLanguageManagement } from "../hooks/useLanguageManagement.js";
|
|
28
29
|
import { useSessionManagement } from "../hooks/useSessionManagement.js";
|
|
29
30
|
import { useAuthOperations, clearPersistedAuthSafe } from "./hooks/useAuthOperations.js";
|
|
@@ -72,6 +73,8 @@ export const OxyRuntimeProvider = ({
|
|
|
72
73
|
sessionMode = 'account',
|
|
73
74
|
webAuthMode = 'popup',
|
|
74
75
|
backgroundSession = false,
|
|
76
|
+
legacyLanguageKeys,
|
|
77
|
+
captureCampaignAttribution = false,
|
|
75
78
|
platformStorage,
|
|
76
79
|
accountQueries,
|
|
77
80
|
onAuthStateChange,
|
|
@@ -301,8 +304,10 @@ export const OxyRuntimeProvider = ({
|
|
|
301
304
|
}).catch(err => {
|
|
302
305
|
// Nothing persisted can be restored; the account cache still has to
|
|
303
306
|
// become ready, or RequireOxyAuth would wait forever.
|
|
304
|
-
|
|
307
|
+
const memoryStorage = createMemoryStorage();
|
|
308
|
+
accountQueryPersistence.setStorage(memoryStorage);
|
|
305
309
|
if (mounted) {
|
|
310
|
+
setStorage(memoryStorage);
|
|
306
311
|
logger('Failed to initialize storage', err);
|
|
307
312
|
onError?.({
|
|
308
313
|
message: 'Failed to initialize storage',
|
|
@@ -315,8 +320,15 @@ export const OxyRuntimeProvider = ({
|
|
|
315
320
|
mounted = false;
|
|
316
321
|
};
|
|
317
322
|
}, [accountQueryPersistence, logger, onError, platformStorage, runtime, storageReady]);
|
|
323
|
+
const entryLink = useEntryLink({
|
|
324
|
+
storage,
|
|
325
|
+
storageKey: `${storageKeyPrefix}_campaign_attribution`,
|
|
326
|
+
captureCampaign: captureCampaignAttribution,
|
|
327
|
+
onError: logger
|
|
328
|
+
});
|
|
318
329
|
const {
|
|
319
330
|
currentLanguage,
|
|
331
|
+
isLanguageReady,
|
|
320
332
|
languages: currentLanguages,
|
|
321
333
|
metadata: currentLanguageMetadata,
|
|
322
334
|
languageName: currentLanguageName,
|
|
@@ -326,6 +338,9 @@ export const OxyRuntimeProvider = ({
|
|
|
326
338
|
} = useLanguageManagement({
|
|
327
339
|
storage,
|
|
328
340
|
languageKey: storageKeys.language,
|
|
341
|
+
entryUrl: entryLink.url,
|
|
342
|
+
entryLinkReady: entryLink.ready,
|
|
343
|
+
legacyLanguageKeys,
|
|
329
344
|
user,
|
|
330
345
|
onError,
|
|
331
346
|
logger
|
|
@@ -1458,6 +1473,8 @@ export const OxyRuntimeProvider = ({
|
|
|
1458
1473
|
webAuthMode,
|
|
1459
1474
|
error,
|
|
1460
1475
|
currentLanguage,
|
|
1476
|
+
isLanguageReady: isLanguageReady && entryLink.campaignReady,
|
|
1477
|
+
campaignAttribution: entryLink.campaignAttribution,
|
|
1461
1478
|
currentLanguages,
|
|
1462
1479
|
currentLanguageMetadata,
|
|
1463
1480
|
currentLanguageName,
|
|
@@ -1497,7 +1514,7 @@ export const OxyRuntimeProvider = ({
|
|
|
1497
1514
|
switchToAccount,
|
|
1498
1515
|
refreshAccounts,
|
|
1499
1516
|
createAccount: createAccountFn
|
|
1500
|
-
}), [user, sessions, activeSessionId, isAuthenticated, isLoading, tokenReady, hasAccessToken, canUsePrivateApi, isPrivateApiPending, authResolved, snapshot.storageReady, isAccountCacheReady, isIdentityBound, webAuthMode, error, currentLanguage, currentLanguages, currentLanguageMetadata, currentLanguageName, currentNativeLanguageName, hasIdentity, getPublicKey, signIn, revokeSuspiciousSignIn, handleWebSession, startWebOAuthSignInForContext, startNativeOAuthSignInForContext, requestOAuthConsentForContext, logout, logoutAll, switchSessionForContext, refreshSessionsForContext, setLanguage, setLanguages, getDeviceSessions, logoutAllDeviceSessions, updateDeviceName, clearSessionState, clearAllAccountData, storageKeyPrefix, clientId, oxyServices, sessionClient, showBottomSheetForContext, openAvatarPicker, accountDialogController, accountDialogOpen, openAccountDialog, closeAccountDialog, accounts, switchToAccount, refreshAccounts, createAccountFn]);
|
|
1517
|
+
}), [user, sessions, activeSessionId, isAuthenticated, isLoading, tokenReady, hasAccessToken, canUsePrivateApi, isPrivateApiPending, authResolved, snapshot.storageReady, isAccountCacheReady, isIdentityBound, webAuthMode, error, currentLanguage, isLanguageReady, entryLink.campaignReady, entryLink.campaignAttribution, currentLanguages, currentLanguageMetadata, currentLanguageName, currentNativeLanguageName, hasIdentity, getPublicKey, signIn, revokeSuspiciousSignIn, handleWebSession, startWebOAuthSignInForContext, startNativeOAuthSignInForContext, requestOAuthConsentForContext, logout, logoutAll, switchSessionForContext, refreshSessionsForContext, setLanguage, setLanguages, getDeviceSessions, logoutAllDeviceSessions, updateDeviceName, clearSessionState, clearAllAccountData, storageKeyPrefix, clientId, oxyServices, sessionClient, showBottomSheetForContext, openAvatarPicker, accountDialogController, accountDialogOpen, openAccountDialog, closeAccountDialog, accounts, switchToAccount, refreshAccounts, createAccountFn]);
|
|
1501
1518
|
const authActionsValue = useMemo(() => ({
|
|
1502
1519
|
ensureDeviceSessionLane,
|
|
1503
1520
|
signIn,
|