Page MenuHomePhabricator
Differential D11261

[lib] Omit `isDefault` field in `rawThreadInfoFromServerThreadInfo`
ClosedPublic
Actions

Authored by atul on Mar 6 2024, 2:11 PM.
Tags
None
Referenced Files
F6197735: D11261.diff
Wed, Apr 23, 3:54 PM
Unknown Object (File)
Fri, Apr 18, 12:39 PM
Unknown Object (File)
Wed, Apr 16, 1:35 PM
Unknown Object (File)
Wed, Apr 16, 1:26 PM
Unknown Object (File)
Wed, Apr 16, 2:28 AM
Unknown Object (File)
Wed, Apr 16, 12:34 AM
Unknown Object (File)
Mon, Apr 14, 9:15 PM
Unknown Object (File)
Mar 18 2025, 1:03 PM
View All Files
Subscribers
ashoat

Details

Reviewers
tomek
ginsu
kamil
michal
Commits
rCOMMcb303c6ea6b6: [lib] Omit `isDefault` field in `rawThreadInfoFromServerThreadInfo`
Summary

We're updating the specialRole client migrations to include exclusion of isDefault field. This is corresponding keyserver change to match that.

Depends on D11254

Test Plan

Set the includeSpecialRoleFieldInRoles flag manually and observe that isDefault included before and excluded after.

Will attach screenshots.

Diff Detail

Repository
rCOMM Comm
Branch
master
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

atul created this revision.Mar 6 2024, 2:11 PM
Herald added a subscriber: ashoat. · View Herald TranscriptMar 6 2024, 2:11 PM
Harbormaster completed remote builds in B27368: Diff 37901.Mar 6 2024, 2:26 PM
atul requested review of this revision.Mar 6 2024, 2:26 PM
atul added a child revision: D11262: [CommCoreModule] Add `#include <functional>` to `NotificationsCryptoModule`.Mar 6 2024, 2:28 PM
tomek accepted this revision.Mar 7 2024, 1:18 AM
tomek added inline comments.
lib/shared/thread-utils.js
904–907

Not sure if it is worth using an util for it - in most of the places we're simply spreading the value

This revision is now accepted and ready to land.Mar 7 2024, 1:18 AM
atul added inline comments.Mar 20 2024, 10:52 AM
lib/shared/thread-utils.js
904–907

Considered destructuring to exclude isDefault but thought it got a little difficult to read with (([key, {isDefault, ...role}]) => .... Also felt that _omit made it more explicit.

atul updated this revision to Diff 38231.Mar 20 2024, 11:12 AM

land

This revision was landed with ongoing or failed builds.Mar 20 2024, 11:13 AM
Closed by commit rCOMMcb303c6ea6b6: [lib] Omit `isDefault` field in `rawThreadInfoFromServerThreadInfo` (authored by atul). · Explain Why
This revision was automatically updated to reflect the committed changes.
atul added a commit: rCOMMcb303c6ea6b6: [lib] Omit `isDefault` field in `rawThreadInfoFromServerThreadInfo`.
Harbormaster completed remote builds in B27628: Diff 38231.Mar 20 2024, 11:27 AM

Revision Contents
Changeset List

PathSize
lib/
shared/
3 lines

Diff 37901

View Options

lib/shared/thread-utils.js

Show First 20 Lines • Show All 156 Lines • ▼ Show 20 Lines () => ({
sessionID, sessionID,
}, },
}, },
}), }),
[preRequestUserInfo, keyserverID, cookie, sessionID], [preRequestUserInfo, keyserverID, cookie, sessionID],
); );
// We only need to do a "spot check" on this value below. // We only need to do a "spot check" on this value below.
// - To avoid regenerating performRecovery whenever it changes, we want to // - To avoid regenerating below callbacks whenever it changes, we want to
// make sure it's not in that function's dep list. // make sure it's not in those callbacks' dep lists.
// - If we exclude it from that function's dep list, we'll end up binding in // - If we exclude it from those callbacks' dep lists, we'll end up binding in
// the value of preRequestUserState at the time performRecovery is updated. // the value of preRequestUserState at the time the callbacks are updated.
// Instead, by assigning to a ref, we are able to use the latest value. // Instead, by assigning to a ref, we are able to use the latest value.
const preRequestUserStateRef = React.useRef(preRequestUserState); const preRequestUserStateRef = React.useRef(preRequestUserState);
preRequestUserStateRef.current = preRequestUserState; preRequestUserStateRef.current = preRequestUserState;
const dispatch = useDispatch(); const dispatch = useDispatch();
const urlPrefix = useSelector(urlPrefixSelector(keyserverID)); const urlPrefix = useSelector(urlPrefixSelector(keyserverID));
const logOut = useLogOut(); const logOut = useLogOut();
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const invalidateKeyserverSession = React.useCallback( const invalidateKeyserverSession = React.useCallback(
( (
source: RecoveryActionSource, source: RecoveryActionSource,
sessionChange: ClientSessionChange, sessionChange: ClientSessionChange,
userStateBeforeRecovery: PreRequestUserState,
hasBeenCancelled: () => boolean, hasBeenCancelled: () => boolean,
) => { ) => {
if (hasBeenCancelled()) { if (hasBeenCancelled()) {
return; return;
} }
setNewSession( setNewSession(
dispatch, dispatch,
sessionChange, sessionChange,
userStateBeforeRecovery, preRequestUserStateRef.current,
null, null,
source, source,
keyserverID, keyserverID,
); );
if ( if (
keyserverID === authoritativeKeyserverID() && keyserverID === authoritativeKeyserverID() &&
relyingOnAuthoritativeKeyserver relyingOnAuthoritativeKeyserver
) { ) {
Show All 30 Lines ) => {
); );
const sessionChange = const sessionChange =
recoverySessionChange ?? genericCookieInvalidation; recoverySessionChange ?? genericCookieInvalidation;
if ( if (
sessionChange.cookieInvalidated || sessionChange.cookieInvalidated ||
!sessionChange.cookie || !sessionChange.cookie ||
!sessionChange.cookie.startsWith('user=') !sessionChange.cookie.startsWith('user=')
) { ) {
invalidateKeyserverSession( invalidateKeyserverSession(source, sessionChange, hasBeenCancelled);
source,
sessionChange,
userStateBeforeRecovery,
hasBeenCancelled,
);
} }
} catch (e) { } catch (e) {
if (hasBeenCancelled()) { if (hasBeenCancelled()) {
return; return;
} }
console.log( console.log(
`Error during recovery login with keyserver ${keyserverID}`, `Error during recovery login with keyserver ${keyserverID}`,
e, e,
); );
invalidateKeyserverSession( invalidateKeyserverSession(
source, source,
genericCookieInvalidation, genericCookieInvalidation,
userStateBeforeRecovery,
hasBeenCancelled, hasBeenCancelled,
); );
throw e; throw e;
} }
}, },
[keyserverID, dispatch, cookie, urlPrefix, invalidateKeyserverSession], [keyserverID, dispatch, cookie, urlPrefix, invalidateKeyserverSession],
); );
} }
export { export {
canResolveKeyserverSessionInvalidation, canResolveKeyserverSessionInvalidation,
resolveKeyserverSessionInvalidation, resolveKeyserverSessionInvalidation,
useKeyserverRecoveryLogIn, useKeyserverRecoveryLogIn,
}; };