@oxyhq/services 13.2.0 → 14.0.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/index.js +11 -17
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/ui/components/AccountMenu.js +103 -65
- package/lib/commonjs/ui/components/AccountMenu.js.map +1 -1
- package/lib/commonjs/ui/components/AccountSwitcher.js +84 -126
- package/lib/commonjs/ui/components/AccountSwitcher.js.map +1 -1
- package/lib/commonjs/ui/components/ProfileButton.js +81 -22
- package/lib/commonjs/ui/components/ProfileButton.js.map +1 -1
- package/lib/commonjs/ui/components/ProfileMenu.js +244 -142
- package/lib/commonjs/ui/components/ProfileMenu.js.map +1 -1
- package/lib/commonjs/ui/components/SignInModal.js +4 -4
- package/lib/commonjs/ui/components/SignInModal.js.map +1 -1
- package/lib/commonjs/ui/context/OxyContext.js +506 -466
- package/lib/commonjs/ui/context/OxyContext.js.map +1 -1
- package/lib/commonjs/ui/context/hooks/useAuthOperations.js +59 -57
- package/lib/commonjs/ui/context/hooks/useAuthOperations.js.map +1 -1
- package/lib/commonjs/ui/context/inSessionTokenRefresh.js +23 -42
- package/lib/commonjs/ui/context/inSessionTokenRefresh.js.map +1 -1
- package/lib/commonjs/ui/context/silentSessionRestore.js +12 -21
- package/lib/commonjs/ui/context/silentSessionRestore.js.map +1 -1
- package/lib/commonjs/ui/hooks/useAuth.js +4 -3
- package/lib/commonjs/ui/hooks/useAuth.js.map +1 -1
- package/lib/commonjs/ui/hooks/useOxyAuthSession.js +12 -7
- package/lib/commonjs/ui/hooks/useOxyAuthSession.js.map +1 -1
- package/lib/commonjs/ui/hooks/useSessionManagement.js +17 -65
- package/lib/commonjs/ui/hooks/useSessionManagement.js.map +1 -1
- package/lib/commonjs/ui/hooks/useSwitchableAccounts.js +288 -0
- package/lib/commonjs/ui/hooks/useSwitchableAccounts.js.map +1 -0
- package/lib/commonjs/ui/hooks/useWebSSO.js +12 -191
- package/lib/commonjs/ui/hooks/useWebSSO.js.map +1 -1
- package/lib/commonjs/ui/index.js.map +1 -1
- package/lib/commonjs/ui/screens/OxyAuthScreen.js +2 -2
- package/lib/commonjs/ui/screens/OxyAuthScreen.js.map +1 -1
- package/lib/commonjs/ui/session/createSessionClient.js +28 -0
- package/lib/commonjs/ui/session/createSessionClient.js.map +1 -0
- package/lib/commonjs/ui/session/index.js +52 -0
- package/lib/commonjs/ui/session/index.js.map +1 -0
- package/lib/commonjs/ui/session/projectSessionState.js +86 -0
- package/lib/commonjs/ui/session/projectSessionState.js.map +1 -0
- package/lib/commonjs/ui/session/sessionClientHost.js +30 -0
- package/lib/commonjs/ui/session/sessionClientHost.js.map +1 -0
- package/lib/commonjs/ui/session/tokenTransport.js +77 -0
- package/lib/commonjs/ui/session/tokenTransport.js.map +1 -0
- package/lib/commonjs/ui/utils/activeAuthuser.js +35 -79
- package/lib/commonjs/ui/utils/activeAuthuser.js.map +1 -1
- package/lib/commonjs/ui/utils/sessionHelpers.js +1 -51
- package/lib/commonjs/ui/utils/sessionHelpers.js.map +1 -1
- package/lib/commonjs/utils/deviceFlowSignIn.js +70 -15
- package/lib/commonjs/utils/deviceFlowSignIn.js.map +1 -1
- package/lib/module/index.js +5 -5
- package/lib/module/index.js.map +1 -1
- package/lib/module/ui/components/AccountMenu.js +103 -65
- package/lib/module/ui/components/AccountMenu.js.map +1 -1
- package/lib/module/ui/components/AccountSwitcher.js +85 -127
- package/lib/module/ui/components/AccountSwitcher.js.map +1 -1
- package/lib/module/ui/components/ProfileButton.js +82 -23
- package/lib/module/ui/components/ProfileButton.js.map +1 -1
- package/lib/module/ui/components/ProfileMenu.js +247 -145
- package/lib/module/ui/components/ProfileMenu.js.map +1 -1
- package/lib/module/ui/components/SignInModal.js +4 -4
- package/lib/module/ui/components/SignInModal.js.map +1 -1
- package/lib/module/ui/context/OxyContext.js +510 -470
- package/lib/module/ui/context/OxyContext.js.map +1 -1
- package/lib/module/ui/context/hooks/useAuthOperations.js +61 -60
- package/lib/module/ui/context/hooks/useAuthOperations.js.map +1 -1
- package/lib/module/ui/context/inSessionTokenRefresh.js +24 -43
- package/lib/module/ui/context/inSessionTokenRefresh.js.map +1 -1
- package/lib/module/ui/context/silentSessionRestore.js +12 -20
- package/lib/module/ui/context/silentSessionRestore.js.map +1 -1
- package/lib/module/ui/hooks/useAuth.js +4 -3
- package/lib/module/ui/hooks/useAuth.js.map +1 -1
- package/lib/module/ui/hooks/useOxyAuthSession.js +12 -7
- package/lib/module/ui/hooks/useOxyAuthSession.js.map +1 -1
- package/lib/module/ui/hooks/useSessionManagement.js +18 -66
- package/lib/module/ui/hooks/useSessionManagement.js.map +1 -1
- package/lib/module/ui/hooks/useSwitchableAccounts.js +283 -0
- package/lib/module/ui/hooks/useSwitchableAccounts.js.map +1 -0
- package/lib/module/ui/hooks/useWebSSO.js +13 -192
- package/lib/module/ui/hooks/useWebSSO.js.map +1 -1
- package/lib/module/ui/index.js +0 -1
- package/lib/module/ui/index.js.map +1 -1
- package/lib/module/ui/screens/OxyAuthScreen.js +2 -2
- package/lib/module/ui/screens/OxyAuthScreen.js.map +1 -1
- package/lib/module/ui/session/createSessionClient.js +25 -0
- package/lib/module/ui/session/createSessionClient.js.map +1 -0
- package/lib/module/ui/session/index.js +17 -0
- package/lib/module/ui/session/index.js.map +1 -0
- package/lib/module/ui/session/projectSessionState.js +79 -0
- package/lib/module/ui/session/projectSessionState.js.map +1 -0
- package/lib/module/ui/session/sessionClientHost.js +26 -0
- package/lib/module/ui/session/sessionClientHost.js.map +1 -0
- package/lib/module/ui/session/tokenTransport.js +74 -0
- package/lib/module/ui/session/tokenTransport.js.map +1 -0
- package/lib/module/ui/utils/activeAuthuser.js +34 -76
- package/lib/module/ui/utils/activeAuthuser.js.map +1 -1
- package/lib/module/ui/utils/sessionHelpers.js +0 -49
- package/lib/module/ui/utils/sessionHelpers.js.map +1 -1
- package/lib/module/utils/deviceFlowSignIn.js +71 -16
- package/lib/module/utils/deviceFlowSignIn.js.map +1 -1
- package/lib/typescript/commonjs/index.d.ts +2 -3
- package/lib/typescript/commonjs/index.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/components/AccountMenu.d.ts +4 -2
- package/lib/typescript/commonjs/ui/components/AccountMenu.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/components/AccountSwitcher.d.ts +7 -8
- package/lib/typescript/commonjs/ui/components/AccountSwitcher.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/components/ProfileButton.d.ts +11 -1
- package/lib/typescript/commonjs/ui/components/ProfileButton.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/components/ProfileMenu.d.ts +12 -9
- package/lib/typescript/commonjs/ui/components/ProfileMenu.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/context/OxyContext.d.ts +16 -13
- package/lib/typescript/commonjs/ui/context/OxyContext.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/context/hooks/useAuthOperations.d.ts +27 -3
- package/lib/typescript/commonjs/ui/context/hooks/useAuthOperations.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/context/inSessionTokenRefresh.d.ts +22 -17
- package/lib/typescript/commonjs/ui/context/inSessionTokenRefresh.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/context/silentSessionRestore.d.ts +12 -18
- package/lib/typescript/commonjs/ui/context/silentSessionRestore.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/mutations/useAccountMutations.d.ts +1 -0
- package/lib/typescript/commonjs/ui/hooks/mutations/useAccountMutations.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/useAuth.d.ts +1 -1
- package/lib/typescript/commonjs/ui/hooks/useAuth.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/useOxyAuthSession.d.ts +2 -2
- package/lib/typescript/commonjs/ui/hooks/useOxyAuthSession.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/useSessionManagement.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/useSwitchableAccounts.d.ts +162 -0
- package/lib/typescript/commonjs/ui/hooks/useSwitchableAccounts.d.ts.map +1 -0
- package/lib/typescript/commonjs/ui/hooks/useWebSSO.d.ts +13 -52
- package/lib/typescript/commonjs/ui/hooks/useWebSSO.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/index.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/session/createSessionClient.d.ts +15 -0
- package/lib/typescript/commonjs/ui/session/createSessionClient.d.ts.map +1 -0
- package/lib/typescript/commonjs/ui/session/index.d.ts +15 -0
- package/lib/typescript/commonjs/ui/session/index.d.ts.map +1 -0
- package/lib/typescript/commonjs/ui/session/projectSessionState.d.ts +45 -0
- package/lib/typescript/commonjs/ui/session/projectSessionState.d.ts.map +1 -0
- package/lib/typescript/commonjs/ui/session/sessionClientHost.d.ts +14 -0
- package/lib/typescript/commonjs/ui/session/sessionClientHost.d.ts.map +1 -0
- package/lib/typescript/commonjs/ui/session/tokenTransport.d.ts +24 -0
- package/lib/typescript/commonjs/ui/session/tokenTransport.d.ts.map +1 -0
- package/lib/typescript/commonjs/ui/utils/activeAuthuser.d.ts +21 -29
- package/lib/typescript/commonjs/ui/utils/activeAuthuser.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/utils/sessionHelpers.d.ts +0 -19
- package/lib/typescript/commonjs/ui/utils/sessionHelpers.d.ts.map +1 -1
- package/lib/typescript/commonjs/utils/deviceFlowSignIn.d.ts +51 -19
- package/lib/typescript/commonjs/utils/deviceFlowSignIn.d.ts.map +1 -1
- package/lib/typescript/module/index.d.ts +2 -3
- package/lib/typescript/module/index.d.ts.map +1 -1
- package/lib/typescript/module/ui/components/AccountMenu.d.ts +4 -2
- package/lib/typescript/module/ui/components/AccountMenu.d.ts.map +1 -1
- package/lib/typescript/module/ui/components/AccountSwitcher.d.ts +7 -8
- package/lib/typescript/module/ui/components/AccountSwitcher.d.ts.map +1 -1
- package/lib/typescript/module/ui/components/ProfileButton.d.ts +11 -1
- package/lib/typescript/module/ui/components/ProfileButton.d.ts.map +1 -1
- package/lib/typescript/module/ui/components/ProfileMenu.d.ts +12 -9
- package/lib/typescript/module/ui/components/ProfileMenu.d.ts.map +1 -1
- package/lib/typescript/module/ui/context/OxyContext.d.ts +16 -13
- package/lib/typescript/module/ui/context/OxyContext.d.ts.map +1 -1
- package/lib/typescript/module/ui/context/hooks/useAuthOperations.d.ts +27 -3
- package/lib/typescript/module/ui/context/hooks/useAuthOperations.d.ts.map +1 -1
- package/lib/typescript/module/ui/context/inSessionTokenRefresh.d.ts +22 -17
- package/lib/typescript/module/ui/context/inSessionTokenRefresh.d.ts.map +1 -1
- package/lib/typescript/module/ui/context/silentSessionRestore.d.ts +12 -18
- package/lib/typescript/module/ui/context/silentSessionRestore.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/mutations/useAccountMutations.d.ts +1 -0
- package/lib/typescript/module/ui/hooks/mutations/useAccountMutations.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/useAuth.d.ts +1 -1
- package/lib/typescript/module/ui/hooks/useAuth.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/useOxyAuthSession.d.ts +2 -2
- package/lib/typescript/module/ui/hooks/useOxyAuthSession.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/useSessionManagement.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/useSwitchableAccounts.d.ts +162 -0
- package/lib/typescript/module/ui/hooks/useSwitchableAccounts.d.ts.map +1 -0
- package/lib/typescript/module/ui/hooks/useWebSSO.d.ts +13 -52
- package/lib/typescript/module/ui/hooks/useWebSSO.d.ts.map +1 -1
- package/lib/typescript/module/ui/index.d.ts.map +1 -1
- package/lib/typescript/module/ui/session/createSessionClient.d.ts +15 -0
- package/lib/typescript/module/ui/session/createSessionClient.d.ts.map +1 -0
- package/lib/typescript/module/ui/session/index.d.ts +15 -0
- package/lib/typescript/module/ui/session/index.d.ts.map +1 -0
- package/lib/typescript/module/ui/session/projectSessionState.d.ts +45 -0
- package/lib/typescript/module/ui/session/projectSessionState.d.ts.map +1 -0
- package/lib/typescript/module/ui/session/sessionClientHost.d.ts +14 -0
- package/lib/typescript/module/ui/session/sessionClientHost.d.ts.map +1 -0
- package/lib/typescript/module/ui/session/tokenTransport.d.ts +24 -0
- package/lib/typescript/module/ui/session/tokenTransport.d.ts.map +1 -0
- package/lib/typescript/module/ui/utils/activeAuthuser.d.ts +21 -29
- package/lib/typescript/module/ui/utils/activeAuthuser.d.ts.map +1 -1
- package/lib/typescript/module/ui/utils/sessionHelpers.d.ts +0 -19
- package/lib/typescript/module/ui/utils/sessionHelpers.d.ts.map +1 -1
- package/lib/typescript/module/utils/deviceFlowSignIn.d.ts +51 -19
- package/lib/typescript/module/utils/deviceFlowSignIn.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/index.ts +9 -9
- package/src/ui/components/AccountMenu.tsx +117 -70
- package/src/ui/components/AccountSwitcher.tsx +88 -134
- package/src/ui/components/ProfileButton.tsx +95 -17
- package/src/ui/components/ProfileMenu.tsx +263 -155
- package/src/ui/components/SignInModal.tsx +5 -5
- package/src/ui/context/OxyContext.tsx +560 -475
- package/src/ui/context/hooks/useAuthOperations.ts +72 -63
- package/src/ui/context/inSessionTokenRefresh.ts +23 -42
- package/src/ui/context/silentSessionRestore.ts +12 -26
- package/src/ui/hooks/useAuth.ts +4 -3
- package/src/ui/hooks/useOxyAuthSession.ts +13 -8
- package/src/ui/hooks/useSessionManagement.ts +16 -87
- package/src/ui/hooks/useSwitchableAccounts.ts +397 -0
- package/src/ui/hooks/useWebSSO.ts +13 -227
- package/src/ui/index.ts +0 -1
- package/src/ui/screens/OxyAuthScreen.tsx +2 -2
- package/src/ui/session/__tests__/createSessionClient.test.ts +41 -0
- package/src/ui/session/__tests__/projectSessionState.test.ts +114 -0
- package/src/ui/session/__tests__/sessionClientHost.test.ts +43 -0
- package/src/ui/session/__tests__/tokenTransport.test.ts +142 -0
- package/src/ui/session/createSessionClient.ts +21 -0
- package/src/ui/session/index.ts +19 -0
- package/src/ui/session/projectSessionState.ts +85 -0
- package/src/ui/session/sessionClientHost.ts +27 -0
- package/src/ui/session/tokenTransport.ts +76 -0
- package/src/ui/utils/activeAuthuser.ts +34 -76
- package/src/ui/utils/sessionHelpers.ts +0 -66
- package/src/utils/__tests__/deviceFlowSignIn.test.ts +243 -34
- package/src/utils/deviceFlowSignIn.ts +98 -21
- package/lib/commonjs/ui/components/accountMenuRows.js +0 -33
- package/lib/commonjs/ui/components/accountMenuRows.js.map +0 -1
- package/lib/commonjs/ui/hooks/useDeviceAccounts.js +0 -280
- package/lib/commonjs/ui/hooks/useDeviceAccounts.js.map +0 -1
- package/lib/commonjs/ui/hooks/useSessionSocket.js +0 -203
- package/lib/commonjs/ui/hooks/useSessionSocket.js.map +0 -1
- package/lib/commonjs/utils/silentGuardKey.js +0 -54
- package/lib/commonjs/utils/silentGuardKey.js.map +0 -1
- package/lib/module/ui/components/accountMenuRows.js +0 -29
- package/lib/module/ui/components/accountMenuRows.js.map +0 -1
- package/lib/module/ui/hooks/useDeviceAccounts.js +0 -276
- package/lib/module/ui/hooks/useDeviceAccounts.js.map +0 -1
- package/lib/module/ui/hooks/useSessionSocket.js +0 -199
- package/lib/module/ui/hooks/useSessionSocket.js.map +0 -1
- package/lib/module/utils/silentGuardKey.js +0 -49
- package/lib/module/utils/silentGuardKey.js.map +0 -1
- package/lib/typescript/commonjs/ui/components/accountMenuRows.d.ts +0 -34
- package/lib/typescript/commonjs/ui/components/accountMenuRows.d.ts.map +0 -1
- package/lib/typescript/commonjs/ui/hooks/useDeviceAccounts.d.ts +0 -133
- package/lib/typescript/commonjs/ui/hooks/useDeviceAccounts.d.ts.map +0 -1
- package/lib/typescript/commonjs/ui/hooks/useSessionSocket.d.ts +0 -14
- package/lib/typescript/commonjs/ui/hooks/useSessionSocket.d.ts.map +0 -1
- package/lib/typescript/commonjs/utils/silentGuardKey.d.ts +0 -31
- package/lib/typescript/commonjs/utils/silentGuardKey.d.ts.map +0 -1
- package/lib/typescript/module/ui/components/accountMenuRows.d.ts +0 -34
- package/lib/typescript/module/ui/components/accountMenuRows.d.ts.map +0 -1
- package/lib/typescript/module/ui/hooks/useDeviceAccounts.d.ts +0 -133
- package/lib/typescript/module/ui/hooks/useDeviceAccounts.d.ts.map +0 -1
- package/lib/typescript/module/ui/hooks/useSessionSocket.d.ts +0 -14
- package/lib/typescript/module/ui/hooks/useSessionSocket.d.ts.map +0 -1
- package/lib/typescript/module/utils/silentGuardKey.d.ts +0 -31
- package/lib/typescript/module/utils/silentGuardKey.d.ts.map +0 -1
- package/src/ui/components/accountMenuRows.ts +0 -48
- package/src/ui/hooks/useDeviceAccounts.ts +0 -344
- package/src/ui/hooks/useSessionSocket.ts +0 -233
- package/src/ui/utils/__tests__/activeAuthuser.test.ts +0 -75
- package/src/utils/__tests__/silentGuardKey.test.ts +0 -82
- package/src/utils/silentGuardKey.ts +0 -46
|
@@ -9,7 +9,6 @@ exports.startTokenRefreshScheduler = startTokenRefreshScheduler;
|
|
|
9
9
|
var _core = require("@oxyhq/core");
|
|
10
10
|
var _reactNative = require("react-native");
|
|
11
11
|
var _useWebSSO = require("../hooks/useWebSSO.js");
|
|
12
|
-
var _activeAuthuser = require("../utils/activeAuthuser.js");
|
|
13
12
|
var _silentSessionRestore = require("./silentSessionRestore.js");
|
|
14
13
|
/**
|
|
15
14
|
* In-session access-token refresh for the React Native / Expo SDK.
|
|
@@ -28,10 +27,10 @@ var _silentSessionRestore = require("./silentSessionRestore.js");
|
|
|
28
27
|
*
|
|
29
28
|
* 1. {@link createInSessionRefreshHandler} — an `AuthRefreshHandler` installed
|
|
30
29
|
* on the owner client. It re-mints a fresh access token WITHOUT a page
|
|
31
|
-
* reload by composing the SAME silent-restore
|
|
32
|
-
* ({@link mintSessionViaPerApexIframe}
|
|
33
|
-
*
|
|
34
|
-
*
|
|
30
|
+
* reload by composing the SAME silent-restore primitive cold boot uses
|
|
31
|
+
* ({@link mintSessionViaPerApexIframe}) — not a copy. The linked client
|
|
32
|
+
* (`createLinkedClient`) inherits the fix for free: its refresh delegates
|
|
33
|
+
* back to the owner's `refreshAccessToken`.
|
|
35
34
|
*
|
|
36
35
|
* 2. {@link startTokenRefreshScheduler} — a proactive scheduler that refreshes
|
|
37
36
|
* ~{@link TOKEN_REFRESH_LEAD_MS} before expiry (and on web tab-focus / native
|
|
@@ -42,6 +41,14 @@ var _silentSessionRestore = require("./silentSessionRestore.js");
|
|
|
42
41
|
* (single in-flight `tokenRefreshPromise` + cooldown) — this module does not
|
|
43
42
|
* reimplement them, so the timer / foreground / per-request triggers collapse to
|
|
44
43
|
* one network attempt (no refresh storm).
|
|
44
|
+
*
|
|
45
|
+
* NOTE (session-sync cutover, Task 5): the web arm chain used to fall through
|
|
46
|
+
* to a same-apex `oxy_rt` refresh-cookie arm (`refreshAllSessions` +
|
|
47
|
+
* `selectActiveRefreshAccount`). That arm is DELETED — the device account set
|
|
48
|
+
* is now server-authoritative via `SessionClient` (`@oxyhq/core`), which
|
|
49
|
+
* `OxyContext` bootstraps/reprojects independently of in-session token
|
|
50
|
+
* refresh. `selectActiveRefreshAccount` had no other caller and was deleted
|
|
51
|
+
* with it.
|
|
45
52
|
*/
|
|
46
53
|
|
|
47
54
|
/**
|
|
@@ -54,14 +61,6 @@ var _silentSessionRestore = require("./silentSessionRestore.js");
|
|
|
54
61
|
*/
|
|
55
62
|
const SILENT_IFRAME_REFRESH_TIMEOUT = 4000;
|
|
56
63
|
|
|
57
|
-
/**
|
|
58
|
-
* Per-arm fail-fast budget (ms) for the same-apex refresh-cookie arm
|
|
59
|
-
* (`refreshAllSessions`). On a cross-apex RP the `Domain=oxy.so` cookie never
|
|
60
|
-
* reaches `api.<apex>`, so this returns `{accounts:[]}` quickly; the bound only
|
|
61
|
-
* matters if that endpoint stalls.
|
|
62
|
-
*/
|
|
63
|
-
const COOKIE_REFRESH_TIMEOUT = 4000;
|
|
64
|
-
|
|
65
64
|
/**
|
|
66
65
|
* Lead time (ms) before access-token expiry at which the proactive scheduler
|
|
67
66
|
* refreshes. Mirrors `HttpService`'s per-request `TOKEN_REFRESH_LEAD_SECONDS`
|
|
@@ -92,22 +91,19 @@ const TOKEN_REFRESH_LEAD_MS = exports.TOKEN_REFRESH_LEAD_MS = 60_000;
|
|
|
92
91
|
* sign-in) so a genuinely dead session reconciles to logged-out rather than
|
|
93
92
|
* staying a zombie.
|
|
94
93
|
*
|
|
95
|
-
* WEB
|
|
96
|
-
*
|
|
97
|
-
*
|
|
98
|
-
*
|
|
99
|
-
*
|
|
100
|
-
*
|
|
101
|
-
*
|
|
102
|
-
* token. On a cross-apex RP it returns `{accounts:[]}` (clean no-op).
|
|
103
|
-
* Unlike the cold-boot cookie restore this does NOT rebuild multi-session
|
|
104
|
-
* state — an in-session refresh only needs a fresh bearer.
|
|
94
|
+
* WEB: Per-apex `/auth/silent` iframe — {@link mintSessionViaPerApexIframe}
|
|
95
|
+
* (shared verbatim with cold boot). The durable cross-apex path; also
|
|
96
|
+
* covers `*.oxy.so` (the per-apex host IS the central host there). There
|
|
97
|
+
* is no FedCM arm — FedCM was removed from the client sign-in/refresh path
|
|
98
|
+
* entirely (Chrome-only; see `CrossDomainAuth`'s doc comment in
|
|
99
|
+
* `@oxyhq/core` for the production sign-in loop that motivated the
|
|
100
|
+
* removal).
|
|
105
101
|
*
|
|
106
102
|
* NO RECURSION: no arm issues a request through the authed client's
|
|
107
|
-
* `refreshAccessToken` path. The iframe
|
|
108
|
-
*
|
|
103
|
+
* `refreshAccessToken` path. The iframe transport is postMessage-based; the
|
|
104
|
+
* follow-up `/session/user` fetch inside `silentSignIn`
|
|
109
105
|
* runs against the just-planted FULL-TTL token (≫ the preflight lead), so it
|
|
110
|
-
* never re-enters the refresh path
|
|
106
|
+
* never re-enters the refresh path.
|
|
111
107
|
*/
|
|
112
108
|
function createInSessionRefreshHandler(oxyServices) {
|
|
113
109
|
const runArm = async (label, reason, arm) => {
|
|
@@ -124,22 +120,7 @@ function createInSessionRefreshHandler(oxyServices) {
|
|
|
124
120
|
return null;
|
|
125
121
|
}
|
|
126
122
|
};
|
|
127
|
-
const webArms = [['silent-iframe', async () => (await (0, _silentSessionRestore.mintSessionViaPerApexIframe)(oxyServices, SILENT_IFRAME_REFRESH_TIMEOUT)) ? oxyServices.getAccessToken() : null]
|
|
128
|
-
if (oxyServices.isFedCMSupported?.() !== true) {
|
|
129
|
-
return null;
|
|
130
|
-
}
|
|
131
|
-
return (await oxyServices.silentSignInWithFedCM?.()) ? oxyServices.getAccessToken() : null;
|
|
132
|
-
}], ['refresh-cookie', async () => {
|
|
133
|
-
const snapshot = await oxyServices.refreshAllSessions({
|
|
134
|
-
timeout: COOKIE_REFRESH_TIMEOUT
|
|
135
|
-
});
|
|
136
|
-
if (snapshot.accounts.length === 0) {
|
|
137
|
-
return null;
|
|
138
|
-
}
|
|
139
|
-
const active = (0, _silentSessionRestore.selectActiveRefreshAccount)(snapshot.accounts, (0, _activeAuthuser.readActiveAuthuser)());
|
|
140
|
-
oxyServices.httpService.setTokens(active.accessToken);
|
|
141
|
-
return oxyServices.getAccessToken();
|
|
142
|
-
}]];
|
|
123
|
+
const webArms = [['silent-iframe', async () => (await (0, _silentSessionRestore.mintSessionViaPerApexIframe)(oxyServices, SILENT_IFRAME_REFRESH_TIMEOUT)) ? oxyServices.getAccessToken() : null]];
|
|
143
124
|
return async reason => {
|
|
144
125
|
if (!(0, _useWebSSO.isWebBrowser)()) {
|
|
145
126
|
return runArm('native-shared-key', reason, async () => (await oxyServices.signInWithSharedIdentity?.()) ? oxyServices.getAccessToken() : null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_core","require","_reactNative","_useWebSSO","
|
|
1
|
+
{"version":3,"names":["_core","require","_reactNative","_useWebSSO","_silentSessionRestore","SILENT_IFRAME_REFRESH_TIMEOUT","TOKEN_REFRESH_LEAD_MS","exports","createInSessionRefreshHandler","oxyServices","runArm","label","reason","arm","error","__DEV__","loggerUtil","debug","component","method","webArms","mintSessionViaPerApexIframe","getAccessToken","isWebBrowser","signInWithSharedIdentity","token","startTokenRefreshScheduler","disposed","timer","clearTimer","clearTimeout","runRefresh","refresh","httpService","refreshAccessToken","catch","finally","schedule","expSeconds","getAccessTokenExpiry","fireInMs","Date","now","setTimeout","Math","max","onForeground","remainingMs","unsubscribeTokens","onTokensChanged","removeForeground","document","handler","visibilityState","addEventListener","removeEventListener","AppState","subscription","state","remove","dispose"],"sourceRoot":"../../../../src","sources":["ui/context/inSessionTokenRefresh.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -4,19 +4,24 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.mintSessionViaPerApexIframe = mintSessionViaPerApexIframe;
|
|
7
|
-
exports.selectActiveRefreshAccount = selectActiveRefreshAccount;
|
|
8
7
|
var _core = require("@oxyhq/core");
|
|
9
8
|
/**
|
|
10
|
-
* Silent, no-reload session-restore
|
|
9
|
+
* Silent, no-reload session-restore PRIMITIVE — the single shared
|
|
11
10
|
* implementation used by BOTH cold boot (`OxyContext.restoreSessionsFromStorage`)
|
|
12
11
|
* and in-session token refresh (`createInSessionRefreshHandler`). Neither caller
|
|
13
|
-
* re-implements
|
|
12
|
+
* re-implements it; they compose it. Keeping one home avoids the two paths
|
|
14
13
|
* drifting on "how do we mint a first-party token without a page reload".
|
|
15
14
|
*
|
|
16
|
-
*
|
|
17
|
-
* the
|
|
18
|
-
*
|
|
19
|
-
*
|
|
15
|
+
* Platform-agnostic at the type level and returns plain data; the callers own
|
|
16
|
+
* the side effects that differ between them (cold boot COMMITS the recovered
|
|
17
|
+
* session into provider state; refresh only reads the freshly planted bearer).
|
|
18
|
+
*
|
|
19
|
+
* NOTE (session-sync cutover, Task 5): this file used to also export
|
|
20
|
+
* `selectActiveRefreshAccount`, which picked the active account out of a
|
|
21
|
+
* `refreshAllSessions` (`oxy_rt` refresh-cookie) snapshot. Deleted — its only
|
|
22
|
+
* caller was the in-session refresh handler's now-deleted `refresh-cookie`
|
|
23
|
+
* arm. The device account SET is server-authoritative via `SessionClient`
|
|
24
|
+
* (`@oxyhq/core`) now.
|
|
20
25
|
*/
|
|
21
26
|
|
|
22
27
|
/**
|
|
@@ -48,18 +53,4 @@ async function mintSessionViaPerApexIframe(oxyServices, timeoutMs) {
|
|
|
48
53
|
}
|
|
49
54
|
return session;
|
|
50
55
|
}
|
|
51
|
-
|
|
52
|
-
/**
|
|
53
|
-
* Pick the active account from a `refreshAllSessions` snapshot: the persisted
|
|
54
|
-
* `authuser` slot when it still matches a returned account, otherwise the lowest
|
|
55
|
-
* `authuser` (the server sorts ascending, so `[0]`). Callers guarantee a
|
|
56
|
-
* non-empty list, so the result is always defined.
|
|
57
|
-
*
|
|
58
|
-
* Shared by cold-boot cookie restore and the in-session refresh cookie arm so
|
|
59
|
-
* the active-slot selection can never diverge between them.
|
|
60
|
-
*/
|
|
61
|
-
function selectActiveRefreshAccount(accounts, persistedAuthuser) {
|
|
62
|
-
const matched = persistedAuthuser !== null ? accounts.find(account => account.authuser === persistedAuthuser) : undefined;
|
|
63
|
-
return matched ?? accounts[0];
|
|
64
|
-
}
|
|
65
56
|
//# sourceMappingURL=silentSessionRestore.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_core","require","mintSessionViaPerApexIframe","oxyServices","timeoutMs","perApexAuthUrl","autoDetectAuthWebUrl","session","silentSignIn","authWebUrlOverride","timeout","user","sessionId"
|
|
1
|
+
{"version":3,"names":["_core","require","mintSessionViaPerApexIframe","oxyServices","timeoutMs","perApexAuthUrl","autoDetectAuthWebUrl","session","silentSignIn","authWebUrlOverride","timeout","user","sessionId"],"sourceRoot":"../../../../src","sources":["ui/context/silentSessionRestore.ts"],"mappings":";;;;;;AAmBA,IAAAA,KAAA,GAAAC,OAAA;AAnBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,eAAeC,2BAA2BA,CAC/CC,WAAwB,EACxBC,SAAiB,EACqB;EACtC,MAAMC,cAAc,GAAG,IAAAC,0BAAoB,EAAC,CAAC;EAC7C,IAAI,CAACD,cAAc,EAAE;IACnB,OAAO,IAAI;EACb;EACA,MAAME,OAAO,GAAG,MAAMJ,WAAW,CAACK,YAAY,GAAG;IAC/CC,kBAAkB,EAAEJ,cAAc;IAClCK,OAAO,EAAEN;EACX,CAAC,CAAC;EACF,IAAI,CAACG,OAAO,EAAEI,IAAI,IAAI,CAACJ,OAAO,CAACK,SAAS,EAAE;IACxC,OAAO,IAAI;EACb;EACA,OAAOL,OAAO;AAChB","ignoreList":[]}
|
|
@@ -27,7 +27,7 @@ var _useWebSSO = require("./useWebSSO.js");
|
|
|
27
27
|
* ```
|
|
28
28
|
*
|
|
29
29
|
* Cross-domain SSO:
|
|
30
|
-
* - Web: Automatic via
|
|
30
|
+
* - Web: Automatic via the per-apex `/auth/silent` iframe + terminal `/sso` bounce (SDK cold boot)
|
|
31
31
|
* - Native: Automatic via shared Keychain/Account Manager
|
|
32
32
|
* - Manual sign-in: signIn() redirects to the IdP (web) or opens the auth sheet (native)
|
|
33
33
|
*/
|
|
@@ -74,8 +74,9 @@ function useAuth() {
|
|
|
74
74
|
}
|
|
75
75
|
const isIdentityProvider = (0, _useWebSSO.isWebBrowser)() && window.location.hostname === idpHostname;
|
|
76
76
|
|
|
77
|
-
// Web (not on IdP): use the tokenless redirect SSO flow.
|
|
78
|
-
//
|
|
77
|
+
// Web (not on IdP): use the tokenless redirect SSO flow. The silent
|
|
78
|
+
// cross-domain restore (per-apex `/auth/silent` iframe + `/sso` bounce)
|
|
79
|
+
// already ran on page load; an explicit click needs interactive auth.
|
|
79
80
|
if ((0, _useWebSSO.isWebBrowser)() && !publicKey && !isIdentityProvider) {
|
|
80
81
|
oxyServices.signInWithRedirect?.({
|
|
81
82
|
redirectUri: window.location.href
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_OxyContext","_useWebSSO","useAuth","user","isAuthenticated","isLoading","isTokenReady","hasAccessToken","canUsePrivateApi","isPrivateApiPending","isAuthResolved","error","signIn","oxySignIn","logout","logoutAll","refreshSessions","oxyServices","hasIdentity","getPublicKey","showBottomSheet","openAvatarPicker","useOxy","useCallback","publicKey","authWebUrl","config","idpHostname","URL","hostname","isIdentityProvider","isWebBrowser","window","location","signInWithRedirect","redirectUri","href","Promise","undefined","hasExisting","existingKey","_","reject","Error","authBase","loginUrl","includes","signOut","signOutAll","refresh","isReady"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAuth.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_react","require","_OxyContext","_useWebSSO","useAuth","user","isAuthenticated","isLoading","isTokenReady","hasAccessToken","canUsePrivateApi","isPrivateApiPending","isAuthResolved","error","signIn","oxySignIn","logout","logoutAll","refreshSessions","oxyServices","hasIdentity","getPublicKey","showBottomSheet","openAvatarPicker","useOxy","useCallback","publicKey","authWebUrl","config","idpHostname","URL","hostname","isIdentityProvider","isWebBrowser","window","location","signInWithRedirect","redirectUri","href","Promise","undefined","hasExisting","existingKey","_","reject","Error","authBase","loginUrl","includes","signOut","signOutAll","refresh","isReady"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAuth.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -151,7 +151,7 @@ function generateSessionToken() {
|
|
|
151
151
|
* deep-link listener, and unmount cleanup) are the legitimate `useEffect` use
|
|
152
152
|
* WITH cleanup. No effect here computes derived UI state.
|
|
153
153
|
*/
|
|
154
|
-
function useOxyAuthSession(oxyServices, clientId,
|
|
154
|
+
function useOxyAuthSession(oxyServices, clientId, commitSession, options = {}) {
|
|
155
155
|
const {
|
|
156
156
|
onSignedIn
|
|
157
157
|
} = options;
|
|
@@ -199,21 +199,26 @@ function useOxyAuthSession(oxyServices, clientId, switchSession, options = {}) {
|
|
|
199
199
|
// Without that exchange the SDK has no bearer token — the session is
|
|
200
200
|
// authorized server-side but the app never becomes authenticated and the UI
|
|
201
201
|
// sits "Waiting for authorization..." forever. Once `claimSessionByToken`
|
|
202
|
-
// plants the tokens in the HttpService, the
|
|
203
|
-
//
|
|
202
|
+
// plants the tokens in the HttpService, the claimed session is committed via
|
|
203
|
+
// `commitSession` (`useOxy().handleWebSession`) — the SAME path a fresh
|
|
204
|
+
// password sign-in or a silent cross-domain restore uses to register the
|
|
205
|
+
// account into the device's server-authoritative session set. It is NOT yet a
|
|
206
|
+
// member of that set, so
|
|
207
|
+
// `switchSession` (an account-SWITCH between accounts already on the
|
|
208
|
+
// device) is the wrong primitive here. Shared with both containers via
|
|
204
209
|
// `completeDeviceFlowSignIn` so the two paths cannot drift.
|
|
205
210
|
const handleAuthSuccess = (0, _react.useCallback)(async (sessionId, sessionToken) => {
|
|
206
211
|
if (isProcessingRef.current) return;
|
|
207
212
|
isProcessingRef.current = true;
|
|
208
213
|
try {
|
|
209
|
-
if (!
|
|
210
|
-
throw new Error('Session
|
|
214
|
+
if (!commitSession) {
|
|
215
|
+
throw new Error('Session commit unavailable');
|
|
211
216
|
}
|
|
212
217
|
const user = await (0, _deviceFlowSignIn.completeDeviceFlowSignIn)({
|
|
213
218
|
oxyServices,
|
|
214
219
|
sessionId,
|
|
215
220
|
sessionToken,
|
|
216
|
-
|
|
221
|
+
commitSession
|
|
217
222
|
});
|
|
218
223
|
onSignedInRef.current?.(user);
|
|
219
224
|
} catch (err) {
|
|
@@ -221,7 +226,7 @@ function useOxyAuthSession(oxyServices, clientId, switchSession, options = {}) {
|
|
|
221
226
|
setError('Authorization successful but failed to complete sign in. Please try again.');
|
|
222
227
|
isProcessingRef.current = false;
|
|
223
228
|
}
|
|
224
|
-
}, [oxyServices,
|
|
229
|
+
}, [oxyServices, commitSession]);
|
|
225
230
|
|
|
226
231
|
// Start polling for authorization.
|
|
227
232
|
//
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_reactNative","_socket","_interopRequireDefault","_core","_deviceFlowSignIn","e","__esModule","default","debug","createDebugLogger","OXY_ACCOUNTS_WEB_URL","exports","OXY_AUTH_WEB_URL","AUTH_SESSION_EXPIRY_MS","POLLING_INTERVAL_MS","resolveAuthWebBaseUrl","baseURL","authWebUrl","url","URL","port","origin","hostname","startsWith","slice","resolveAuthRedirectUri","authRedirectUri","initialUrl","Linking","getInitialURL","parsed","search","hash","toString","getRedirectParams","sessionId","searchParams","get","undefined","error","generateSessionToken","bytes","Uint8Array","crypto","getRandomValues","Array","from","b","padStart","join","useOxyAuthSession","oxyServices","clientId","switchSession","options","onSignedIn","authSession","setAuthSession","useState","isLoading","setIsLoading","setError","isWaiting","setIsWaiting","authorizeCode","setAuthorizeCode","qrPayload","setQrPayload","socketRef","useRef","pollingIntervalRef","isProcessingRef","linkingHandledRef","onSignedInRef","current","cleanup","useCallback","disconnect","clearInterval","handleAuthSuccess","sessionToken","Error","user","completeDeviceFlowSignIn","err","startPolling","setInterval","response","makeRequest","cache","authorized","status","log","connectSocket","getBaseURL","socket","io","transports","reconnection","reconnectionAttempts","reconnectionDelay","on","emit","payload","message","generateAuthSession","expiresAt","Date","now","createResponse","openAuthApproval","authBaseUrl","config","webUrl","set","Platform","OS","width","height","screenWidth","window","screen","screenHeight","left","top","open","redirectUri","openURL","openSameDeviceApproval","retry","handleAuthRedirect","params","flowSessionToken","useEffect","subscription","addEventListener","then","catch","remove","qrData"],"sourceRoot":"../../../../src","sources":["ui/hooks/useOxyAuthSession.ts"],"mappings":";;;;;;;AAsBA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAC,sBAAA,CAAAH,OAAA;AAEA,IAAAI,KAAA,GAAAJ,OAAA;AACA,IAAAK,iBAAA,GAAAL,OAAA;AAAwE,SAAAG,uBAAAG,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AA3BxE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AASA,MAAMG,KAAK,GAAG,IAAAC,uBAAiB,EAAC,mBAAmB,CAAC;;AAEpD;AACA;AACA;AACA;AACA;AACO,MAAMC,oBAAoB,GAAAC,OAAA,CAAAD,oBAAA,GAAG,yBAAyB;;AAE7D;AACO,MAAME,gBAAgB,GAAAD,OAAA,CAAAC,gBAAA,GAAG,qBAAqB;;AAErD;AACO,MAAMC,sBAAsB,GAAAF,OAAA,CAAAE,sBAAA,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI;;AAEnD;AACO,MAAMC,mBAAmB,GAAAH,OAAA,CAAAG,mBAAA,GAAG,IAAI;;AAEvC;;AAQA;AACA;AACA;AACA;AACA;AACA;;AAgBA;;AAgEA;AACA;AACA;AACA;AACA,SAASC,qBAAqBA,CAACC,OAAe,EAAEC,UAAmB,EAAU;EAC3E,IAAIA,UAAU,EAAE;IACd,OAAOA,UAAU;EACnB;EAEA,IAAI;IACF,MAAMC,GAAG,GAAG,IAAIC,GAAG,CAACH,OAAO,CAAC;IAC5B,IAAIE,GAAG,CAACE,IAAI,KAAK,MAAM,EAAE;MACvBF,GAAG,CAACE,IAAI,GAAG,MAAM;MACjB,OAAOF,GAAG,CAACG,MAAM;IACnB;IACA,IAAIH,GAAG,CAACI,QAAQ,CAACC,UAAU,CAAC,MAAM,CAAC,EAAE;MACnCL,GAAG,CAACI,QAAQ,GAAG,QAAQJ,GAAG,CAACI,QAAQ,CAACE,KAAK,CAAC,CAAC,CAAC,EAAE;MAC9C,OAAON,GAAG,CAACG,MAAM;IACnB;EACF,CAAC,CAAC,MAAM;IACN;EAAA;EAEF,OAAOT,gBAAgB;AACzB;;AAEA;AACA;AACA;AACA;AACA;AACA,eAAea,sBAAsBA,CAACC,eAAwB,EAA0B;EACtF,IAAIA,eAAe,EAAE;IACnB,OAAOA,eAAe;EACxB;EAEA,IAAI;IACF,MAAMC,UAAU,GAAG,MAAMC,oBAAO,CAACC,aAAa,CAAC,CAAC;IAChD,IAAI,CAACF,UAAU,EAAE;MACf,OAAO,IAAI;IACb;IAEA,MAAMG,MAAM,GAAG,IAAIX,GAAG,CAACQ,UAAU,CAAC;IAClCG,MAAM,CAACC,MAAM,GAAG,EAAE;IAClBD,MAAM,CAACE,IAAI,GAAG,EAAE;IAChB,OAAOF,MAAM,CAACG,QAAQ,CAAC,CAAC;EAC1B,CAAC,CAAC,MAAM;IACN,OAAO,IAAI;EACb;AACF;;AAEA;AACA,SAASC,iBAAiBA,CAAChB,GAAW,EAAiD;EACrF,IAAI;IACF,MAAMY,MAAM,GAAG,IAAIX,GAAG,CAACD,GAAG,CAAC;IAC3B,MAAMiB,SAAS,GAAGL,MAAM,CAACM,YAAY,CAACC,GAAG,CAAC,YAAY,CAAC,IAAIC,SAAS;IACpE,MAAMC,KAAK,GAAGT,MAAM,CAACM,YAAY,CAACC,GAAG,CAAC,OAAO,CAAC,IAAIC,SAAS;IAE3D,IAAI,CAACH,SAAS,IAAI,CAACI,KAAK,EAAE;MACxB,OAAO,IAAI;IACb;IAEA,OAAO;MAAEJ,SAAS;MAAEI;IAAM,CAAC;EAC7B,CAAC,CAAC,MAAM;IACN,OAAO,IAAI;EACb;AACF;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASC,oBAAoBA,CAAA,EAAW;EACtC,MAAMC,KAAK,GAAG,IAAIC,UAAU,CAAC,EAAE,CAAC;EAChCC,MAAM,CAACC,eAAe,CAACH,KAAK,CAAC;EAC7B,OAAOI,KAAK,CAACC,IAAI,CAACL,KAAK,EAAGM,CAAC,IAAKA,CAAC,CAACd,QAAQ,CAAC,EAAE,CAAC,CAACe,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAACC,IAAI,CAAC,EAAE,CAAC;AAC3E;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,iBAAiBA,CAC/BC,WAAwB,EACxBC,QAAuB,EACvBC,aAAiE,EACjEC,OAAiC,GAAG,CAAC,CAAC,EACb;EACzB,MAAM;IAAEC;EAAW,CAAC,GAAGD,OAAO;EAE9B,MAAM,CAACE,WAAW,EAAEC,cAAc,CAAC,GAAG,IAAAC,eAAQ,EAAqB,IAAI,CAAC;EACxE,MAAM,CAACC,SAAS,EAAEC,YAAY,CAAC,GAAG,IAAAF,eAAQ,EAAC,IAAI,CAAC;EAChD,MAAM,CAACnB,KAAK,EAAEsB,QAAQ,CAAC,GAAG,IAAAH,eAAQ,EAAgB,IAAI,CAAC;EACvD,MAAM,CAACI,SAAS,EAAEC,YAAY,CAAC,GAAG,IAAAL,eAAQ,EAAC,KAAK,CAAC;EACjD;EACA,MAAM,CAACM,aAAa,EAAEC,gBAAgB,CAAC,GAAG,IAAAP,eAAQ,EAAgB,IAAI,CAAC;EACvE,MAAM,CAACQ,SAAS,EAAEC,YAAY,CAAC,GAAG,IAAAT,eAAQ,EAAgB,IAAI,CAAC;EAE/D,MAAMU,SAAS,GAAG,IAAAC,aAAM,EAAgB,IAAI,CAAC;EAC7C,MAAMC,kBAAkB,GAAG,IAAAD,aAAM,EAAwC,IAAI,CAAC;EAC9E,MAAME,eAAe,GAAG,IAAAF,aAAM,EAAC,KAAK,CAAC;EACrC,MAAMG,iBAAiB,GAAG,IAAAH,aAAM,EAAC,KAAK,CAAC;;EAEvC;EACA;EACA;EACA;EACA,MAAMI,aAAa,GAAG,IAAAJ,aAAM,EAACd,UAAU,CAAC;EACxCkB,aAAa,CAACC,OAAO,GAAGnB,UAAU;;EAElC;EACA,MAAMoB,OAAO,GAAG,IAAAC,kBAAW,EAAC,MAAM;IAChCb,YAAY,CAAC,KAAK,CAAC;IAEnB,IAAIK,SAAS,CAACM,OAAO,EAAE;MACrBN,SAAS,CAACM,OAAO,CAACG,UAAU,CAAC,CAAC;MAC9BT,SAAS,CAACM,OAAO,GAAG,IAAI;IAC1B;IAEA,IAAIJ,kBAAkB,CAACI,OAAO,EAAE;MAC9BI,aAAa,CAACR,kBAAkB,CAACI,OAAO,CAAC;MACzCJ,kBAAkB,CAACI,OAAO,GAAG,IAAI;IACnC;EACF,CAAC,EAAE,EAAE,CAAC;;EAEN;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,MAAMK,iBAAiB,GAAG,IAAAH,kBAAW,EACnC,OAAOzC,SAAiB,EAAE6C,YAAoB,KAAK;IACjD,IAAIT,eAAe,CAACG,OAAO,EAAE;IAC7BH,eAAe,CAACG,OAAO,GAAG,IAAI;IAE9B,IAAI;MACF,IAAI,CAACrB,aAAa,EAAE;QAClB,MAAM,IAAI4B,KAAK,CAAC,gCAAgC,CAAC;MACnD;MACA,MAAMC,IAAI,GAAG,MAAM,IAAAC,0CAAwB,EAAC;QAC1ChC,WAAW;QACXhB,SAAS;QACT6C,YAAY;QACZ3B;MACF,CAAC,CAAC;MACFoB,aAAa,CAACC,OAAO,GAAGQ,IAAI,CAAC;IAC/B,CAAC,CAAC,OAAOE,GAAG,EAAE;MACZ5E,KAAK,CAAC+B,KAAK,CAAC,wBAAwB,EAAE6C,GAAG,CAAC;MAC1CvB,QAAQ,CAAC,4EAA4E,CAAC;MACtFU,eAAe,CAACG,OAAO,GAAG,KAAK;IACjC;EACF,CAAC,EACD,CAACvB,WAAW,EAAEE,aAAa,CAC7B,CAAC;;EAED;EACA;EACA;EACA;EACA;EACA,MAAMgC,YAAY,GAAG,IAAAT,kBAAW,EAC7BI,YAAoB,IAAK;IACxB,IAAIV,kBAAkB,CAACI,OAAO,EAAE;IAEhCJ,kBAAkB,CAACI,OAAO,GAAGY,WAAW,CAAC,YAAY;MACnD,IAAIf,eAAe,CAACG,OAAO,EAAE;MAE7B,IAAI;QACF,MAAMa,QAKL,GAAG,MAAMpC,WAAW,CAACqC,WAAW,CAC/B,KAAK,EACL,wBAAwBR,YAAY,EAAE,EACtC1C,SAAS,EACT;UAAEmD,KAAK,EAAE;QAAM,CACjB,CAAC;QAED,IAAIF,QAAQ,CAACG,UAAU,IAAIH,QAAQ,CAACpD,SAAS,EAAE;UAC7CwC,OAAO,CAAC,CAAC;UACT;UACA;UACAI,iBAAiB,CAACQ,QAAQ,CAACpD,SAAS,EAAE6C,YAAY,CAAC;QACrD,CAAC,MAAM,IAAIO,QAAQ,CAACI,MAAM,KAAK,WAAW,EAAE;UAC1ChB,OAAO,CAAC,CAAC;UACTd,QAAQ,CAAC,2BAA2B,CAAC;QACvC,CAAC,MAAM,IAAI0B,QAAQ,CAACI,MAAM,KAAK,SAAS,EAAE;UACxChB,OAAO,CAAC,CAAC;UACTd,QAAQ,CAAC,oCAAoC,CAAC;QAChD;MACF,CAAC,CAAC,OAAOuB,GAAG,EAAE;QACZ;QACA5E,KAAK,CAACoF,GAAG,CAAC,qBAAqB,EAAER,GAAG,CAAC;MACvC;IACF,CAAC,EAAEtE,mBAAmB,CAAC;EACzB,CAAC,EACD,CAACqC,WAAW,EAAE4B,iBAAiB,EAAEJ,OAAO,CAC1C,CAAC;;EAED;EACA,MAAMkB,aAAa,GAAG,IAAAjB,kBAAW,EAC9BI,YAAoB,IAAK;IACxB,MAAMhE,OAAO,GAAGmC,WAAW,CAAC2C,UAAU,CAAC,CAAC;;IAExC;IACA,MAAMC,MAAM,GAAG,IAAAC,eAAE,EAAC,GAAGhF,OAAO,eAAe,EAAE;MAC3CiF,UAAU,EAAE,CAAC,WAAW,EAAE,SAAS,CAAC;MACpCC,YAAY,EAAE,IAAI;MAClBC,oBAAoB,EAAE,CAAC;MACvBC,iBAAiB,EAAE;IACrB,CAAC,CAAC;IAEFhC,SAAS,CAACM,OAAO,GAAGqB,MAAM;IAE1BA,MAAM,CAACM,EAAE,CAAC,SAAS,EAAE,MAAM;MACzB7F,KAAK,CAACoF,GAAG,CAAC,uBAAuB,CAAC;MAClCG,MAAM,CAACO,IAAI,CAAC,MAAM,EAAEtB,YAAY,CAAC;IACnC,CAAC,CAAC;IAEFe,MAAM,CAACM,EAAE,CAAC,QAAQ,EAAE,MAAM;MACxB7F,KAAK,CAACoF,GAAG,CAAC,0BAA0B,CAAC;IACvC,CAAC,CAAC;IAEFG,MAAM,CAACM,EAAE,CAAC,aAAa,EAAGE,OAA0B,IAAK;MACvD/F,KAAK,CAACoF,GAAG,CAAC,uBAAuB,EAAEW,OAAO,CAAC;MAE3C,IAAIA,OAAO,CAACZ,MAAM,KAAK,YAAY,IAAIY,OAAO,CAACpE,SAAS,EAAE;QACxDwC,OAAO,CAAC,CAAC;QACT;QACA;QACAI,iBAAiB,CAACwB,OAAO,CAACpE,SAAS,EAAE6C,YAAY,CAAC;MACpD,CAAC,MAAM,IAAIuB,OAAO,CAACZ,MAAM,KAAK,WAAW,EAAE;QACzChB,OAAO,CAAC,CAAC;QACTd,QAAQ,CAAC,2BAA2B,CAAC;MACvC,CAAC,MAAM,IAAI0C,OAAO,CAACZ,MAAM,KAAK,SAAS,EAAE;QACvChB,OAAO,CAAC,CAAC;QACTd,QAAQ,CAAC,oCAAoC,CAAC;MAChD;IACF,CAAC,CAAC;IAEFkC,MAAM,CAACM,EAAE,CAAC,eAAe,EAAGjB,GAAG,IAAK;MAClC5E,KAAK,CAACoF,GAAG,CACP,mDAAmD,EACnDR,GAAG,YAAYH,KAAK,GAAGG,GAAG,CAACoB,OAAO,GAAG,IACvC,CAAC;MACD;MACA;MACA;MACAT,MAAM,CAAClB,UAAU,CAAC,CAAC;MACnBQ,YAAY,CAACL,YAAY,CAAC;IAC5B,CAAC,CAAC;IAEFe,MAAM,CAACM,EAAE,CAAC,YAAY,EAAE,MAAM;MAC5B7F,KAAK,CAACoF,GAAG,CAAC,0BAA0B,CAAC;IACvC,CAAC,CAAC;EACJ,CAAC,EACD,CAACzC,WAAW,EAAE4B,iBAAiB,EAAEJ,OAAO,EAAEU,YAAY,CACxD,CAAC;;EAED;EACA,MAAMoB,mBAAmB,GAAG,IAAA7B,kBAAW,EAAC,YAAY;IAClDhB,YAAY,CAAC,IAAI,CAAC;IAClBC,QAAQ,CAAC,IAAI,CAAC;IACd;IACAI,gBAAgB,CAAC,IAAI,CAAC;IACtBE,YAAY,CAAC,IAAI,CAAC;IAClBI,eAAe,CAACG,OAAO,GAAG,KAAK;;IAE/B;IACA;IACA;IACA;IACA;IACA,IAAI,CAACtB,QAAQ,EAAE;MACbS,QAAQ,CAAC,4DAA4D,CAAC;MACtED,YAAY,CAAC,KAAK,CAAC;MACnB;IACF;IAEA,IAAI;MACF,MAAMoB,YAAY,GAAGxC,oBAAoB,CAAC,CAAC;MAC3C,MAAMkE,SAAS,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC,GAAG/F,sBAAsB;;MAErD;MACA;MACA;MACA;MACA,MAAMgG,cAAc,GAAG,MAAM1D,WAAW,CAACqC,WAAW,CAClD,MAAM,EACN,sBAAsB,EACtB;QAAER,YAAY;QAAE0B,SAAS;QAAEtD;MAAS,CAAC,EACrC;QAAEqC,KAAK,EAAE;MAAM,CACjB,CAAC;MAEDhC,cAAc,CAAC;QAAEuB,YAAY;QAAE0B;MAAU,CAAC,CAAC;MAC3CzC,gBAAgB,CAAC4C,cAAc,EAAE7C,aAAa,IAAI,IAAI,CAAC;MACvDG,YAAY,CAAC0C,cAAc,EAAE3C,SAAS,IAAI,IAAI,CAAC;MAC/CH,YAAY,CAAC,IAAI,CAAC;;MAElB;MACA;MACA;MACA8B,aAAa,CAACb,YAAY,CAAC;MAC3BK,YAAY,CAACL,YAAY,CAAC;IAC5B,CAAC,CAAC,OAAOI,GAAY,EAAE;MACrBvB,QAAQ,CAAC,CAACuB,GAAG,YAAYH,KAAK,GAAGG,GAAG,CAACoB,OAAO,GAAG,IAAI,KAAK,+BAA+B,CAAC;IAC1F,CAAC,SAAS;MACR5C,YAAY,CAAC,KAAK,CAAC;IACrB;EACF,CAAC,EAAE,CAACT,WAAW,EAAE0C,aAAa,EAAER,YAAY,EAAEjC,QAAQ,CAAC,CAAC;;EAExD;EACA;EACA;EACA;EACA,MAAM0D,gBAAgB,GAAG,IAAAlC,kBAAW,EAAC,YAAY;IAC/C,IAAI,CAACpB,WAAW,EAAE;IAElB,MAAMuD,WAAW,GAAGhG,qBAAqB,CACvCoC,WAAW,CAAC2C,UAAU,CAAC,CAAC,EACxB3C,WAAW,CAAC6D,MAAM,EAAE/F,UACtB,CAAC;IACD,MAAMgG,MAAM,GAAG,IAAI9F,GAAG,CAAC,YAAY,EAAE4F,WAAW,CAAC;IACjDE,MAAM,CAAC7E,YAAY,CAAC8E,GAAG,CAAC,OAAO,EAAE1D,WAAW,CAACwB,YAAY,CAAC;IAE1D,IAAImC,qBAAQ,CAACC,EAAE,KAAK,KAAK,EAAE;MACzB;MACA,MAAMC,KAAK,GAAG,GAAG;MACjB,MAAMC,MAAM,GAAG,GAAG;MAClB,MAAMC,WAAW,GAAGC,MAAM,CAACC,MAAM,EAAEJ,KAAK,IAAIA,KAAK;MACjD,MAAMK,YAAY,GAAGF,MAAM,CAACC,MAAM,EAAEH,MAAM,IAAIA,MAAM;MACpD,MAAMK,IAAI,GAAG,CAACJ,WAAW,GAAGF,KAAK,IAAI,CAAC;MACtC,MAAMO,GAAG,GAAG,CAACF,YAAY,GAAGJ,MAAM,IAAI,CAAC;MAEvCE,MAAM,CAACK,IAAI,CACTZ,MAAM,CAAChF,QAAQ,CAAC,CAAC,EACjB,mBAAmB,EACnB,SAASoF,KAAK,WAAWC,MAAM,SAASK,IAAI,QAAQC,GAAG,EACzD,CAAC;MACD;IACF;;IAEA;IACA,MAAME,WAAW,GAAG,MAAMrG,sBAAsB,CAAC0B,WAAW,CAAC6D,MAAM,EAAEtF,eAAe,CAAC;IACrF,IAAIoG,WAAW,EAAE;MACfb,MAAM,CAAC7E,YAAY,CAAC8E,GAAG,CAAC,cAAc,EAAEY,WAAW,CAAC;IACtD;IAEA,IAAI;MACF,MAAMlG,oBAAO,CAACmG,OAAO,CAACd,MAAM,CAAChF,QAAQ,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAC,OAAOmD,GAAG,EAAE;MACZ5E,KAAK,CAAC+B,KAAK,CAAC,0BAA0B,EAAE6C,GAAG,CAAC;MAC5CvB,QAAQ,CAAC,+DAA+D,CAAC;IAC3E;EACF,CAAC,EAAE,CAACL,WAAW,EAAEL,WAAW,CAAC,CAAC;;EAE9B;EACA;EACA;EACA;EACA;EACA,MAAM6E,sBAAsB,GAAG,IAAApD,kBAAW,EAAC,YAAY;IACrD,IAAI,CAACV,SAAS,EAAE;MACd;IACF;IACA,IAAI;MACF,MAAMtC,oBAAO,CAACmG,OAAO,CAAC7D,SAAS,CAAC;IAClC,CAAC,CAAC,OAAOkB,GAAG,EAAE;MACZ5E,KAAK,CAAC+B,KAAK,CAAC,0CAA0C,EAAE6C,GAAG,CAAC;MAC5DvB,QAAQ,CAAC,2EAA2E,CAAC;IACvF;EACF,CAAC,EAAE,CAACK,SAAS,CAAC,CAAC;;EAEf;EACA,MAAM+D,KAAK,GAAG,IAAArD,kBAAW,EAAC,MAAM;IAC9BD,OAAO,CAAC,CAAC;IACT8B,mBAAmB,CAAC,CAAC;EACvB,CAAC,EAAE,CAACA,mBAAmB,EAAE9B,OAAO,CAAC,CAAC;;EAElC;EACA,MAAMuD,kBAAkB,GAAG,IAAAtD,kBAAW,EACnC1D,GAAW,IAAK;IACf,MAAMiH,MAAM,GAAGjG,iBAAiB,CAAChB,GAAG,CAAC;IACrC,IAAI,CAACiH,MAAM,EAAE;MACX;IACF;IAEA,IAAIA,MAAM,CAAC5F,KAAK,EAAE;MAChBoC,OAAO,CAAC,CAAC;MACTd,QAAQ,CAAC,2BAA2B,CAAC;MACrC;IACF;IAEA,IAAIsE,MAAM,CAAChG,SAAS,EAAE;MACpB;MACA;MACA;MACA;MACA;MACA;MACA,MAAMiG,gBAAgB,GAAG5E,WAAW,EAAEwB,YAAY;MAClD,IAAI,CAACoD,gBAAgB,EAAE;QACrB;MACF;MACAzD,OAAO,CAAC,CAAC;MACTI,iBAAiB,CAACoD,MAAM,CAAChG,SAAS,EAAEiG,gBAAgB,CAAC;IACvD;EACF,CAAC,EACD,CAAC5E,WAAW,EAAEmB,OAAO,EAAEI,iBAAiB,CAC1C,CAAC;;EAED;EACA;EACA,IAAAsD,gBAAS,EAAC,MAAM;IACd5B,mBAAmB,CAAC,CAAC;IACrB;EACF,CAAC,EAAE,EAAE,CAAC;;EAEN;EACA;EACA;EACA,IAAA4B,gBAAS,EAAC,MAAM;IACd,IAAIlB,qBAAQ,CAACC,EAAE,KAAK,KAAK,EAAE;MACzB;IACF;IAEA,MAAMkB,YAAY,GAAG1G,oBAAO,CAAC2G,gBAAgB,CAAC,KAAK,EAAE,CAAC;MAAErH;IAAI,CAAC,KAAK;MAChEsD,iBAAiB,CAACE,OAAO,GAAG,IAAI;MAChCwD,kBAAkB,CAAChH,GAAG,CAAC;IACzB,CAAC,CAAC;IAEFU,oBAAO,CAACC,aAAa,CAAC,CAAC,CACpB2G,IAAI,CAAEtH,GAAG,IAAK;MACb,IAAIA,GAAG,IAAI,CAACsD,iBAAiB,CAACE,OAAO,EAAE;QACrCwD,kBAAkB,CAAChH,GAAG,CAAC;MACzB;IACF,CAAC,CAAC,CACDuH,KAAK,CAAC,MAAM;MACX;IAAA,CACD,CAAC;IAEJ,OAAO,MAAM;MACXH,YAAY,CAACI,MAAM,CAAC,CAAC;IACvB,CAAC;EACH,CAAC,EAAE,CAACR,kBAAkB,CAAC,CAAC;;EAExB;EACA,IAAAG,gBAAS,EAAC,MAAM;IACd,OAAO,MAAM;MACX1D,OAAO,CAAC,CAAC;IACX,CAAC;EACH,CAAC,EAAE,CAACA,OAAO,CAAC,CAAC;EAEb,MAAMgE,MAAM,GAAGnF,WAAW,GAAG,aAAaA,WAAW,CAACwB,YAAY,EAAE,GAAG,EAAE;EAEzE,OAAO;IACLxB,WAAW;IACXmF,MAAM;IACN3E,aAAa;IACbE,SAAS;IACTP,SAAS;IACTpB,KAAK;IACLuB,SAAS;IACTgD,gBAAgB;IAChBkB,sBAAsB;IACtBC,KAAK;IACLtD;EACF,CAAC;AACH","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_react","require","_reactNative","_socket","_interopRequireDefault","_core","_deviceFlowSignIn","e","__esModule","default","debug","createDebugLogger","OXY_ACCOUNTS_WEB_URL","exports","OXY_AUTH_WEB_URL","AUTH_SESSION_EXPIRY_MS","POLLING_INTERVAL_MS","resolveAuthWebBaseUrl","baseURL","authWebUrl","url","URL","port","origin","hostname","startsWith","slice","resolveAuthRedirectUri","authRedirectUri","initialUrl","Linking","getInitialURL","parsed","search","hash","toString","getRedirectParams","sessionId","searchParams","get","undefined","error","generateSessionToken","bytes","Uint8Array","crypto","getRandomValues","Array","from","b","padStart","join","useOxyAuthSession","oxyServices","clientId","commitSession","options","onSignedIn","authSession","setAuthSession","useState","isLoading","setIsLoading","setError","isWaiting","setIsWaiting","authorizeCode","setAuthorizeCode","qrPayload","setQrPayload","socketRef","useRef","pollingIntervalRef","isProcessingRef","linkingHandledRef","onSignedInRef","current","cleanup","useCallback","disconnect","clearInterval","handleAuthSuccess","sessionToken","Error","user","completeDeviceFlowSignIn","err","startPolling","setInterval","response","makeRequest","cache","authorized","status","log","connectSocket","getBaseURL","socket","io","transports","reconnection","reconnectionAttempts","reconnectionDelay","on","emit","payload","message","generateAuthSession","expiresAt","Date","now","createResponse","openAuthApproval","authBaseUrl","config","webUrl","set","Platform","OS","width","height","screenWidth","window","screen","screenHeight","left","top","open","redirectUri","openURL","openSameDeviceApproval","retry","handleAuthRedirect","params","flowSessionToken","useEffect","subscription","addEventListener","then","catch","remove","qrData"],"sourceRoot":"../../../../src","sources":["ui/hooks/useOxyAuthSession.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -11,7 +11,6 @@ var _storageHelpers = require("../utils/storageHelpers.js");
|
|
|
11
11
|
var _errorHandlers = require("../utils/errorHandlers.js");
|
|
12
12
|
var _queryClient = require("./queryClient.js");
|
|
13
13
|
var _useWebSSO = require("./useWebSSO.js");
|
|
14
|
-
var _activeAuthuser = require("../utils/activeAuthuser.js");
|
|
15
14
|
const DEFAULT_SAVE_ERROR_MESSAGE = 'Failed to save session data';
|
|
16
15
|
const CLEAR_STORAGE_ERROR = 'Failed to clear storage';
|
|
17
16
|
|
|
@@ -168,59 +167,17 @@ const useSessionManagement = ({
|
|
|
168
167
|
removalTimerIdsRef.current.forEach(clearTimeout);
|
|
169
168
|
};
|
|
170
169
|
}, []);
|
|
171
|
-
const findReplacementSession = (0, _react.useCallback)(async sessionIds => {
|
|
172
|
-
if (!sessionIds.length) {
|
|
173
|
-
return null;
|
|
174
|
-
}
|
|
175
|
-
const validationResults = await (0, _sessionHelpers.validateSessionBatch)(oxyServices, sessionIds, {
|
|
176
|
-
maxConcurrency: 3
|
|
177
|
-
});
|
|
178
|
-
const validSession = validationResults.find(result => result.valid);
|
|
179
|
-
if (!validSession) {
|
|
180
|
-
return null;
|
|
181
|
-
}
|
|
182
|
-
const validation = await oxyServices.validateSession(validSession.sessionId, {
|
|
183
|
-
useHeaderValidation: true
|
|
184
|
-
});
|
|
185
|
-
if (!validation?.valid || !validation.user) {
|
|
186
|
-
return null;
|
|
187
|
-
}
|
|
188
|
-
const user = validation.user;
|
|
189
|
-
await activateSession(validSession.sessionId, user);
|
|
190
|
-
return user;
|
|
191
|
-
}, [activateSession, oxyServices]);
|
|
192
170
|
const switchSession = (0, _react.useCallback)(async sessionId => {
|
|
193
171
|
try {
|
|
194
|
-
//
|
|
195
|
-
// `
|
|
196
|
-
//
|
|
197
|
-
// refresh
|
|
198
|
-
//
|
|
199
|
-
//
|
|
200
|
-
// path arrives here only after a bearer has been planted by
|
|
172
|
+
// On web, the bearer must already be in memory (planted by
|
|
173
|
+
// `claimSessionByToken`, a cold-boot silent-restore step, or a prior
|
|
174
|
+
// `SessionClient` sync) before validating — there is no client-side
|
|
175
|
+
// `oxy_rt` refresh-cookie slot to fall back on; the device account SET
|
|
176
|
+
// is server-authoritative via `SessionClient` now. The native path
|
|
177
|
+
// arrives here only after a bearer has been planted by
|
|
201
178
|
// `claimSessionByToken` or secure shared-session restore.
|
|
202
|
-
if ((0, _useWebSSO.isWebBrowser)()) {
|
|
203
|
-
|
|
204
|
-
const targetAuthuser = targetSession?.authuser;
|
|
205
|
-
if (typeof targetAuthuser === 'number') {
|
|
206
|
-
const refreshed = await oxyServices.refreshTokenViaCookie({
|
|
207
|
-
authuser: targetAuthuser
|
|
208
|
-
});
|
|
209
|
-
if (refreshed === null) {
|
|
210
|
-
// Slot's refresh cookie is missing / expired / reused. Fall
|
|
211
|
-
// through to the invalid-session branch below by throwing the
|
|
212
|
-
// canonical invalid-session error.
|
|
213
|
-
throw new Error('Session is invalid or expired');
|
|
214
|
-
}
|
|
215
|
-
// Plant the slot's fresh access token; subsequent bearer calls
|
|
216
|
-
// (`validateSession`, `getCurrentUser`) will use it. The server
|
|
217
|
-
// also rotated the cookie at this point.
|
|
218
|
-
oxyServices.httpService.setTokens(refreshed.accessToken);
|
|
219
|
-
(0, _activeAuthuser.writeActiveAuthuser)(targetAuthuser);
|
|
220
|
-
}
|
|
221
|
-
if (!oxyServices.getAccessToken()) {
|
|
222
|
-
throw new Error('Session is invalid or expired');
|
|
223
|
-
}
|
|
179
|
+
if ((0, _useWebSSO.isWebBrowser)() && !oxyServices.getAccessToken()) {
|
|
180
|
+
throw new Error('Session is invalid or expired');
|
|
224
181
|
}
|
|
225
182
|
const validation = await oxyServices.validateSession(sessionId, {
|
|
226
183
|
useHeaderValidation: true
|
|
@@ -250,16 +207,12 @@ const useSessionManagement = ({
|
|
|
250
207
|
} catch (error) {
|
|
251
208
|
const invalidSession = (0, _errorHandlers.isInvalidSessionError)(error);
|
|
252
209
|
if (invalidSession) {
|
|
210
|
+
// Server authority (`SessionClient` bootstrap/sync) reconciles which
|
|
211
|
+
// account is actually active — just drop the invalid session from
|
|
212
|
+
// the local view rather than guessing at a replacement.
|
|
253
213
|
updateSessions(sessionsRef.current.filter(session => session.sessionId !== sessionId), {
|
|
254
214
|
merge: false
|
|
255
215
|
});
|
|
256
|
-
if (sessionId === activeSessionIdRef.current) {
|
|
257
|
-
const otherSessionIds = sessionsRef.current.filter(session => session.sessionId !== sessionId && !removedSessionsRef.current.has(session.sessionId)).map(session => session.sessionId);
|
|
258
|
-
const replacementUser = await findReplacementSession(otherSessionIds);
|
|
259
|
-
if (replacementUser) {
|
|
260
|
-
return replacementUser;
|
|
261
|
-
}
|
|
262
|
-
}
|
|
263
216
|
}
|
|
264
217
|
(0, _errorHandlers.handleAuthError)(error, {
|
|
265
218
|
defaultMessage: 'Failed to switch session',
|
|
@@ -270,7 +223,7 @@ const useSessionManagement = ({
|
|
|
270
223
|
});
|
|
271
224
|
throw error instanceof Error ? error : new Error('Failed to switch session');
|
|
272
225
|
}
|
|
273
|
-
}, [activateSession,
|
|
226
|
+
}, [activateSession, logger, onError, oxyServices, setAuthError, updateSessions]);
|
|
274
227
|
const refreshSessions = (0, _react.useCallback)(async activeUserId => {
|
|
275
228
|
// Capture the active session id once so the async closure below uses a
|
|
276
229
|
// narrowed, non-null local instead of re-reading the ref (which the
|
|
@@ -297,11 +250,10 @@ const useSessionManagement = ({
|
|
|
297
250
|
});
|
|
298
251
|
} catch (error) {
|
|
299
252
|
if ((0, _errorHandlers.isInvalidSessionError)(error)) {
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
}
|
|
253
|
+
// Server authority (`SessionClient` bootstrap/sync) reconciles
|
|
254
|
+
// which account is actually active — just clear local state
|
|
255
|
+
// rather than guessing at a replacement session.
|
|
256
|
+
await clearSessionState();
|
|
305
257
|
return;
|
|
306
258
|
}
|
|
307
259
|
(0, _errorHandlers.handleAuthError)(error, {
|
|
@@ -318,7 +270,7 @@ const useSessionManagement = ({
|
|
|
318
270
|
})();
|
|
319
271
|
refreshInFlightRef.current = refreshPromise;
|
|
320
272
|
await refreshPromise;
|
|
321
|
-
}, [clearSessionState,
|
|
273
|
+
}, [clearSessionState, logger, onError, oxyServices, setAuthError, updateSessions]);
|
|
322
274
|
const isRefreshInFlight = Boolean(refreshInFlightRef.current);
|
|
323
275
|
return {
|
|
324
276
|
sessions,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_core","_sessionHelpers","_storageHelpers","_errorHandlers","_queryClient","_useWebSSO","_activeAuthuser","DEFAULT_SAVE_ERROR_MESSAGE","CLEAR_STORAGE_ERROR","useSessionManagement","oxyServices","storage","storageKeyPrefix","loginSuccess","logoutStore","applyLanguagePreference","onAuthStateChange","onError","setAuthError","logger","setTokenReady","queryClient","sessions","setSessions","useState","activeSessionId","setActiveSessionId","sessionsRef","useRef","current","activeSessionIdRef","refreshInFlightRef","removedSessionsRef","Set","lastRefreshRef","storageKeys","useMemo","getStorageKeys","saveSessionIds","useCallback","sessionIds","uniqueIds","Array","from","setItem","JSON","stringify","error","isDev","console","warn","updateSessions","incoming","options","prevSessions","processed","merge","mergeSessions","normalizeAndSortSessions","map","session","sessionId","preserveSessionIds","sessionsArraysEqual","saveActiveSessionId","handleAuthError","defaultMessage","code","removeActiveSessionId","removeItem","clearSessionStorage","clearSessionState","clearTokens","clear","clearQueryCache","activateSession","user","removalTimerIdsRef","trackRemovedSession","add","timerId","setTimeout","delete","useEffect","forEach","clearTimeout","findReplacementSession","length","validationResults","validateSessionBatch","maxConcurrency","validSession","find","result","valid","validation","validateSession","useHeaderValidation","switchSession","isWebBrowser","targetSession","s","targetAuthuser","authuser","refreshed","refreshTokenViaCookie","Error","httpService","setTokens","accessToken","writeActiveAuthuser","getAccessToken","deviceSessions","fetchSessionsWithFallback","fallbackUserId","id","invalidSession","isInvalidSessionError","filter","otherSessionIds","has","replacementUser","refreshSessions","activeUserId","now","Date","refreshPromise","otherSessions","isRefreshInFlight","Boolean","exports"],"sourceRoot":"../../../../src","sources":["ui/hooks/useSessionManagement.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_react","require","_core","_sessionHelpers","_storageHelpers","_errorHandlers","_queryClient","_useWebSSO","DEFAULT_SAVE_ERROR_MESSAGE","CLEAR_STORAGE_ERROR","useSessionManagement","oxyServices","storage","storageKeyPrefix","loginSuccess","logoutStore","applyLanguagePreference","onAuthStateChange","onError","setAuthError","logger","setTokenReady","queryClient","sessions","setSessions","useState","activeSessionId","setActiveSessionId","sessionsRef","useRef","current","activeSessionIdRef","refreshInFlightRef","removedSessionsRef","Set","lastRefreshRef","storageKeys","useMemo","getStorageKeys","saveSessionIds","useCallback","sessionIds","uniqueIds","Array","from","setItem","JSON","stringify","error","isDev","console","warn","updateSessions","incoming","options","prevSessions","processed","merge","mergeSessions","normalizeAndSortSessions","map","session","sessionId","preserveSessionIds","sessionsArraysEqual","saveActiveSessionId","handleAuthError","defaultMessage","code","removeActiveSessionId","removeItem","clearSessionStorage","clearSessionState","clearTokens","clear","clearQueryCache","activateSession","user","removalTimerIdsRef","trackRemovedSession","add","timerId","setTimeout","delete","useEffect","forEach","clearTimeout","switchSession","isWebBrowser","getAccessToken","Error","validation","validateSession","useHeaderValidation","valid","deviceSessions","fetchSessionsWithFallback","fallbackUserId","id","invalidSession","isInvalidSessionError","filter","refreshSessions","activeUserId","now","Date","refreshPromise","isRefreshInFlight","Boolean","exports"],"sourceRoot":"../../../../src","sources":["ui/hooks/useSessionManagement.ts"],"mappings":"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","ignoreList":[]}
|