Page MenuHomePhabricator
Differential D12109

[native][web] Fetch AES key and device ID in parallel in generateQRCode
ClosedPublic
Actions

Authored by ashoat on May 20 2024, 3:54 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 9, 11:40 AM
Unknown Object (File)
Fri, Mar 28, 9:45 PM
Unknown Object (File)
Fri, Mar 28, 10:44 AM
Unknown Object (File)
Mar 12 2025, 3:44 PM
Unknown Object (File)
Feb 26 2025, 8:02 AM
Unknown Object (File)
Feb 26 2025, 8:02 AM
Unknown Object (File)
Jan 20 2025, 12:40 AM
Unknown Object (File)
Jan 10 2025, 4:30 AM
View All Files
Subscribers
tomek

Details

Reviewers
bartek
Commits
rCOMM42ab4fd17086: [native][web] Fetch AES key and device ID in parallel in generateQRCode
Summary

Also removed an unnecessary check on the device ID being set, since the Flow types indicate it should always be set.

Depends on D12108

Test Plan

I tested the flow using staging, with my phone as a primary device and a local simulator as a secondary device

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
native/
qr-code/
11 lines
web/
account/
10 lines

Diff 40433

View Options

native/qr-code/qr-code-screen.react.js

Show First 20 Lines • Show All 573 Lines • ▼ Show 20 Lines async keyserverAuthInfo => {
const responses: { +[string]: ClientLogInResponse } = const responses: { +[string]: ClientLogInResponse } =
await callKeyserverEndpoint( await callKeyserverEndpoint(
'keyserver_auth', 'keyserver_auth',
requests, requests,
keyserverAuthCallSingleKeyserverEndpointOptions, keyserverAuthCallSingleKeyserverEndpointOptions,
); );
const userInfosArrays = [];
let threadInfos: RawThreadInfos = {}; let threadInfos: RawThreadInfos = {};
const calendarResult: WritableCalendarResult = { const calendarResult: WritableCalendarResult = {
calendarQuery: keyserverAuthInfo.calendarQuery, calendarQuery: keyserverAuthInfo.calendarQuery,
rawEntryInfos: [], rawEntryInfos: [],
}; };
const messagesResult: WritableGenericMessagesResult = { const messagesResult: WritableGenericMessagesResult = {
messageInfos: [], messageInfos: [],
truncationStatus: {}, truncationStatus: {},
Show All 21 Lines for (const keyserverID in responses) {
messagesResult.currentAsOf = { messagesResult.currentAsOf = {
...messagesResult.currentAsOf, ...messagesResult.currentAsOf,
[keyserverID]: responses[keyserverID].serverTime, [keyserverID]: responses[keyserverID].serverTime,
}; };
updatesCurrentAsOf = { updatesCurrentAsOf = {
...updatesCurrentAsOf, ...updatesCurrentAsOf,
[keyserverID]: responses[keyserverID].serverTime, [keyserverID]: responses[keyserverID].serverTime,
}; };
userInfosArrays.push(responses[keyserverID].userInfos);
userInfosArrays.push(responses[keyserverID].cookieChange.userInfos);
} }
const userInfosArrays = [
responses[authoritativeKeyserverID()].userInfos,
responses[authoritativeKeyserverID()].cookieChange.userInfos,
tomekUnsubmitted
Not Done
Inline Actions

I don't think it is guaranteed that there will always be a response from the authoritative keyserver, e.g. when adding a new keyserver. We probably should add a condition here and extend a test plan to verify a non-auth keyserver auth.

tomek: I don't think it is guaranteed that there will always be a response from the authoritative…
];
const userInfos = mergeUserInfos(...userInfosArrays); const userInfos = mergeUserInfos(...userInfosArrays);
return { return {
threadInfos, threadInfos,
currentUserInfo: responses[authoritativeKeyserverID()]?.currentUserInfo, currentUserInfo: responses[authoritativeKeyserverID()]?.currentUserInfo,
calendarResult, calendarResult,
messagesResult, messagesResult,
userInfos, userInfos,
▲ Show 20 Lines • Show All 526 Lines • Show Last 20 Lines
View Options

web/account/qr-code-login.react.js

Show First 20 Lines • Show All 573 Lines • ▼ Show 20 Lines async keyserverAuthInfo => {
const responses: { +[string]: ClientLogInResponse } = const responses: { +[string]: ClientLogInResponse } =
await callKeyserverEndpoint( await callKeyserverEndpoint(
'keyserver_auth', 'keyserver_auth',
requests, requests,
keyserverAuthCallSingleKeyserverEndpointOptions, keyserverAuthCallSingleKeyserverEndpointOptions,
); );
const userInfosArrays = [];
let threadInfos: RawThreadInfos = {}; let threadInfos: RawThreadInfos = {};
const calendarResult: WritableCalendarResult = { const calendarResult: WritableCalendarResult = {
calendarQuery: keyserverAuthInfo.calendarQuery, calendarQuery: keyserverAuthInfo.calendarQuery,
rawEntryInfos: [], rawEntryInfos: [],
}; };
const messagesResult: WritableGenericMessagesResult = { const messagesResult: WritableGenericMessagesResult = {
messageInfos: [], messageInfos: [],
truncationStatus: {}, truncationStatus: {},
Show All 21 Lines for (const keyserverID in responses) {
messagesResult.currentAsOf = { messagesResult.currentAsOf = {
...messagesResult.currentAsOf, ...messagesResult.currentAsOf,
[keyserverID]: responses[keyserverID].serverTime, [keyserverID]: responses[keyserverID].serverTime,
}; };
updatesCurrentAsOf = { updatesCurrentAsOf = {
...updatesCurrentAsOf, ...updatesCurrentAsOf,
[keyserverID]: responses[keyserverID].serverTime, [keyserverID]: responses[keyserverID].serverTime,
}; };
userInfosArrays.push(responses[keyserverID].userInfos);
userInfosArrays.push(responses[keyserverID].cookieChange.userInfos);
} }
const userInfosArrays = [
responses[authoritativeKeyserverID()].userInfos,
responses[authoritativeKeyserverID()].cookieChange.userInfos,
tomekUnsubmitted
Not Done
Inline Actions

I don't think it is guaranteed that there will always be a response from the authoritative keyserver, e.g. when adding a new keyserver. We probably should add a condition here and extend a test plan to verify a non-auth keyserver auth.

tomek: I don't think it is guaranteed that there will always be a response from the authoritative…
];
const userInfos = mergeUserInfos(...userInfosArrays); const userInfos = mergeUserInfos(...userInfosArrays);
return { return {
threadInfos, threadInfos,
currentUserInfo: responses[authoritativeKeyserverID()]?.currentUserInfo, currentUserInfo: responses[authoritativeKeyserverID()]?.currentUserInfo,
calendarResult, calendarResult,
messagesResult, messagesResult,
userInfos, userInfos,
▲ Show 20 Lines • Show All 526 Lines • Show Last 20 Lines