@oxyhq/services 10.2.0 → 10.2.2
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/README.md +9 -13
- package/lib/commonjs/index.js +10 -0
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/ui/components/AccountMenu.js +297 -226
- package/lib/commonjs/ui/components/AccountMenu.js.map +1 -1
- package/lib/commonjs/ui/components/AccountMenuButton.js.map +1 -1
- package/lib/commonjs/ui/components/FollowButton.js +3 -1
- package/lib/commonjs/ui/components/FollowButton.js.map +1 -1
- package/lib/commonjs/ui/components/OxySignInButton.js +1 -1
- package/lib/commonjs/ui/components/SignInModal.js +11 -12
- package/lib/commonjs/ui/components/SignInModal.js.map +1 -1
- package/lib/commonjs/ui/components/accountMenuRows.js +18 -30
- package/lib/commonjs/ui/components/accountMenuRows.js.map +1 -1
- package/lib/commonjs/ui/context/OxyContext.js +57 -78
- package/lib/commonjs/ui/context/OxyContext.js.map +1 -1
- package/lib/commonjs/ui/context/hooks/useAuthOperations.js +7 -13
- package/lib/commonjs/ui/context/hooks/useAuthOperations.js.map +1 -1
- package/lib/commonjs/ui/hooks/useAuth.js +10 -40
- package/lib/commonjs/ui/hooks/useAuth.js.map +1 -1
- package/lib/commonjs/ui/hooks/useDeviceAccounts.js +285 -0
- package/lib/commonjs/ui/hooks/useDeviceAccounts.js.map +1 -0
- package/lib/commonjs/ui/hooks/useFollow.js +21 -7
- package/lib/commonjs/ui/hooks/useFollow.js.map +1 -1
- package/lib/commonjs/ui/hooks/useSessionManagement.js +5 -6
- package/lib/commonjs/ui/hooks/useSessionManagement.js.map +1 -1
- package/lib/commonjs/ui/hooks/useSessionSocket.js +4 -5
- package/lib/commonjs/ui/hooks/useSessionSocket.js.map +1 -1
- package/lib/commonjs/ui/hooks/useWebSSO.js +1 -1
- package/lib/commonjs/ui/navigation/routes.js +7 -7
- package/lib/commonjs/ui/navigation/routes.js.map +1 -1
- package/lib/commonjs/ui/screens/OxyAuthScreen.js +6 -7
- package/lib/commonjs/ui/screens/OxyAuthScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/ProfileScreen.js +18 -20
- package/lib/commonjs/ui/screens/ProfileScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/WelcomeNewUserScreen.js +4 -4
- package/lib/commonjs/ui/screens/WelcomeNewUserScreen.js.map +1 -1
- package/lib/commonjs/ui/screens/{karma/KarmaAboutScreen.js → trust/TrustAboutScreen.js} +11 -11
- package/lib/commonjs/ui/screens/trust/TrustAboutScreen.js.map +1 -0
- package/lib/commonjs/ui/screens/{karma/KarmaCenterScreen.js → trust/TrustCenterScreen.js} +91 -41
- package/lib/commonjs/ui/screens/trust/TrustCenterScreen.js.map +1 -0
- package/lib/commonjs/ui/screens/{karma/KarmaFAQScreen.js → trust/TrustFAQScreen.js} +11 -11
- package/lib/commonjs/ui/screens/{karma/KarmaFAQScreen.js.map → trust/TrustFAQScreen.js.map} +1 -1
- package/lib/commonjs/ui/screens/{karma/KarmaLeaderboardScreen.js → trust/TrustLeaderboardScreen.js} +63 -42
- package/lib/commonjs/ui/screens/trust/TrustLeaderboardScreen.js.map +1 -0
- package/lib/commonjs/ui/screens/{karma/KarmaRewardsScreen.js → trust/TrustRewardsScreen.js} +54 -54
- package/lib/commonjs/ui/screens/trust/TrustRewardsScreen.js.map +1 -0
- package/lib/commonjs/ui/screens/{karma/KarmaRulesScreen.js → trust/TrustRulesScreen.js} +45 -16
- package/lib/commonjs/ui/screens/trust/TrustRulesScreen.js.map +1 -0
- package/lib/commonjs/ui/screens/trust/trustTier.js +23 -0
- package/lib/commonjs/ui/screens/trust/trustTier.js.map +1 -0
- package/lib/commonjs/utils/deviceFlowSignIn.js +12 -10
- package/lib/commonjs/utils/deviceFlowSignIn.js.map +1 -1
- package/lib/module/index.js +3 -0
- package/lib/module/index.js.map +1 -1
- package/lib/module/ui/components/AccountMenu.js +297 -226
- package/lib/module/ui/components/AccountMenu.js.map +1 -1
- package/lib/module/ui/components/AccountMenuButton.js.map +1 -1
- package/lib/module/ui/components/FollowButton.js +3 -1
- package/lib/module/ui/components/FollowButton.js.map +1 -1
- package/lib/module/ui/components/OxySignInButton.js +1 -1
- package/lib/module/ui/components/SignInModal.js +11 -12
- package/lib/module/ui/components/SignInModal.js.map +1 -1
- package/lib/module/ui/components/accountMenuRows.js +18 -30
- package/lib/module/ui/components/accountMenuRows.js.map +1 -1
- package/lib/module/ui/context/OxyContext.js +58 -79
- package/lib/module/ui/context/OxyContext.js.map +1 -1
- package/lib/module/ui/context/hooks/useAuthOperations.js +7 -13
- package/lib/module/ui/context/hooks/useAuthOperations.js.map +1 -1
- package/lib/module/ui/hooks/useAuth.js +10 -40
- package/lib/module/ui/hooks/useAuth.js.map +1 -1
- package/lib/module/ui/hooks/useDeviceAccounts.js +281 -0
- package/lib/module/ui/hooks/useDeviceAccounts.js.map +1 -0
- package/lib/module/ui/hooks/useFollow.js +21 -7
- package/lib/module/ui/hooks/useFollow.js.map +1 -1
- package/lib/module/ui/hooks/useSessionManagement.js +5 -6
- package/lib/module/ui/hooks/useSessionManagement.js.map +1 -1
- package/lib/module/ui/hooks/useSessionSocket.js +4 -5
- package/lib/module/ui/hooks/useSessionSocket.js.map +1 -1
- package/lib/module/ui/hooks/useWebSSO.js +1 -1
- package/lib/module/ui/navigation/routes.js +7 -7
- package/lib/module/ui/navigation/routes.js.map +1 -1
- package/lib/module/ui/screens/OxyAuthScreen.js +6 -7
- package/lib/module/ui/screens/OxyAuthScreen.js.map +1 -1
- package/lib/module/ui/screens/ProfileScreen.js +18 -20
- package/lib/module/ui/screens/ProfileScreen.js.map +1 -1
- package/lib/module/ui/screens/WelcomeNewUserScreen.js +4 -4
- package/lib/module/ui/screens/WelcomeNewUserScreen.js.map +1 -1
- package/lib/module/ui/screens/{karma/KarmaAboutScreen.js → trust/TrustAboutScreen.js} +11 -11
- package/lib/module/ui/screens/trust/TrustAboutScreen.js.map +1 -0
- package/lib/module/ui/screens/{karma/KarmaCenterScreen.js → trust/TrustCenterScreen.js} +92 -42
- package/lib/module/ui/screens/trust/TrustCenterScreen.js.map +1 -0
- package/lib/module/ui/screens/{karma/KarmaFAQScreen.js → trust/TrustFAQScreen.js} +11 -11
- package/lib/module/ui/screens/{karma/KarmaFAQScreen.js.map → trust/TrustFAQScreen.js.map} +1 -1
- package/lib/module/ui/screens/{karma/KarmaLeaderboardScreen.js → trust/TrustLeaderboardScreen.js} +63 -42
- package/lib/module/ui/screens/trust/TrustLeaderboardScreen.js.map +1 -0
- package/lib/module/ui/screens/{karma/KarmaRewardsScreen.js → trust/TrustRewardsScreen.js} +54 -54
- package/lib/module/ui/screens/trust/TrustRewardsScreen.js.map +1 -0
- package/lib/module/ui/screens/{karma/KarmaRulesScreen.js → trust/TrustRulesScreen.js} +45 -16
- package/lib/module/ui/screens/trust/TrustRulesScreen.js.map +1 -0
- package/lib/module/ui/screens/trust/trustTier.js +19 -0
- package/lib/module/ui/screens/trust/trustTier.js.map +1 -0
- package/lib/module/utils/deviceFlowSignIn.js +13 -10
- package/lib/module/utils/deviceFlowSignIn.js.map +1 -1
- package/lib/typescript/commonjs/index.d.ts +3 -1
- package/lib/typescript/commonjs/index.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/components/AccountMenu.d.ts +30 -10
- package/lib/typescript/commonjs/ui/components/AccountMenu.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/components/SignInModal.d.ts +1 -1
- package/lib/typescript/commonjs/ui/components/SignInModal.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/components/accountMenuRows.d.ts +19 -12
- package/lib/typescript/commonjs/ui/components/accountMenuRows.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/context/OxyContext.d.ts +3 -3
- package/lib/typescript/commonjs/ui/context/OxyContext.d.ts.map +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 +1 -7
- package/lib/typescript/commonjs/ui/hooks/mutations/useAccountMutations.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/useAuth.d.ts +3 -7
- package/lib/typescript/commonjs/ui/hooks/useAuth.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/useDeviceAccounts.d.ts +133 -0
- package/lib/typescript/commonjs/ui/hooks/useDeviceAccounts.d.ts.map +1 -0
- package/lib/typescript/commonjs/ui/hooks/useFollow.d.ts +1 -1
- package/lib/typescript/commonjs/ui/hooks/useFollow.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/useSessionManagement.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/useSessionSocket.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/useWebSSO.d.ts +1 -1
- package/lib/typescript/commonjs/ui/navigation/routes.d.ts +1 -1
- package/lib/typescript/commonjs/ui/screens/OxyAuthScreen.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/screens/ProfileScreen.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/screens/trust/TrustAboutScreen.d.ts +5 -0
- package/lib/typescript/commonjs/ui/screens/{karma/KarmaAboutScreen.d.ts.map → trust/TrustAboutScreen.d.ts.map} +1 -1
- package/lib/typescript/commonjs/ui/screens/trust/TrustCenterScreen.d.ts +5 -0
- package/lib/typescript/commonjs/ui/screens/trust/TrustCenterScreen.d.ts.map +1 -0
- package/lib/typescript/{module/ui/screens/karma/KarmaFAQScreen.d.ts → commonjs/ui/screens/trust/TrustFAQScreen.d.ts} +1 -1
- package/lib/typescript/commonjs/ui/screens/trust/TrustFAQScreen.d.ts.map +1 -0
- package/lib/typescript/commonjs/ui/screens/trust/TrustLeaderboardScreen.d.ts +5 -0
- package/lib/typescript/commonjs/ui/screens/trust/TrustLeaderboardScreen.d.ts.map +1 -0
- package/lib/typescript/commonjs/ui/screens/trust/TrustRewardsScreen.d.ts +5 -0
- package/lib/typescript/commonjs/ui/screens/{karma/KarmaRewardsScreen.d.ts.map → trust/TrustRewardsScreen.d.ts.map} +1 -1
- package/lib/typescript/commonjs/ui/screens/trust/TrustRulesScreen.d.ts +5 -0
- package/lib/typescript/commonjs/ui/screens/trust/TrustRulesScreen.d.ts.map +1 -0
- package/lib/typescript/commonjs/ui/screens/trust/trustTier.d.ts +9 -0
- package/lib/typescript/commonjs/ui/screens/trust/trustTier.d.ts.map +1 -0
- package/lib/typescript/commonjs/ui/types/navigation.d.ts +1 -1
- package/lib/typescript/commonjs/utils/deviceFlowSignIn.d.ts +11 -9
- package/lib/typescript/commonjs/utils/deviceFlowSignIn.d.ts.map +1 -1
- package/lib/typescript/module/index.d.ts +3 -1
- package/lib/typescript/module/index.d.ts.map +1 -1
- package/lib/typescript/module/ui/components/AccountMenu.d.ts +30 -10
- package/lib/typescript/module/ui/components/AccountMenu.d.ts.map +1 -1
- package/lib/typescript/module/ui/components/SignInModal.d.ts +1 -1
- package/lib/typescript/module/ui/components/SignInModal.d.ts.map +1 -1
- package/lib/typescript/module/ui/components/accountMenuRows.d.ts +19 -12
- package/lib/typescript/module/ui/components/accountMenuRows.d.ts.map +1 -1
- package/lib/typescript/module/ui/context/OxyContext.d.ts +3 -3
- package/lib/typescript/module/ui/context/OxyContext.d.ts.map +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 +1 -7
- package/lib/typescript/module/ui/hooks/mutations/useAccountMutations.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/useAuth.d.ts +3 -7
- package/lib/typescript/module/ui/hooks/useAuth.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/useDeviceAccounts.d.ts +133 -0
- package/lib/typescript/module/ui/hooks/useDeviceAccounts.d.ts.map +1 -0
- package/lib/typescript/module/ui/hooks/useFollow.d.ts +1 -1
- package/lib/typescript/module/ui/hooks/useFollow.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/useSessionManagement.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/useSessionSocket.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/useWebSSO.d.ts +1 -1
- package/lib/typescript/module/ui/navigation/routes.d.ts +1 -1
- package/lib/typescript/module/ui/screens/OxyAuthScreen.d.ts.map +1 -1
- package/lib/typescript/module/ui/screens/ProfileScreen.d.ts.map +1 -1
- package/lib/typescript/module/ui/screens/trust/TrustAboutScreen.d.ts +5 -0
- package/lib/typescript/module/ui/screens/{karma/KarmaAboutScreen.d.ts.map → trust/TrustAboutScreen.d.ts.map} +1 -1
- package/lib/typescript/module/ui/screens/trust/TrustCenterScreen.d.ts +5 -0
- package/lib/typescript/module/ui/screens/trust/TrustCenterScreen.d.ts.map +1 -0
- package/lib/typescript/{commonjs/ui/screens/karma/KarmaFAQScreen.d.ts → module/ui/screens/trust/TrustFAQScreen.d.ts} +1 -1
- package/lib/typescript/module/ui/screens/trust/TrustFAQScreen.d.ts.map +1 -0
- package/lib/typescript/module/ui/screens/trust/TrustLeaderboardScreen.d.ts +5 -0
- package/lib/typescript/module/ui/screens/trust/TrustLeaderboardScreen.d.ts.map +1 -0
- package/lib/typescript/module/ui/screens/trust/TrustRewardsScreen.d.ts +5 -0
- package/lib/typescript/module/ui/screens/{karma/KarmaRewardsScreen.d.ts.map → trust/TrustRewardsScreen.d.ts.map} +1 -1
- package/lib/typescript/module/ui/screens/trust/TrustRulesScreen.d.ts +5 -0
- package/lib/typescript/module/ui/screens/trust/TrustRulesScreen.d.ts.map +1 -0
- package/lib/typescript/module/ui/screens/trust/trustTier.d.ts +9 -0
- package/lib/typescript/module/ui/screens/trust/trustTier.d.ts.map +1 -0
- package/lib/typescript/module/ui/types/navigation.d.ts +1 -1
- package/lib/typescript/module/utils/deviceFlowSignIn.d.ts +11 -9
- package/lib/typescript/module/utils/deviceFlowSignIn.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/index.ts +10 -1
- package/src/ui/components/AccountMenu.tsx +311 -253
- package/src/ui/components/AccountMenuButton.tsx +2 -2
- package/src/ui/components/FollowButton.tsx +2 -2
- package/src/ui/components/OxySignInButton.tsx +1 -1
- package/src/ui/components/SignInModal.tsx +13 -14
- package/src/ui/components/accountMenuRows.ts +28 -40
- package/src/ui/context/OxyContext.tsx +71 -74
- package/src/ui/context/hooks/useAuthOperations.ts +7 -13
- package/src/ui/hooks/useAuth.ts +12 -49
- package/src/ui/hooks/useDeviceAccounts.ts +348 -0
- package/src/ui/hooks/useFollow.ts +16 -8
- package/src/ui/hooks/useSessionManagement.ts +5 -14
- package/src/ui/hooks/useSessionSocket.ts +4 -5
- package/src/ui/hooks/useWebSSO.ts +1 -1
- package/src/ui/navigation/routes.ts +13 -13
- package/src/ui/screens/OxyAuthScreen.tsx +6 -7
- package/src/ui/screens/ProfileScreen.tsx +15 -17
- package/src/ui/screens/WelcomeNewUserScreen.tsx +2 -2
- package/src/ui/screens/{karma/KarmaAboutScreen.tsx → trust/TrustAboutScreen.tsx} +15 -15
- package/src/ui/screens/{karma/KarmaCenterScreen.tsx → trust/TrustCenterScreen.tsx} +87 -41
- package/src/ui/screens/{karma/KarmaFAQScreen.tsx → trust/TrustFAQScreen.tsx} +10 -10
- package/src/ui/screens/trust/TrustLeaderboardScreen.tsx +101 -0
- package/src/ui/screens/{karma/KarmaRewardsScreen.tsx → trust/TrustRewardsScreen.tsx} +54 -54
- package/src/ui/screens/{karma/KarmaRulesScreen.tsx → trust/TrustRulesScreen.tsx} +27 -13
- package/src/ui/screens/trust/trustTier.ts +20 -0
- package/src/ui/types/navigation.ts +1 -2
- package/src/utils/__tests__/deviceFlowSignIn.test.ts +2 -3
- package/src/utils/deviceFlowSignIn.ts +18 -12
- package/lib/commonjs/ui/screens/karma/KarmaAboutScreen.js.map +0 -1
- package/lib/commonjs/ui/screens/karma/KarmaCenterScreen.js.map +0 -1
- package/lib/commonjs/ui/screens/karma/KarmaLeaderboardScreen.js.map +0 -1
- package/lib/commonjs/ui/screens/karma/KarmaRewardsScreen.js.map +0 -1
- package/lib/commonjs/ui/screens/karma/KarmaRulesScreen.js.map +0 -1
- package/lib/module/ui/screens/karma/KarmaAboutScreen.js.map +0 -1
- package/lib/module/ui/screens/karma/KarmaCenterScreen.js.map +0 -1
- package/lib/module/ui/screens/karma/KarmaLeaderboardScreen.js.map +0 -1
- package/lib/module/ui/screens/karma/KarmaRewardsScreen.js.map +0 -1
- package/lib/module/ui/screens/karma/KarmaRulesScreen.js.map +0 -1
- package/lib/typescript/commonjs/ui/screens/karma/KarmaAboutScreen.d.ts +0 -5
- package/lib/typescript/commonjs/ui/screens/karma/KarmaCenterScreen.d.ts +0 -5
- package/lib/typescript/commonjs/ui/screens/karma/KarmaCenterScreen.d.ts.map +0 -1
- package/lib/typescript/commonjs/ui/screens/karma/KarmaFAQScreen.d.ts.map +0 -1
- package/lib/typescript/commonjs/ui/screens/karma/KarmaLeaderboardScreen.d.ts +0 -5
- package/lib/typescript/commonjs/ui/screens/karma/KarmaLeaderboardScreen.d.ts.map +0 -1
- package/lib/typescript/commonjs/ui/screens/karma/KarmaRewardsScreen.d.ts +0 -5
- package/lib/typescript/commonjs/ui/screens/karma/KarmaRulesScreen.d.ts +0 -5
- package/lib/typescript/commonjs/ui/screens/karma/KarmaRulesScreen.d.ts.map +0 -1
- package/lib/typescript/module/ui/screens/karma/KarmaAboutScreen.d.ts +0 -5
- package/lib/typescript/module/ui/screens/karma/KarmaCenterScreen.d.ts +0 -5
- package/lib/typescript/module/ui/screens/karma/KarmaCenterScreen.d.ts.map +0 -1
- package/lib/typescript/module/ui/screens/karma/KarmaFAQScreen.d.ts.map +0 -1
- package/lib/typescript/module/ui/screens/karma/KarmaLeaderboardScreen.d.ts +0 -5
- package/lib/typescript/module/ui/screens/karma/KarmaLeaderboardScreen.d.ts.map +0 -1
- package/lib/typescript/module/ui/screens/karma/KarmaRewardsScreen.d.ts +0 -5
- package/lib/typescript/module/ui/screens/karma/KarmaRulesScreen.d.ts +0 -5
- package/lib/typescript/module/ui/screens/karma/KarmaRulesScreen.d.ts.map +0 -1
- package/src/ui/screens/karma/KarmaLeaderboardScreen.tsx +0 -88
|
@@ -29,7 +29,7 @@ var _useWebSSO = require("./useWebSSO.js");
|
|
|
29
29
|
* Cross-domain SSO:
|
|
30
30
|
* - Web: Automatic via FedCM (Chrome 108+, Safari 16.4+)
|
|
31
31
|
* - Native: Automatic via shared Keychain/Account Manager
|
|
32
|
-
* - Manual sign-in: signIn()
|
|
32
|
+
* - Manual sign-in: signIn() redirects to the IdP (web) or opens the auth sheet (native)
|
|
33
33
|
*/
|
|
34
34
|
|
|
35
35
|
/**
|
|
@@ -50,7 +50,6 @@ function useAuth() {
|
|
|
50
50
|
isAuthResolved,
|
|
51
51
|
error,
|
|
52
52
|
signIn: oxySignIn,
|
|
53
|
-
handlePopupSession,
|
|
54
53
|
logout,
|
|
55
54
|
logoutAll,
|
|
56
55
|
refreshSessions,
|
|
@@ -60,7 +59,7 @@ function useAuth() {
|
|
|
60
59
|
showBottomSheet,
|
|
61
60
|
openAvatarPicker
|
|
62
61
|
} = (0, _OxyContext.useOxy)();
|
|
63
|
-
const signIn = (0, _react.useCallback)(async
|
|
62
|
+
const signIn = (0, _react.useCallback)(async publicKey => {
|
|
64
63
|
// Check if we're on the identity provider itself
|
|
65
64
|
// Only the IdP has local login forms - other apps are client apps
|
|
66
65
|
const authWebUrl = oxyServices.config?.authWebUrl;
|
|
@@ -72,42 +71,13 @@ function useAuth() {
|
|
|
72
71
|
}
|
|
73
72
|
const isIdentityProvider = (0, _useWebSSO.isWebBrowser)() && window.location.hostname === idpHostname;
|
|
74
73
|
|
|
75
|
-
// Web (not on IdP):
|
|
76
|
-
//
|
|
77
|
-
// FedCM silent SSO already runs on page load via useWebSSO
|
|
78
|
-
// If user is clicking "Sign In", they need interactive auth NOW
|
|
74
|
+
// Web (not on IdP): use the tokenless redirect SSO flow. FedCM / silent SSO
|
|
75
|
+
// already run on page load; an explicit click needs interactive auth.
|
|
79
76
|
if ((0, _useWebSSO.isWebBrowser)() && !publicKey && !isIdentityProvider) {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
// ahead of their own awaits), reuse it.
|
|
85
|
-
const popup = preOpenedPopup ?? oxyServices.openBlankPopup?.() ?? null;
|
|
86
|
-
try {
|
|
87
|
-
const popupSession = await oxyServices.signInWithPopup?.({
|
|
88
|
-
popup
|
|
89
|
-
});
|
|
90
|
-
if (popupSession?.user) {
|
|
91
|
-
// The popup auth flow fetches full user data, so the session user
|
|
92
|
-
// contains full User fields even though the base type is MinimalUserData.
|
|
93
|
-
// Cast to the expected shape for handlePopupSession.
|
|
94
|
-
const sessionWithUser = {
|
|
95
|
-
...popupSession,
|
|
96
|
-
user: popupSession.user
|
|
97
|
-
};
|
|
98
|
-
await handlePopupSession(sessionWithUser);
|
|
99
|
-
return sessionWithUser.user;
|
|
100
|
-
}
|
|
101
|
-
throw new Error('Sign-in failed. Please try again.');
|
|
102
|
-
} catch (popupError) {
|
|
103
|
-
if (popup && !popup.closed) {
|
|
104
|
-
popup.close();
|
|
105
|
-
}
|
|
106
|
-
if (popupError instanceof Error && popupError.message.includes('blocked')) {
|
|
107
|
-
throw new Error('Popup blocked. Please allow popups for this site.');
|
|
108
|
-
}
|
|
109
|
-
throw popupError;
|
|
110
|
-
}
|
|
77
|
+
oxyServices.signInWithRedirect?.({
|
|
78
|
+
redirectUri: window.location.href
|
|
79
|
+
});
|
|
80
|
+
return new Promise(() => undefined);
|
|
111
81
|
}
|
|
112
82
|
|
|
113
83
|
// Native: Use cryptographic identity
|
|
@@ -142,7 +112,7 @@ function useAuth() {
|
|
|
142
112
|
return new Promise(() => {}); // Never resolves, page will redirect
|
|
143
113
|
}
|
|
144
114
|
throw new Error('No authentication method available');
|
|
145
|
-
}, [oxySignIn, hasIdentity, getPublicKey, showBottomSheet, oxyServices
|
|
115
|
+
}, [oxySignIn, hasIdentity, getPublicKey, showBottomSheet, oxyServices]);
|
|
146
116
|
const signOut = (0, _react.useCallback)(async () => {
|
|
147
117
|
await logout();
|
|
148
118
|
}, [logout]);
|
|
@@ -156,7 +126,7 @@ function useAuth() {
|
|
|
156
126
|
// State
|
|
157
127
|
user,
|
|
158
128
|
isAuthenticated,
|
|
159
|
-
isLoading,
|
|
129
|
+
isLoading: isLoading || !isAuthResolved,
|
|
160
130
|
isReady: isTokenReady,
|
|
161
131
|
isAuthResolved,
|
|
162
132
|
error,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_OxyContext","_useWebSSO","useAuth","user","isAuthenticated","isLoading","isTokenReady","isAuthResolved","error","signIn","oxySignIn","
|
|
1
|
+
{"version":3,"names":["_react","require","_OxyContext","_useWebSSO","useAuth","user","isAuthenticated","isLoading","isTokenReady","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":[]}
|
|
@@ -0,0 +1,285 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.markCurrentAccount = markCurrentAccount;
|
|
7
|
+
exports.useDeviceAccounts = useDeviceAccounts;
|
|
8
|
+
var _react = require("react");
|
|
9
|
+
var _reactQuery = require("@tanstack/react-query");
|
|
10
|
+
var _core = require("@oxyhq/core");
|
|
11
|
+
var _OxyContext = require("../context/OxyContext.js");
|
|
12
|
+
var _useI18n = require("./useI18n.js");
|
|
13
|
+
var _queryKeys = require("./queries/queryKeys.js");
|
|
14
|
+
/**
|
|
15
|
+
* The per-account user shape carried by a {@link DeviceAccount}. Either:
|
|
16
|
+
* - the minimal projection returned by `POST /auth/refresh-all`
|
|
17
|
+
* ({@link RefreshAllAccountUser}, the shared apex path), or
|
|
18
|
+
* - the SDK's canonical {@link User} document (the active row on the local
|
|
19
|
+
* fallback path, which already has the full user loaded in `useOxy()`).
|
|
20
|
+
*
|
|
21
|
+
* Both satisfy `getAccountDisplayName`'s `DisplayNameUserShape`, so display
|
|
22
|
+
* resolution is uniform across paths.
|
|
23
|
+
*/
|
|
24
|
+
|
|
25
|
+
/**
|
|
26
|
+
* One signed-in account on this device, fully hydrated for the account
|
|
27
|
+
* chooser. Unlike the old `AccountMenu` behaviour (which only carried the
|
|
28
|
+
* ACTIVE session's user), EVERY entry here carries real per-account
|
|
29
|
+
* `displayName` / `email` / `avatarUrl` / `color`.
|
|
30
|
+
*/
|
|
31
|
+
|
|
32
|
+
/**
|
|
33
|
+
* Resolve which entries are the current account, robustly.
|
|
34
|
+
*
|
|
35
|
+
* Primary signal: `entry.sessionId === activeSessionId`. On the web shared-apex
|
|
36
|
+
* path, `refreshAllSessions()` returns SERVER-side session ids that may not
|
|
37
|
+
* equal the locally-stored `activeSessionId` (a different storage namespace /
|
|
38
|
+
* server perspective), so a pure `sessionId` match can flag NO row as current —
|
|
39
|
+
* the bug that surfaced as "Not signed in" even while authenticated.
|
|
40
|
+
*
|
|
41
|
+
* Fallbacks, applied only when the `sessionId` match found nothing AND the user
|
|
42
|
+
* is authenticated:
|
|
43
|
+
* 1. Match the live `user.id` against each entry's per-account user id.
|
|
44
|
+
* 2. If still nothing and there is exactly one account, mark that one current.
|
|
45
|
+
*
|
|
46
|
+
* At most ONE entry is ever marked current.
|
|
47
|
+
*
|
|
48
|
+
* Pure & side-effect free so it is unit-testable without rendering React.
|
|
49
|
+
*/
|
|
50
|
+
function markCurrentAccount(accounts, activeSessionId, liveUserId, isAuthenticated) {
|
|
51
|
+
const bySession = accounts.map(account => ({
|
|
52
|
+
...account,
|
|
53
|
+
isCurrent: Boolean(activeSessionId) && account.sessionId === activeSessionId
|
|
54
|
+
}));
|
|
55
|
+
if (bySession.some(account => account.isCurrent) || !isAuthenticated) {
|
|
56
|
+
return bySession;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
// No row matched by session id: fall back to the live user's id, marking at
|
|
60
|
+
// most the FIRST matching entry current (never more than one).
|
|
61
|
+
if (liveUserId) {
|
|
62
|
+
let matched = false;
|
|
63
|
+
const byUser = bySession.map(account => {
|
|
64
|
+
if (!matched && account.user.id === liveUserId) {
|
|
65
|
+
matched = true;
|
|
66
|
+
return {
|
|
67
|
+
...account,
|
|
68
|
+
isCurrent: true
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
return account;
|
|
72
|
+
});
|
|
73
|
+
if (matched) {
|
|
74
|
+
return byUser;
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
// Authenticated, nothing matched, but there is exactly one account → it must
|
|
79
|
+
// be the current one (single-account shared-apex / cross-domain case).
|
|
80
|
+
if (bySession.length === 1) {
|
|
81
|
+
return [{
|
|
82
|
+
...bySession[0],
|
|
83
|
+
isCurrent: true
|
|
84
|
+
}];
|
|
85
|
+
}
|
|
86
|
+
return bySession;
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
/**
|
|
90
|
+
* Resolve every account signed in on this device for the unified account
|
|
91
|
+
* switcher, with real per-account name / email / avatar / color.
|
|
92
|
+
*
|
|
93
|
+
* ## Data sources (web vs native)
|
|
94
|
+
*
|
|
95
|
+
* - **Web on a `*.oxy.so` host** → `oxyServices.refreshAllSessions()` returns
|
|
96
|
+
* the full apex device-account list (identical to what `auth.oxy.so` sees,
|
|
97
|
+
* because the `Domain=oxy.so` refresh cookies reach `api.oxy.so`). Used
|
|
98
|
+
* directly — this is the `fromSharedApex: true` path.
|
|
99
|
+
* - **Cross-domain web (non-`oxy.so` apex)** OR **native (no browser cookies)**
|
|
100
|
+
* → `refreshAllSessions()` yields `{ accounts: [] }` (the apex cookies never
|
|
101
|
+
* reach the request: cross-domain by `Domain`, native by having no cookie
|
|
102
|
+
* jar at all; a 401 is also normalised to `{ accounts: [] }` inside the
|
|
103
|
+
* core mixin). In that case we FALL BACK to the SDK's local multi-account
|
|
104
|
+
* list from `useOxy()` (`sessions` + `activeSessionId` + the active `user`).
|
|
105
|
+
* This is the `fromSharedApex: false` path.
|
|
106
|
+
*
|
|
107
|
+
* The fallback decision is purely data-driven: **if `refreshAllSessions()`
|
|
108
|
+
* returns >0 accounts, use the shared path; otherwise fall back to local
|
|
109
|
+
* `useOxy()` sessions.** No host sniffing is needed — the cookie scoping does
|
|
110
|
+
* the discrimination for us, and the same code path works on native (where the
|
|
111
|
+
* fetch returns `{ accounts: [] }`).
|
|
112
|
+
*
|
|
113
|
+
* ## Why React Query (not a `useRef`/`useState` start-once like the auth app)
|
|
114
|
+
*
|
|
115
|
+
* The auth app's `use-device-accounts.ts` hand-rolls a `startedRef` because it
|
|
116
|
+
* has no React Query. The SDK does. `refreshAllSessions()` ROTATES single-use
|
|
117
|
+
* refresh cookies on every call, so it must run AT MOST ONCE per page load:
|
|
118
|
+
* we model that with `staleTime: Infinity` + `gcTime: Infinity` +
|
|
119
|
+
* `refetchOnWindowFocus/Reconnect/Mount: false` + `retry: false`. React Query
|
|
120
|
+
* dedupes concurrent mounts and caches the single result for the page's
|
|
121
|
+
* lifetime — the exact "run once" guarantee the auth app documents, but
|
|
122
|
+
* without the manual ref/state machinery.
|
|
123
|
+
*
|
|
124
|
+
* ## Validation note (intentionally NO zod re-parse)
|
|
125
|
+
*
|
|
126
|
+
* The auth app's hook calls `fetch` directly, so IT must `safeParse` the wire
|
|
127
|
+
* response with `@oxyhq/contracts`. This hook calls
|
|
128
|
+
* `oxyServices.refreshAllSessions()`, whose core mixin ALREADY validates and
|
|
129
|
+
* normalises the wire response (skips entries missing required fields,
|
|
130
|
+
* normalises `authuser` null→0, builds the `RefreshAllAccountUser` shape) — the
|
|
131
|
+
* mixin is the single source of truth. Re-validating the SDK's own already-typed
|
|
132
|
+
* output here would be redundant double-validation, so we do not re-parse.
|
|
133
|
+
*
|
|
134
|
+
* ## Error handling
|
|
135
|
+
*
|
|
136
|
+
* `refreshAllSessions()` already maps 401/404/abort to `{ accounts: [] }`
|
|
137
|
+
* internally. Any OTHER failure (network, 5xx) propagates as a thrown error and
|
|
138
|
+
* is surfaced by React Query (`query.isError`) — never swallowed. Callers that
|
|
139
|
+
* don't care can ignore it; the hook still returns the local fallback list so
|
|
140
|
+
* the chooser stays usable.
|
|
141
|
+
*/
|
|
142
|
+
function useDeviceAccounts() {
|
|
143
|
+
const {
|
|
144
|
+
oxyServices,
|
|
145
|
+
sessions,
|
|
146
|
+
activeSessionId,
|
|
147
|
+
user,
|
|
148
|
+
isAuthenticated
|
|
149
|
+
} = (0, _OxyContext.useOxy)();
|
|
150
|
+
const {
|
|
151
|
+
locale
|
|
152
|
+
} = (0, _useI18n.useI18n)();
|
|
153
|
+
|
|
154
|
+
// Stable, per-API-origin query key. `refreshAllSessions` resolves against
|
|
155
|
+
// the session base url derived from `getBaseURL()`, so keying on it scopes
|
|
156
|
+
// the cached result to the API the provider is pointed at.
|
|
157
|
+
const baseURL = oxyServices.getBaseURL();
|
|
158
|
+
const query = (0, _reactQuery.useQuery)({
|
|
159
|
+
queryKey: [..._queryKeys.queryKeys.accounts.all, 'deviceAccounts', baseURL],
|
|
160
|
+
queryFn: () => oxyServices.refreshAllSessions(),
|
|
161
|
+
// Only attempt the shared apex path while signed in. When logged out
|
|
162
|
+
// there is nothing to enumerate and the fallback (also empty) is used.
|
|
163
|
+
enabled: isAuthenticated,
|
|
164
|
+
// Single-use cookie rotation → run at most once per page load.
|
|
165
|
+
staleTime: Number.POSITIVE_INFINITY,
|
|
166
|
+
gcTime: Number.POSITIVE_INFINITY,
|
|
167
|
+
refetchOnWindowFocus: false,
|
|
168
|
+
refetchOnReconnect: false,
|
|
169
|
+
refetchOnMount: false,
|
|
170
|
+
retry: false
|
|
171
|
+
});
|
|
172
|
+
const sharedAccounts = query.data?.accounts ?? [];
|
|
173
|
+
const fromSharedApex = sharedAccounts.length > 0;
|
|
174
|
+
const accounts = (0, _react.useMemo)(() => {
|
|
175
|
+
const resolveAvatarUrl = avatar => avatar ? oxyServices.getFileDownloadUrl(avatar, 'thumb') : undefined;
|
|
176
|
+
|
|
177
|
+
// Build a single current-account row from the live `useOxy().user`. Used
|
|
178
|
+
// as a last-resort fallback when neither the shared-apex probe nor the
|
|
179
|
+
// local session store yielded a row but the user IS authenticated (e.g.
|
|
180
|
+
// a cross-domain host where the apex probe returned empty before the
|
|
181
|
+
// local session store hydrated). The signed-in user must ALWAYS be
|
|
182
|
+
// represented. Email is the REAL email or the `@handle` line — never a
|
|
183
|
+
// synthesized `username@oxy.so`.
|
|
184
|
+
const liveUserRow = () => {
|
|
185
|
+
if (!isAuthenticated || !user || !activeSessionId) {
|
|
186
|
+
return [];
|
|
187
|
+
}
|
|
188
|
+
const displayName = (0, _core.getAccountDisplayName)(user, locale);
|
|
189
|
+
const handle = (0, _core.getAccountFallbackHandle)(user);
|
|
190
|
+
const secondaryHandle = handle ? `@${handle}` : null;
|
|
191
|
+
return [{
|
|
192
|
+
sessionId: activeSessionId,
|
|
193
|
+
authuser: undefined,
|
|
194
|
+
isCurrent: true,
|
|
195
|
+
displayName,
|
|
196
|
+
email: user.email ?? secondaryHandle,
|
|
197
|
+
avatarUrl: resolveAvatarUrl(user.avatar),
|
|
198
|
+
color: user.color ?? null,
|
|
199
|
+
user
|
|
200
|
+
}];
|
|
201
|
+
};
|
|
202
|
+
let built;
|
|
203
|
+
if (fromSharedApex) {
|
|
204
|
+
// Shared apex path: every entry carries a real per-account user.
|
|
205
|
+
built = sharedAccounts.map(entry => {
|
|
206
|
+
// `entry.user` is non-null on the refresh-all path; the core
|
|
207
|
+
// mixin skips entries without a valid user. The fallback below
|
|
208
|
+
// keeps rendering defensive if a server response is incomplete.
|
|
209
|
+
const accountUser = entry.user ?? {
|
|
210
|
+
id: '',
|
|
211
|
+
username: ''
|
|
212
|
+
};
|
|
213
|
+
const displayName = (0, _core.getAccountDisplayName)(accountUser, locale);
|
|
214
|
+
const handle = (0, _core.getAccountFallbackHandle)(accountUser);
|
|
215
|
+
const email = entry.user?.email ?? null;
|
|
216
|
+
const secondaryHandle = handle ? `@${handle}` : null;
|
|
217
|
+
return {
|
|
218
|
+
sessionId: entry.sessionId,
|
|
219
|
+
authuser: entry.authuser,
|
|
220
|
+
// Provisional; finalised by `markCurrentAccount` below so the
|
|
221
|
+
// shared-apex path is robust to server/local session-id skew.
|
|
222
|
+
isCurrent: false,
|
|
223
|
+
displayName,
|
|
224
|
+
// Real email, or null (NEVER synthesized). The UI uses the
|
|
225
|
+
// `@handle` line only when email is genuinely absent.
|
|
226
|
+
email: email ?? secondaryHandle,
|
|
227
|
+
avatarUrl: resolveAvatarUrl(entry.user?.avatar),
|
|
228
|
+
color: entry.user?.color ?? null,
|
|
229
|
+
user: accountUser
|
|
230
|
+
};
|
|
231
|
+
});
|
|
232
|
+
} else {
|
|
233
|
+
// Local fallback path: build from the SDK's multi-session store. The
|
|
234
|
+
// active session row gets the full loaded `user`; inactive fallback
|
|
235
|
+
// rows carry only what the `ClientSession` exposes (no synthesized
|
|
236
|
+
// identity — they show the active user's data only when active).
|
|
237
|
+
built = (sessions ?? []).map(session => {
|
|
238
|
+
const isCurrent = session.sessionId === activeSessionId;
|
|
239
|
+
const accountUser = isCurrent && user ? user : {
|
|
240
|
+
id: session.userId ?? '',
|
|
241
|
+
username: ''
|
|
242
|
+
};
|
|
243
|
+
const displayName = (0, _core.getAccountDisplayName)(accountUser, locale);
|
|
244
|
+
const handle = (0, _core.getAccountFallbackHandle)(accountUser);
|
|
245
|
+
const email = isCurrent && user?.email ? user.email : null;
|
|
246
|
+
const secondaryHandle = handle ? `@${handle}` : null;
|
|
247
|
+
const avatar = isCurrent && user ? user.avatar : undefined;
|
|
248
|
+
const color = isCurrent && user?.color ? user.color : null;
|
|
249
|
+
return {
|
|
250
|
+
sessionId: session.sessionId,
|
|
251
|
+
authuser: session.authuser,
|
|
252
|
+
isCurrent,
|
|
253
|
+
displayName,
|
|
254
|
+
email: email ?? secondaryHandle,
|
|
255
|
+
avatarUrl: resolveAvatarUrl(avatar),
|
|
256
|
+
color,
|
|
257
|
+
user: accountUser
|
|
258
|
+
};
|
|
259
|
+
});
|
|
260
|
+
}
|
|
261
|
+
|
|
262
|
+
// Robust current-account detection: tolerate server/local session-id
|
|
263
|
+
// skew on the shared-apex path by falling back to the live user's id and
|
|
264
|
+
// the single-account heuristic.
|
|
265
|
+
const flagged = markCurrentAccount(built, activeSessionId, user?.id ?? null, isAuthenticated);
|
|
266
|
+
|
|
267
|
+
// The signed-in user must ALWAYS be represented. If detection produced
|
|
268
|
+
// an empty list yet the user is authenticated, synthesize a single
|
|
269
|
+
// current row from the live `useOxy().user`.
|
|
270
|
+
if (flagged.length === 0) {
|
|
271
|
+
return liveUserRow();
|
|
272
|
+
}
|
|
273
|
+
return flagged;
|
|
274
|
+
}, [fromSharedApex, sharedAccounts, sessions, activeSessionId, user, isAuthenticated, locale, oxyServices]);
|
|
275
|
+
return {
|
|
276
|
+
accounts,
|
|
277
|
+
// `isLoading` only reflects the shared probe while it's the relevant
|
|
278
|
+
// source. Once we know we're on the fallback (probe settled with 0
|
|
279
|
+
// accounts) the local list is synchronously available.
|
|
280
|
+
isLoading: isAuthenticated && query.isLoading,
|
|
281
|
+
currentSessionId: activeSessionId ?? null,
|
|
282
|
+
fromSharedApex
|
|
283
|
+
};
|
|
284
|
+
}
|
|
285
|
+
//# sourceMappingURL=useDeviceAccounts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["_react","require","_reactQuery","_core","_OxyContext","_useI18n","_queryKeys","markCurrentAccount","accounts","activeSessionId","liveUserId","isAuthenticated","bySession","map","account","isCurrent","Boolean","sessionId","some","matched","byUser","user","id","length","useDeviceAccounts","oxyServices","sessions","useOxy","locale","useI18n","baseURL","getBaseURL","query","useQuery","queryKey","queryKeys","all","queryFn","refreshAllSessions","enabled","staleTime","Number","POSITIVE_INFINITY","gcTime","refetchOnWindowFocus","refetchOnReconnect","refetchOnMount","retry","sharedAccounts","data","fromSharedApex","useMemo","resolveAvatarUrl","avatar","getFileDownloadUrl","undefined","liveUserRow","displayName","getAccountDisplayName","handle","getAccountFallbackHandle","secondaryHandle","authuser","email","avatarUrl","color","built","entry","accountUser","username","session","userId","flagged","isLoading","currentSessionId"],"sourceRoot":"../../../../src","sources":["ui/hooks/useDeviceAccounts.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -7,6 +7,7 @@ exports.useFollowerCounts = exports.useFollowForButton = exports.useFollow = voi
|
|
|
7
7
|
var _react = require("react");
|
|
8
8
|
var _followStore = require("../stores/followStore.js");
|
|
9
9
|
var _OxyContext = require("../context/OxyContext.js");
|
|
10
|
+
var _core = require("@oxyhq/core");
|
|
10
11
|
var _shallow = require("zustand/react/shallow");
|
|
11
12
|
/**
|
|
12
13
|
* useFollow — Hook for follow state management.
|
|
@@ -23,8 +24,12 @@ var _shallow = require("zustand/react/shallow");
|
|
|
23
24
|
*/
|
|
24
25
|
const useFollow = userId => {
|
|
25
26
|
const {
|
|
26
|
-
oxyServices
|
|
27
|
+
oxyServices,
|
|
28
|
+
isAuthenticated,
|
|
29
|
+
isAuthResolved,
|
|
30
|
+
isTokenReady
|
|
27
31
|
} = (0, _OxyContext.useOxy)();
|
|
32
|
+
const canUsePrivateApi = isAuthResolved && isTokenReady && isAuthenticated;
|
|
28
33
|
const userIds = (0, _react.useMemo)(() => Array.isArray(userId) ? userId : userId ? [userId] : [], [userId]);
|
|
29
34
|
const isSingleUser = typeof userId === 'string';
|
|
30
35
|
|
|
@@ -70,17 +75,19 @@ const useFollow = userId => {
|
|
|
70
75
|
// Store actions are accessed via getState() to avoid subscribing to them.
|
|
71
76
|
const toggleFollow = (0, _react.useCallback)(async () => {
|
|
72
77
|
if (!isSingleUser || !userId) throw new Error('toggleFollow is only available for single user mode');
|
|
78
|
+
if (!canUsePrivateApi) throw new Error('Authentication is required to follow users');
|
|
73
79
|
const currentlyFollowing = _followStore.useFollowStore.getState().followingUsers[userId] ?? false;
|
|
74
80
|
await _followStore.useFollowStore.getState().toggleFollowUser(userId, oxyServices, currentlyFollowing);
|
|
75
|
-
}, [isSingleUser, userId, oxyServices]);
|
|
81
|
+
}, [isSingleUser, userId, canUsePrivateApi, oxyServices]);
|
|
76
82
|
const setFollowStatus = (0, _react.useCallback)(following => {
|
|
77
83
|
if (!isSingleUser || !userId) throw new Error('setFollowStatus is only available for single user mode');
|
|
78
84
|
_followStore.useFollowStore.getState().setFollowingStatus(userId, following);
|
|
79
85
|
}, [isSingleUser, userId]);
|
|
80
86
|
const fetchStatus = (0, _react.useCallback)(async () => {
|
|
81
87
|
if (!isSingleUser || !userId) throw new Error('fetchStatus is only available for single user mode');
|
|
88
|
+
if (!canUsePrivateApi) return;
|
|
82
89
|
await _followStore.useFollowStore.getState().fetchFollowStatus(userId, oxyServices);
|
|
83
|
-
}, [isSingleUser, userId, oxyServices]);
|
|
90
|
+
}, [isSingleUser, userId, canUsePrivateApi, oxyServices]);
|
|
84
91
|
const clearError = (0, _react.useCallback)(() => {
|
|
85
92
|
if (!isSingleUser || !userId) throw new Error('clearError is only available for single user mode');
|
|
86
93
|
_followStore.useFollowStore.getState().clearFollowError(userId);
|
|
@@ -102,25 +109,32 @@ const useFollow = userId => {
|
|
|
102
109
|
(0, _react.useEffect)(() => {
|
|
103
110
|
if (!isSingleUser || !userId) return;
|
|
104
111
|
if ((followerCount === null || followingCount === null) && !isLoadingCounts) {
|
|
105
|
-
fetchUserCounts().catch(
|
|
112
|
+
fetchUserCounts().catch(error => {
|
|
113
|
+
_core.logger.warn('useFollow: fetchUserCounts failed', {
|
|
114
|
+
component: 'useFollow'
|
|
115
|
+
}, error);
|
|
116
|
+
});
|
|
106
117
|
}
|
|
107
118
|
}, [isSingleUser, userId, followerCount, followingCount, isLoadingCounts, fetchUserCounts]);
|
|
108
119
|
|
|
109
120
|
// Multi-user callbacks
|
|
110
121
|
const toggleFollowForUser = (0, _react.useCallback)(async targetUserId => {
|
|
122
|
+
if (!canUsePrivateApi) throw new Error('Authentication is required to follow users');
|
|
111
123
|
const currentState = _followStore.useFollowStore.getState().followingUsers[targetUserId] ?? false;
|
|
112
124
|
await _followStore.useFollowStore.getState().toggleFollowUser(targetUserId, oxyServices, currentState);
|
|
113
|
-
}, [oxyServices]);
|
|
125
|
+
}, [canUsePrivateApi, oxyServices]);
|
|
114
126
|
const setFollowStatusForUser = (0, _react.useCallback)((targetUserId, following) => {
|
|
115
127
|
_followStore.useFollowStore.getState().setFollowingStatus(targetUserId, following);
|
|
116
128
|
}, []);
|
|
117
129
|
const fetchStatusForUser = (0, _react.useCallback)(async targetUserId => {
|
|
130
|
+
if (!canUsePrivateApi) return;
|
|
118
131
|
await _followStore.useFollowStore.getState().fetchFollowStatus(targetUserId, oxyServices);
|
|
119
|
-
}, [oxyServices]);
|
|
132
|
+
}, [canUsePrivateApi, oxyServices]);
|
|
120
133
|
const fetchAllStatuses = (0, _react.useCallback)(async () => {
|
|
134
|
+
if (!canUsePrivateApi) return;
|
|
121
135
|
const store = _followStore.useFollowStore.getState();
|
|
122
136
|
await Promise.all(userIds.map(uid => store.fetchFollowStatus(uid, oxyServices)));
|
|
123
|
-
}, [userIds, oxyServices]);
|
|
137
|
+
}, [canUsePrivateApi, userIds, oxyServices]);
|
|
124
138
|
const clearErrorForUser = (0, _react.useCallback)(targetUserId => {
|
|
125
139
|
_followStore.useFollowStore.getState().clearFollowError(targetUserId);
|
|
126
140
|
}, []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_followStore","_OxyContext","_shallow","useFollow","userId","oxyServices","useOxy","userIds","useMemo","Array","isArray","isSingleUser","isFollowing","useFollowStore","useCallback","s","followingUsers","isLoading","loadingUsers","error","errors","followerCount","followerCounts","followingCount","followingCounts","isLoadingCounts","loadingCounts","followData","useShallow","data","uid","multiUserLoadingState","isAnyLoading","hasAnyError","allFollowing","allNotFollowing","some","every","toggleFollow","Error","currentlyFollowing","getState","toggleFollowUser","setFollowStatus","following","setFollowingStatus","fetchStatus","fetchFollowStatus","clearError","clearFollowError","fetchUserCounts","setFollowerCount","count","setFollowingCount","useEffect","catch","err","console","warn","toggleFollowForUser","targetUserId","currentState","setFollowStatusForUser","fetchStatusForUser","fetchAllStatuses","store","Promise","all","map","clearErrorForUser","updateCountsFromFollowAction","action","counts","currentUserId","getCurrentUserId","undefined","exports","useFollowForButton","useFollowerCounts"],"sourceRoot":"../../../../src","sources":["ui/hooks/useFollow.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_react","require","_followStore","_OxyContext","_core","_shallow","useFollow","userId","oxyServices","isAuthenticated","isAuthResolved","isTokenReady","useOxy","canUsePrivateApi","userIds","useMemo","Array","isArray","isSingleUser","isFollowing","useFollowStore","useCallback","s","followingUsers","isLoading","loadingUsers","error","errors","followerCount","followerCounts","followingCount","followingCounts","isLoadingCounts","loadingCounts","followData","useShallow","data","uid","multiUserLoadingState","isAnyLoading","hasAnyError","allFollowing","allNotFollowing","some","every","toggleFollow","Error","currentlyFollowing","getState","toggleFollowUser","setFollowStatus","following","setFollowingStatus","fetchStatus","fetchFollowStatus","clearError","clearFollowError","fetchUserCounts","setFollowerCount","count","setFollowingCount","useEffect","catch","loggerUtil","warn","component","toggleFollowForUser","targetUserId","currentState","setFollowStatusForUser","fetchStatusForUser","fetchAllStatuses","store","Promise","all","map","clearErrorForUser","updateCountsFromFollowAction","action","counts","currentUserId","getCurrentUserId","undefined","exports","useFollowForButton","useFollowerCounts"],"sourceRoot":"../../../../src","sources":["ui/hooks/useFollow.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -147,14 +147,13 @@ const useSessionManagement = ({
|
|
|
147
147
|
onAuthStateChange?.(null);
|
|
148
148
|
}, [clearSessionStorage, logoutStore, onAuthStateChange, oxyServices, queryClient, storage, logger]);
|
|
149
149
|
const activateSession = (0, _react.useCallback)(async (sessionId, user) => {
|
|
150
|
-
await oxyServices.getTokenBySession(sessionId);
|
|
151
150
|
setTokenReady?.(true);
|
|
152
151
|
setActiveSessionId(sessionId);
|
|
153
152
|
loginSuccess(user);
|
|
154
153
|
await saveActiveSessionId(sessionId);
|
|
155
154
|
await applyLanguagePreference(user);
|
|
156
155
|
onAuthStateChange?.(user);
|
|
157
|
-
}, [applyLanguagePreference, loginSuccess, onAuthStateChange,
|
|
156
|
+
}, [applyLanguagePreference, loginSuccess, onAuthStateChange, saveActiveSessionId, setTokenReady]);
|
|
158
157
|
const removalTimerIdsRef = (0, _react.useRef)(new Set());
|
|
159
158
|
const trackRemovedSession = (0, _react.useCallback)(sessionId => {
|
|
160
159
|
removedSessionsRef.current.add(sessionId);
|
|
@@ -196,10 +195,10 @@ const useSessionManagement = ({
|
|
|
196
195
|
// `refreshAllSessions` it carries its `authuser` slot index. We
|
|
197
196
|
// proactively plant that slot's access token via the httpOnly
|
|
198
197
|
// refresh cookie BEFORE validating, so the bearer-protected
|
|
199
|
-
// validate/getCurrentUser calls
|
|
200
|
-
//
|
|
201
|
-
//
|
|
202
|
-
// `
|
|
198
|
+
// validate/getCurrentUser calls have the correct in-memory token
|
|
199
|
+
// after a cold reload or account switch in another tab. The native
|
|
200
|
+
// path arrives here only after a bearer has been planted by
|
|
201
|
+
// `claimSessionByToken` or secure shared-session restore.
|
|
203
202
|
if ((0, _useWebSSO.isWebBrowser)()) {
|
|
204
203
|
const targetSession = sessionsRef.current.find(s => s.sessionId === sessionId);
|
|
205
204
|
const targetAuthuser = targetSession?.authuser;
|