Page MenuHomePhabricator
Differential D14033

[lib] Extract hook to send logout message to primary device
ClosedPublic
Actions

Authored by bartek on Nov 25 2024, 3:42 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 27, 10:49 AM
Unknown Object (File)
Thu, Mar 27, 10:24 AM
Unknown Object (File)
Wed, Mar 26, 8:57 PM
Unknown Object (File)
Tue, Mar 25, 9:33 PM
Unknown Object (File)
Mon, Mar 17, 9:30 PM
Unknown Object (File)
Sat, Mar 15, 7:32 AM
Unknown Object (File)
Fri, Mar 14, 5:57 AM
Unknown Object (File)
Tue, Mar 11, 5:36 AM
View All 65 Files
Subscribers
ashoat
tomek

Details

Reviewers
kamil
varun
Commits
rCOMM4e352b153d3c: [lib] Extract hook to send logout message to primary device
Summary

Part of ENG-9710.
We want to send this message not only on secondary device logout, but also on legacy logout when use_new_flow is received

Depends on D14032

Test Plan

Performed secondary device logout. Confirmed that primary device received the message.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

bartek created this revision.Nov 25 2024, 3:42 AM
bartek held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptNov 25 2024, 3:42 AM
bartek added a child revision: D14034: [lib] Handle use_new_flow for Identity V1 logout.Nov 25 2024, 3:47 AM
Harbormaster completed remote builds in B32807: Diff 45994.Nov 25 2024, 4:14 AM
bartek published this revision for review.Nov 25 2024, 4:26 AM
kamil accepted this revision.Nov 26 2024, 1:39 AM
This revision is now accepted and ready to land.Nov 26 2024, 1:39 AM
kamil added inline comments.Nov 26 2024, 1:49 AM
lib/actions/user-actions.js
361 ↗(On Diff #45994)

I think we use this convention in the codebase

ashoat added inline comments.Nov 26 2024, 5:00 AM
lib/actions/user-actions.js
361 ↗(On Diff #45994)

I think this is okay because "logout" is a noun. On the other hand, if we were using the verb form, it would be two words: "log out"

Closed by commit rCOMM4e352b153d3c: [lib] Extract hook to send logout message to primary device (authored by bartek). · Explain WhyNov 29 2024, 5:03 AM
This revision was automatically updated to reflect the committed changes.
bartek added a commit: rCOMM4e352b153d3c: [lib] Extract hook to send logout message to primary device.

Revision Contents
Changeset List

PathSize
lib/
actions/
40 lines
tunnelbroker/
2 lines

Diff 46151

View Options

lib/actions/user-actions.js

Show First 20 Lines • Show All 131 Lines • ▼ Show 20 Lines try {
]); ]);
} catch {} } catch {}
const currentUserInfo = response ? loggedOutUserInfo : null; const currentUserInfo = response ? loggedOutUserInfo : null;
return { currentUserInfo, preRequestUserState, keyserverIDs }; return { currentUserInfo, preRequestUserState, keyserverIDs };
}; };
type UseLogOutOptions = { type UseLogOutOptions = {
+logOutType?: 'legacy' | 'primary_device' | 'secondary_device', +logOutType?: 'legacy' | 'primary_device' | 'secondary_device',
+skipIdentityLogOut?: boolean,
}; };
function useLogOut( function useLogOut(
options: UseLogOutOptions = {}, options: UseLogOutOptions = {},
): (keyserverIDs?: $ReadOnlyArray<string>) => Promise<LogOutResult> { ): (keyserverIDs?: $ReadOnlyArray<string>) => Promise<LogOutResult> {
const client = React.useContext(IdentityClientContext); const client = React.useContext(IdentityClientContext);
const identityClient = client?.identityClient; const identityClient = client?.identityClient;
const preRequestUserState = usePreRequestUserState(); const preRequestUserState = usePreRequestUserState();
const callKeyserverLogOut = useKeyserverCall(keyserverLogOut); const callKeyserverLogOut = useKeyserverCall(keyserverLogOut);
const commServicesAccessToken = useSelector( const commServicesAccessToken = useSelector(
state => state.commServicesAccessToken, state => state.commServicesAccessToken,
); );
const { logOutType } = options; const { logOutType, skipIdentityLogOut } = options;
return React.useCallback( return React.useCallback(
async (keyserverIDs?: $ReadOnlyArray<string>) => { async (keyserverIDs?: $ReadOnlyArray<string>) => {
const identityPromise = (async () => { const identityPromise = (async () => {
if (!usingCommServicesAccessToken || !commServicesAccessToken) { if (
skipIdentityLogOut ||
!usingCommServicesAccessToken ||
!commServicesAccessToken
) {
return; return;
} }
if (!identityClient) { if (!identityClient) {
throw new Error('Identity service client is not initialized'); throw new Error('Identity service client is not initialized');
} }
let callIdentityClientLogOut; let callIdentityClientLogOut;
if (logOutType === 'primary_device') { if (logOutType === 'primary_device') {
if (!identityClient.logOutPrimaryDevice) { if (!identityClient.logOutPrimaryDevice) {
Show All 36 Lines async (keyserverIDs?: $ReadOnlyArray<string>) => {
}; };
}, },
[ [
callKeyserverLogOut, callKeyserverLogOut,
commServicesAccessToken, commServicesAccessToken,
identityClient, identityClient,
logOutType, logOutType,
preRequestUserState, preRequestUserState,
skipIdentityLogOut,
], ],
); );
} }
function useIdentityLogOut(): () => Promise<LogOutResult> { function useIdentityLogOut(): () => Promise<LogOutResult> {
const client = React.useContext(IdentityClientContext); const client = React.useContext(IdentityClientContext);
const identityClient = client?.identityClient; const identityClient = client?.identityClient;
▲ Show 20 Lines • Show All 1,230 Lines • Show Last 20 Lines
View Options

lib/tunnelbroker/peer-to-peer-context.js

Show First 20 Lines • Show All 131 Lines • ▼ Show 20 Lines try {
]); ]);
} catch {} } catch {}
const currentUserInfo = response ? loggedOutUserInfo : null; const currentUserInfo = response ? loggedOutUserInfo : null;
return { currentUserInfo, preRequestUserState, keyserverIDs }; return { currentUserInfo, preRequestUserState, keyserverIDs };
}; };
type UseLogOutOptions = { type UseLogOutOptions = {
+logOutType?: 'legacy' | 'primary_device' | 'secondary_device', +logOutType?: 'legacy' | 'primary_device' | 'secondary_device',
+skipIdentityLogOut?: boolean,
}; };
function useLogOut( function useLogOut(
options: UseLogOutOptions = {}, options: UseLogOutOptions = {},
): (keyserverIDs?: $ReadOnlyArray<string>) => Promise<LogOutResult> { ): (keyserverIDs?: $ReadOnlyArray<string>) => Promise<LogOutResult> {
const client = React.useContext(IdentityClientContext); const client = React.useContext(IdentityClientContext);
const identityClient = client?.identityClient; const identityClient = client?.identityClient;
const preRequestUserState = usePreRequestUserState(); const preRequestUserState = usePreRequestUserState();
const callKeyserverLogOut = useKeyserverCall(keyserverLogOut); const callKeyserverLogOut = useKeyserverCall(keyserverLogOut);
const commServicesAccessToken = useSelector( const commServicesAccessToken = useSelector(
state => state.commServicesAccessToken, state => state.commServicesAccessToken,
); );
const { logOutType } = options; const { logOutType, skipIdentityLogOut } = options;
return React.useCallback( return React.useCallback(
async (keyserverIDs?: $ReadOnlyArray<string>) => { async (keyserverIDs?: $ReadOnlyArray<string>) => {
const identityPromise = (async () => { const identityPromise = (async () => {
if (!usingCommServicesAccessToken || !commServicesAccessToken) { if (
skipIdentityLogOut ||
!usingCommServicesAccessToken ||
!commServicesAccessToken
) {
return; return;
} }
if (!identityClient) { if (!identityClient) {
throw new Error('Identity service client is not initialized'); throw new Error('Identity service client is not initialized');
} }
let callIdentityClientLogOut; let callIdentityClientLogOut;
if (logOutType === 'primary_device') { if (logOutType === 'primary_device') {
if (!identityClient.logOutPrimaryDevice) { if (!identityClient.logOutPrimaryDevice) {
Show All 36 Lines async (keyserverIDs?: $ReadOnlyArray<string>) => {
}; };
}, },
[ [
callKeyserverLogOut, callKeyserverLogOut,
commServicesAccessToken, commServicesAccessToken,
identityClient, identityClient,
logOutType, logOutType,
preRequestUserState, preRequestUserState,
skipIdentityLogOut,
], ],
); );
} }
function useIdentityLogOut(): () => Promise<LogOutResult> { function useIdentityLogOut(): () => Promise<LogOutResult> {
const client = React.useContext(IdentityClientContext); const client = React.useContext(IdentityClientContext);
const identityClient = client?.identityClient; const identityClient = client?.identityClient;
▲ Show 20 Lines • Show All 1,230 Lines • Show Last 20 Lines