Page MenuHomePhabricator
Differential D14105

[native] implement QR Auth context
ClosedPublic
Actions

Authored by kamil on Dec 11 2024, 7:37 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 19, 9:29 AM
Unknown Object (File)
Sat, Mar 15, 12:21 AM
Unknown Object (File)
Sat, Mar 15, 12:21 AM
Unknown Object (File)
Sat, Mar 15, 12:21 AM
Unknown Object (File)
Sat, Mar 15, 12:20 AM
Unknown Object (File)
Feb 12 2025, 6:24 PM
Unknown Object (File)
Feb 12 2025, 6:24 PM
Unknown Object (File)
Feb 12 2025, 6:24 PM
View All 46 Files
Subscribers
None

Details

Reviewers
ashoat
tomek
Commits
rCOMM55aca4b4da56: [native] implement QR Auth context
Summary

ENG-9959.

We need to wrap this logic in context so this will be available on all the screens in the flow.

This diff only introduces the context, not changing the logic - just moving it to the context.

In ENG-9968 there is an example of how this looks like

Depends on D14101

Test Plan

Test adding secondary device - should work exactly the same.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kamil created this revision.Dec 11 2024, 7:37 AM
kamil held this revision as a draft.
kamil edited the summary of this revision. (Show Details)Dec 11 2024, 7:37 AM
kamil added inline comments.
native/account/qr-auth/qr-auth-context.js
5–7 ↗(On Diff #46323)

It will have more props later in the stack

kamil added a child revision: D14114: [native] implement screen when scanning QR code a non-primary device.Dec 11 2024, 8:15 AM
Harbormaster completed remote builds in B33005: Diff 46323.Dec 11 2024, 8:19 AM
kamil published this revision for review.Dec 11 2024, 8:28 AM
kamil edited the summary of this revision. (Show Details)
ashoat added inline comments.Dec 11 2024, 9:40 AM
native/account/qr-auth/qr-auth-context-provider.js
55 ↗(On Diff #46323)

It's hard to review this one because you're removing a bunch of stuff (such as the permissions check), and I can't tell where (or whether) it's reintroduced

kamil added inline comments.Dec 12 2024, 2:54 AM
native/account/qr-auth/qr-auth-context-provider.js
1 ↗(On Diff #46323)

Phabricator says that

This file was copied from native/account/qr-auth/secondary-device-qr-code-scanner.react.js.

which is partially true, but only part of the code was copied.

What is on the right side without color is what is copied, and green is what I added but this is stuff like function definition or const contextValue....

What is on the left side marked with red color is what is left in the native/account/qr-auth/secondary-device-qr-code-scanner.react.js. (thinks I didn't copy-paste).

So e.g. the permissions check is the thing that I left unchanged.

55 ↗(On Diff #46323)

Hmm.. I am not removing anything, just copy-pasting what can be copy-pasted from secondary-device-qr-code-scanner.react.js. to qr-auth-context-provider.js. I wasn't making any changes in the logic.

This should be really easy to review, but it looks like this is some Phabricator quirk that presents those changes in a not-natural manner.

Let me know if there is anything I can do to make it easier for you.

ashoat accepted this revision.Dec 12 2024, 10:53 AM

Thanks for explaining... not sure how I missed that. You'd think after 10 years of using Phabricator I'd be better at using it 😅

This revision is now accepted and ready to land.Dec 12 2024, 10:53 AM
Closed by commit rCOMM55aca4b4da56: [native] implement QR Auth context (authored by kamil). · Explain WhyDec 17 2024, 7:06 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMM55aca4b4da56: [native] implement QR Auth context.
kamil mentioned this in D14166: [lib] rename `QRAuthContext` to `SecondaryDeviceQRAuthContext`.Dec 17 2024, 8:36 AM
kamil mentioned this in D14169: [native] rename `QRAuthContext` to `PrimaryDeviceQRAuthContext`.Dec 18 2024, 5:08 AM
kamil mentioned this in rCOMM9e9ce9532073: [lib] rename `QRAuthContext` to `SecondaryDeviceQRAuthContext`.Jan 9 2025, 4:16 AM
kamil mentioned this in rCOMM158fc4fa3234: [native] rename `QRAuthContext` to `PrimaryDeviceQRAuthContext`.

Revision Contents
Changeset List

PathSize
native/
account/
qr-auth/
qr-auth-context-provider.js
secondary-device-qr-code-scanner.react.js
231 lines
12 lines
17 lines
255 lines

Diff 46545

View Options

native/account/qr-auth/qr-auth-context-provider.js

// @flow // @flow
import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js'; import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js';
import { import {
moveDraftActionType, moveDraftActionType,
updateDraftActionType, updateDraftActionType,
} from '../actions/draft-actions.js'; } from '../actions/draft-actions.js';
import { import {
deleteKeyserverAccountActionTypes, deleteKeyserverAccountActionTypes,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { extractKeyserverIDFromID } from '../keyserver-conn/keyserver-call-utils.js';
import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js'; import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js';
import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js'; import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
type ReduceDraftStoreResult = { type ReduceDraftStoreResult = {
+draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>, +draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>,
+draftStore: DraftStore, +draftStore: DraftStore,
}; };
function removeKeyserversDraftsFromStore(
draftStore: DraftStore,
keyserverIDs: $ReadOnlyArray<string>,
): ReduceDraftStoreResult {
const keyserverIDsSet = new Set<string>(keyserverIDs);
const drafts: { [key: string]: string } = {};
const ids: string[] = [];
for (const key in draftStore.drafts) {
if (keyserverIDsSet.has(extractKeyserverIDFromID(key))) {
ids.push(key);
} else {
drafts[key] = draftStore.drafts[key];
}
}
return {
draftStoreOperations: [{ type: 'remove', payload: { ids } }],
draftStore: { ...draftStore, drafts },
};
}
function reduceDraftStore( function reduceDraftStore(
draftStore: DraftStore, draftStore: DraftStore,
action: BaseAction, action: BaseAction,
): ReduceDraftStoreResult { ): ReduceDraftStoreResult {
if ( if (
action.type === logOutActionTypes.success || action.type === logOutActionTypes.success ||
action.type === deleteKeyserverAccountActionTypes.success || action.type === deleteAccountActionTypes.success
(action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated)
) { ) {
return { return {
draftStoreOperations: [{ type: 'remove_all' }], draftStoreOperations: [{ type: 'remove_all' }],
draftStore: { drafts: {} }, draftStore: { drafts: {} },
}; };
} else if (action.type === deleteKeyserverAccountActionTypes.success) {
return removeKeyserversDraftsFromStore(
draftStore,
action.payload.keyserverIDs,
);
} else if (
action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated
) {
return removeKeyserversDraftsFromStore(draftStore, [
action.payload.keyserverID,
]);
} else if (action.type === updateDraftActionType) { } else if (action.type === updateDraftActionType) {
const { key, text } = action.payload; const { key, text } = action.payload;
const draftStoreOperations = [ const draftStoreOperations = [
{ {
type: 'update', type: 'update',
payload: { key, text }, payload: { key, text },
}, },
Show All 40 Lines return {
...draftStore, ...draftStore,
drafts: drafts, drafts: drafts,
}, },
}; };
} }
return { draftStore, draftStoreOperations: [] }; return { draftStore, draftStoreOperations: [] };
} }
export { reduceDraftStore }; export { reduceDraftStore, removeKeyserversDraftsFromStore };
View Options

native/account/qr-auth/qr-auth-context.js

// @flow // @flow
import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js'; import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js';
import { import {
moveDraftActionType, moveDraftActionType,
updateDraftActionType, updateDraftActionType,
} from '../actions/draft-actions.js'; } from '../actions/draft-actions.js';
import { import {
deleteKeyserverAccountActionTypes, deleteKeyserverAccountActionTypes,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { extractKeyserverIDFromID } from '../keyserver-conn/keyserver-call-utils.js';
import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js'; import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js';
import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js'; import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
type ReduceDraftStoreResult = { type ReduceDraftStoreResult = {
+draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>, +draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>,
+draftStore: DraftStore, +draftStore: DraftStore,
}; };
function removeKeyserversDraftsFromStore(
draftStore: DraftStore,
keyserverIDs: $ReadOnlyArray<string>,
): ReduceDraftStoreResult {
const keyserverIDsSet = new Set<string>(keyserverIDs);
const drafts: { [key: string]: string } = {};
const ids: string[] = [];
for (const key in draftStore.drafts) {
if (keyserverIDsSet.has(extractKeyserverIDFromID(key))) {
ids.push(key);
} else {
drafts[key] = draftStore.drafts[key];
}
}
return {
draftStoreOperations: [{ type: 'remove', payload: { ids } }],
draftStore: { ...draftStore, drafts },
};
}
function reduceDraftStore( function reduceDraftStore(
draftStore: DraftStore, draftStore: DraftStore,
action: BaseAction, action: BaseAction,
): ReduceDraftStoreResult { ): ReduceDraftStoreResult {
if ( if (
action.type === logOutActionTypes.success || action.type === logOutActionTypes.success ||
action.type === deleteKeyserverAccountActionTypes.success || action.type === deleteAccountActionTypes.success
(action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated)
) { ) {
return { return {
draftStoreOperations: [{ type: 'remove_all' }], draftStoreOperations: [{ type: 'remove_all' }],
draftStore: { drafts: {} }, draftStore: { drafts: {} },
}; };
} else if (action.type === deleteKeyserverAccountActionTypes.success) {
return removeKeyserversDraftsFromStore(
draftStore,
action.payload.keyserverIDs,
);
} else if (
action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated
) {
return removeKeyserversDraftsFromStore(draftStore, [
action.payload.keyserverID,
]);
} else if (action.type === updateDraftActionType) { } else if (action.type === updateDraftActionType) {
const { key, text } = action.payload; const { key, text } = action.payload;
const draftStoreOperations = [ const draftStoreOperations = [
{ {
type: 'update', type: 'update',
payload: { key, text }, payload: { key, text },
}, },
Show All 40 Lines return {
...draftStore, ...draftStore,
drafts: drafts, drafts: drafts,
}, },
}; };
} }
return { draftStore, draftStoreOperations: [] }; return { draftStore, draftStoreOperations: [] };
} }
export { reduceDraftStore }; export { reduceDraftStore, removeKeyserversDraftsFromStore };
View Options

native/account/qr-auth/qr-auth-navigator.react.js

// @flow // @flow
import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js'; import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js';
import { import {
moveDraftActionType, moveDraftActionType,
updateDraftActionType, updateDraftActionType,
} from '../actions/draft-actions.js'; } from '../actions/draft-actions.js';
import { import {
deleteKeyserverAccountActionTypes, deleteKeyserverAccountActionTypes,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { extractKeyserverIDFromID } from '../keyserver-conn/keyserver-call-utils.js';
import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js'; import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js';
import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js'; import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
type ReduceDraftStoreResult = { type ReduceDraftStoreResult = {
+draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>, +draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>,
+draftStore: DraftStore, +draftStore: DraftStore,
}; };
function removeKeyserversDraftsFromStore(
draftStore: DraftStore,
keyserverIDs: $ReadOnlyArray<string>,
): ReduceDraftStoreResult {
const keyserverIDsSet = new Set<string>(keyserverIDs);
const drafts: { [key: string]: string } = {};
const ids: string[] = [];
for (const key in draftStore.drafts) {
if (keyserverIDsSet.has(extractKeyserverIDFromID(key))) {
ids.push(key);
} else {
drafts[key] = draftStore.drafts[key];
}
}
return {
draftStoreOperations: [{ type: 'remove', payload: { ids } }],
draftStore: { ...draftStore, drafts },
};
}
function reduceDraftStore( function reduceDraftStore(
draftStore: DraftStore, draftStore: DraftStore,
action: BaseAction, action: BaseAction,
): ReduceDraftStoreResult { ): ReduceDraftStoreResult {
if ( if (
action.type === logOutActionTypes.success || action.type === logOutActionTypes.success ||
action.type === deleteKeyserverAccountActionTypes.success || action.type === deleteAccountActionTypes.success
(action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated)
) { ) {
return { return {
draftStoreOperations: [{ type: 'remove_all' }], draftStoreOperations: [{ type: 'remove_all' }],
draftStore: { drafts: {} }, draftStore: { drafts: {} },
}; };
} else if (action.type === deleteKeyserverAccountActionTypes.success) {
return removeKeyserversDraftsFromStore(
draftStore,
action.payload.keyserverIDs,
);
} else if (
action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated
) {
return removeKeyserversDraftsFromStore(draftStore, [
action.payload.keyserverID,
]);
} else if (action.type === updateDraftActionType) { } else if (action.type === updateDraftActionType) {
const { key, text } = action.payload; const { key, text } = action.payload;
const draftStoreOperations = [ const draftStoreOperations = [
{ {
type: 'update', type: 'update',
payload: { key, text }, payload: { key, text },
}, },
Show All 40 Lines return {
...draftStore, ...draftStore,
drafts: drafts, drafts: drafts,
}, },
}; };
} }
return { draftStore, draftStoreOperations: [] }; return { draftStore, draftStoreOperations: [] };
} }
export { reduceDraftStore }; export { reduceDraftStore, removeKeyserversDraftsFromStore };
View Options

native/account/qr-auth/secondary-device-qr-code-scanner.react.js

// @flow // @flow
import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js'; import { setClientDBStoreActionType } from '../actions/client-db-store-actions.js';
import { import {
moveDraftActionType, moveDraftActionType,
updateDraftActionType, updateDraftActionType,
} from '../actions/draft-actions.js'; } from '../actions/draft-actions.js';
import { import {
deleteKeyserverAccountActionTypes, deleteKeyserverAccountActionTypes,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { extractKeyserverIDFromID } from '../keyserver-conn/keyserver-call-utils.js';
import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js'; import { setNewSessionActionType } from '../keyserver-conn/keyserver-conn-types.js';
import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js'; import type { DraftStore, DraftStoreOperation } from '../types/draft-types.js';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
type ReduceDraftStoreResult = { type ReduceDraftStoreResult = {
+draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>, +draftStoreOperations: $ReadOnlyArray<DraftStoreOperation>,
+draftStore: DraftStore, +draftStore: DraftStore,
}; };
function removeKeyserversDraftsFromStore(
draftStore: DraftStore,
keyserverIDs: $ReadOnlyArray<string>,
): ReduceDraftStoreResult {
const keyserverIDsSet = new Set<string>(keyserverIDs);
const drafts: { [key: string]: string } = {};
const ids: string[] = [];
for (const key in draftStore.drafts) {
if (keyserverIDsSet.has(extractKeyserverIDFromID(key))) {
ids.push(key);
} else {
drafts[key] = draftStore.drafts[key];
}
}
return {
draftStoreOperations: [{ type: 'remove', payload: { ids } }],
draftStore: { ...draftStore, drafts },
};
}
function reduceDraftStore( function reduceDraftStore(
draftStore: DraftStore, draftStore: DraftStore,
action: BaseAction, action: BaseAction,
): ReduceDraftStoreResult { ): ReduceDraftStoreResult {
if ( if (
action.type === logOutActionTypes.success || action.type === logOutActionTypes.success ||
action.type === deleteKeyserverAccountActionTypes.success || action.type === deleteAccountActionTypes.success
(action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated)
) { ) {
return { return {
draftStoreOperations: [{ type: 'remove_all' }], draftStoreOperations: [{ type: 'remove_all' }],
draftStore: { drafts: {} }, draftStore: { drafts: {} },
}; };
} else if (action.type === deleteKeyserverAccountActionTypes.success) {
return removeKeyserversDraftsFromStore(
draftStore,
action.payload.keyserverIDs,
);
} else if (
action.type === setNewSessionActionType &&
action.payload.sessionChange.cookieInvalidated
) {
return removeKeyserversDraftsFromStore(draftStore, [
action.payload.keyserverID,
]);
} else if (action.type === updateDraftActionType) { } else if (action.type === updateDraftActionType) {
const { key, text } = action.payload; const { key, text } = action.payload;
const draftStoreOperations = [ const draftStoreOperations = [
{ {
type: 'update', type: 'update',
payload: { key, text }, payload: { key, text },
}, },
Show All 40 Lines return {
...draftStore, ...draftStore,
drafts: drafts, drafts: drafts,
}, },
}; };
} }
return { draftStore, draftStoreOperations: [] }; return { draftStore, draftStoreOperations: [] };
} }
export { reduceDraftStore }; export { reduceDraftStore, removeKeyserversDraftsFromStore };