Page MenuHomePhabricator
Differential D11330

[lib][native] Extract QR code to a spearate component
ClosedPublic
Actions

Authored by bartek on Mar 14 2024, 10:37 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 20, 3:46 AM
Unknown Object (File)
Thu, Feb 27, 7:25 PM
Unknown Object (File)
Thu, Feb 27, 7:25 PM
Unknown Object (File)
Thu, Feb 27, 7:25 PM
Unknown Object (File)
Thu, Feb 27, 7:25 PM
Unknown Object (File)
Feb 26 2025, 8:07 AM
Unknown Object (File)
Feb 26 2025, 7:18 AM
Unknown Object (File)
Feb 13 2025, 8:49 AM
View All 92 Files
Subscribers
ashoat
tomek

Details

Reviewers
kamil
michal
Commits
rCOMM713c509cbea7: [lib][native] Extract QR code to a spearate component
Summary

To avoid code duplication between web and native, extracted most of the secondary device auth logic into a separate React component.

Depends on D11301

Test Plan

Flow, repeated test plan from parent diffs in this stack (basically repeated the QR auth flow).

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

bartek created this revision.Mar 14 2024, 10:37 AM
bartek held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptMar 14 2024, 10:37 AM
bartek added a child revision: D11331: [web] Add QR auth handler logic.Mar 14 2024, 10:39 AM
Harbormaster completed remote builds in B27516: Diff 38081.Mar 14 2024, 10:52 AM
bartek published this revision for review.Mar 18 2024, 12:33 AM
bartek updated this revision to Diff 38129.Mar 18 2024, 5:33 AM

Rebase

Harbormaster completed remote builds in B27558: Diff 38129.Mar 18 2024, 5:49 AM
kamil accepted this revision.Mar 18 2024, 8:11 AM
kamil added inline comments.
lib/components/qr-auth-handler.react.js
22–25 ↗(On Diff #38129)

should be read-only

55–63 ↗(On Diff #38129)

is there a need for it or could you just add void sendMessage(.....

131 ↗(On Diff #38129)

nit

This revision is now accepted and ready to land.Mar 18 2024, 8:11 AM
bartek added inline comments.Mar 21 2024, 3:51 AM
lib/components/qr-auth-handler.react.js
55–63 ↗(On Diff #38129)

Technically I could, but in the next diff, I'm replacing createQRAuthTunnelbrokerMessage() with an async function which needs to be awaited too

bartek updated this revision to Diff 38244.Mar 21 2024, 3:52 AM

Address feedback

Harbormaster completed remote builds in B27634: Diff 38244.Mar 21 2024, 4:07 AM
Closed by commit rCOMM713c509cbea7: [lib][native] Extract QR code to a spearate component (authored by bartek). · Explain WhyMar 21 2024, 4:29 AM
This revision was automatically updated to reflect the committed changes.
bartek added a commit: rCOMM713c509cbea7: [lib][native] Extract QR code to a spearate component.

Revision Contents
Changeset List

PathSize
lib/
components/
147 lines
native/
qr-code/
170 lines

Diff 38252

View Options

lib/components/qr-auth-handler.react.js

Show First 20 Lines • Show All 110 Lines • ▼ Show 20 Lines): Promise<BlobOperationResult> {
return { success: true }; return { success: true };
} }
async function assignMultipleHolders( async function assignMultipleHolders(
holders: $ReadOnlyArray<{ +blobHash: string, +holder: string }>, holders: $ReadOnlyArray<{ +blobHash: string, +holder: string }>,
headers: { [string]: string }, headers: { [string]: string },
): Promise< ): Promise<
| { +success: true } | { +result: 'success' }
| { +error: true, status: number, statusText: string } | { +result: 'error', +status: number, +statusText: string }
| { | {
+failedAssignments: $ReadOnlyArray<{ +failedRequests: $ReadOnlyArray<{
+blobHash: string, +blobHash: string,
+holder: string, +holder: string,
}>, }>,
+result: 'failed_requests',
}, },
> { > {
const assignMultipleHoldersResponse = await fetch( const assignMultipleHoldersResponse = await fetch(
makeBlobServiceEndpointURL( makeBlobServiceEndpointURL(
blobServiceConfig.httpEndpoints.ASSIGN_MULTIPLE_HOLDERS, blobServiceConfig.httpEndpoints.ASSIGN_MULTIPLE_HOLDERS,
), ),
{ {
method: blobServiceConfig.httpEndpoints.ASSIGN_MULTIPLE_HOLDERS.method, method: blobServiceConfig.httpEndpoints.ASSIGN_MULTIPLE_HOLDERS.method,
headers: { ...headers, 'Content-Type': 'application/json' }, headers: { ...headers, 'Content-Type': 'application/json' },
body: JSON.stringify({ body: JSON.stringify({
requests: holders, requests: holders,
}), }),
}, },
); );
if (!assignMultipleHoldersResponse.ok) { if (!assignMultipleHoldersResponse.ok) {
const { status, statusText } = assignMultipleHoldersResponse; const { status, statusText } = assignMultipleHoldersResponse;
return { error: true, status, statusText }; return { result: 'error', status, statusText };
} }
const { results } = await assignMultipleHoldersResponse.json(); const { results } = await assignMultipleHoldersResponse.json();
const failedRequests = results const failedRequests = results
.filter(result => !result.success) .filter(result => !result.success)
.map(({ blobHash, holder }) => ({ blobHash, holder })); .map(({ blobHash, holder }) => ({ blobHash, holder }));
if (failedRequests.length !== 0) { if (failedRequests.length !== 0) {
return { failedAssignments: failedRequests }; return { result: 'failed_requests', failedRequests };
} }
return { success: true }; return { result: 'success' };
} }
async function removeMultipleHolders( async function removeMultipleHolders(
holders: $ReadOnlyArray<BlobHashAndHolder>, holders: $ReadOnlyArray<BlobHashAndHolder>,
headers: { [string]: string }, headers: { [string]: string },
instantDelete?: boolean, instantDelete?: boolean,
): Promise< ): Promise<
| { +result: 'success' } | { +result: 'success' }
▲ Show 20 Lines • Show All 45 Lines • Show Last 20 Lines
View Options

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

Show First 20 Lines • Show All 110 Lines • ▼ Show 20 Lines): Promise<BlobOperationResult> {
return { success: true }; return { success: true };
} }
async function assignMultipleHolders( async function assignMultipleHolders(
holders: $ReadOnlyArray<{ +blobHash: string, +holder: string }>, holders: $ReadOnlyArray<{ +blobHash: string, +holder: string }>,
headers: { [string]: string }, headers: { [string]: string },
): Promise< ): Promise<
| { +success: true } | { +result: 'success' }
| { +error: true, status: number, statusText: string } | { +result: 'error', +status: number, +statusText: string }
| { | {
+failedAssignments: $ReadOnlyArray<{ +failedRequests: $ReadOnlyArray<{
+blobHash: string, +blobHash: string,
+holder: string, +holder: string,
}>, }>,
+result: 'failed_requests',
}, },
> { > {
const assignMultipleHoldersResponse = await fetch( const assignMultipleHoldersResponse = await fetch(
makeBlobServiceEndpointURL( makeBlobServiceEndpointURL(
blobServiceConfig.httpEndpoints.ASSIGN_MULTIPLE_HOLDERS, blobServiceConfig.httpEndpoints.ASSIGN_MULTIPLE_HOLDERS,
), ),
{ {
method: blobServiceConfig.httpEndpoints.ASSIGN_MULTIPLE_HOLDERS.method, method: blobServiceConfig.httpEndpoints.ASSIGN_MULTIPLE_HOLDERS.method,
headers: { ...headers, 'Content-Type': 'application/json' }, headers: { ...headers, 'Content-Type': 'application/json' },
body: JSON.stringify({ body: JSON.stringify({
requests: holders, requests: holders,
}), }),
}, },
); );
if (!assignMultipleHoldersResponse.ok) { if (!assignMultipleHoldersResponse.ok) {
const { status, statusText } = assignMultipleHoldersResponse; const { status, statusText } = assignMultipleHoldersResponse;
return { error: true, status, statusText }; return { result: 'error', status, statusText };
} }
const { results } = await assignMultipleHoldersResponse.json(); const { results } = await assignMultipleHoldersResponse.json();
const failedRequests = results const failedRequests = results
.filter(result => !result.success) .filter(result => !result.success)
.map(({ blobHash, holder }) => ({ blobHash, holder })); .map(({ blobHash, holder }) => ({ blobHash, holder }));
if (failedRequests.length !== 0) { if (failedRequests.length !== 0) {
return { failedAssignments: failedRequests }; return { result: 'failed_requests', failedRequests };
} }
return { success: true }; return { result: 'success' };
} }
async function removeMultipleHolders( async function removeMultipleHolders(
holders: $ReadOnlyArray<BlobHashAndHolder>, holders: $ReadOnlyArray<BlobHashAndHolder>,
headers: { [string]: string }, headers: { [string]: string },
instantDelete?: boolean, instantDelete?: boolean,
): Promise< ): Promise<
| { +result: 'success' } | { +result: 'success' }
▲ Show 20 Lines • Show All 45 Lines • Show Last 20 Lines