Page MenuHomePhabricator
Differential D12620

[native] modify SecondaryDeviceQRCodeScanner to support emulator
ClosedPublic
Actions

Authored by varun on Jun 28 2024, 12:58 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Apr 6, 8:19 AM
Unknown Object (File)
Thu, Mar 20, 6:48 PM
Unknown Object (File)
Mar 11 2025, 2:38 PM
Unknown Object (File)
Mar 9 2025, 11:27 AM
Unknown Object (File)
Mar 7 2025, 5:42 AM
Unknown Object (File)
Mar 6 2025, 6:21 AM
Unknown Object (File)
Mar 5 2025, 4:50 PM
Unknown Object (File)
Mar 5 2025, 7:38 AM
View All 94 Files
Subscribers
tomek

Details

Reviewers
ashoat
bartek
Commits
rCOMM63899045a319: [native] modify SecondaryDeviceQRCodeScanner to support emulator
Summary

if we're trying to add a device from an iOS simulator or android emulator, we should just display a TextInput where the user can paste the QR Code URL

Depends on D12619

Test Plan

if device is added successfully, we are navigated back upon acknowledging the alert

if device can't be added successfully, we are navigated back when the alert fires

adding keyserver as secondary device works -- appears in DDB correctly

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

varun created this revision.Jun 28 2024, 12:58 PM
Herald added a subscriber: tomek. · View Herald TranscriptJun 28 2024, 12:58 PM
Harbormaster completed remote builds in B30007: Diff 41821.Jun 28 2024, 1:13 PM
varun requested review of this revision.Jun 28 2024, 1:13 PM
bartek added inline comments.Jul 1 2024, 2:42 AM
native/profile/secondary-device-qr-code-scanner.react.js
169

You did use the alert constants above, but not here

ashoat requested changes to this revision.Jul 1 2024, 5:25 PM

Love some of the improvements you made to the existing code, such as passing more specific data into the hooks

Requesting chnages for some questions, and to remove the button for non-emulators

native/profile/secondary-device-qr-code-scanner.react.js
61

Nit

169

Personally, I'm not sure factoring it out is necessary if the string isn't duplicated elsewhere. I'd probably inline secondaryDeviceRegisteredAlertDetails

248

Is this logic copied from somewhere? Wondering how the QR code parsing happens when we get the URL via a deep link, versus this new method

If it's duplicated, would be good to factor out

251

Did you forget to remove this console.log?

263–273

Don't we want to only show this button when deviceIsEmulator?

This revision now requires changes to proceed.Jul 1 2024, 5:25 PM
varun updated this revision to Diff 42243.Jul 11 2024, 3:18 PM

address feedback

varun added inline comments.Jul 11 2024, 3:19 PM
native/profile/secondary-device-qr-code-scanner.react.js
248

i didn't realize parseDataFromDeepLink does what we need here

Harbormaster completed remote builds in B30295: Diff 42243.Jul 11 2024, 3:34 PM
ashoat accepted this revision.Jul 11 2024, 9:19 PM
ashoat added inline comments.
native/profile/secondary-device-qr-code-scanner.react.js
258 ↗(On Diff #42243)

Can we use parsedData for this too?

This revision is now accepted and ready to land.Jul 11 2024, 9:19 PM
varun added inline comments.Jul 12 2024, 12:15 AM
native/profile/secondary-device-qr-code-scanner.react.js
258 ↗(On Diff #42243)

i'm not sure i understand your feedback here

ashoat added inline comments.Jul 12 2024, 7:19 AM
native/profile/secondary-device-qr-code-scanner.react.js
258 ↗(On Diff #42243)

In the last revision, you realized we could use parseDataFromDeepLink to parse the urlInput. Is it possible to use its result (parsedData) for this parsing step as well?

varun added inline comments.Jul 12 2024, 10:37 AM
native/profile/secondary-device-qr-code-scanner.react.js
258 ↗(On Diff #42243)

we are doing that, right? keysMatch = parsedData?.data?.keys gives us the encoded URI component, so we decode it and then parse it to a JSON object here

parseDataFromDeepLink() returns a ParsedDeepLinkData, which is a union of types including

type ParsedQRCodeData = {
  +type: 'qr-code',
  +data: { +keysAndDeviceType: string },
};
ashoat added inline comments.Jul 12 2024, 10:47 AM
native/profile/secondary-device-qr-code-scanner.react.js
258 ↗(On Diff #42243)

Thanks for explaining

Closed by commit rCOMM63899045a319: [native] modify SecondaryDeviceQRCodeScanner to support emulator (authored by varun). · Explain WhyJul 12 2024, 12:19 PM
This revision was automatically updated to reflect the committed changes.
varun added a commit: rCOMM63899045a319: [native] modify SecondaryDeviceQRCodeScanner to support emulator.

Revision Contents
Changeset List

Diff 41821

View Options

native/profile/linked-devices-header-right-button.react.js

Show First 20 Lines • Show All 132 Lines • ▼ Show 20 Lines RUNTIME.spawn(async move {
return; return;
} }
trigger_backup_file_upload(); trigger_backup_file_upload();
// The promise will be resolved when the backup is uploaded // The promise will be resolved when the backup is uploaded
}); });
} }
pub fn retrieve_backup_keys( pub fn get_backup_user_keys(
user_identifier: String,
backup_secret: String, backup_secret: String,
backup_id: String, backup_id: String,
promise_id: u32, promise_id: u32,
) { ) {
RUNTIME.spawn(async move { RUNTIME.spawn(async move {
let result = download_backup_keys(backup_id, backup_secret) let result =
download_backup_keys(user_identifier, backup_secret, backup_id)
.await .await
.map_err(|err| err.to_string()); .map_err(|err| err.to_string());
let result = match result { let result = match result {
Ok(result) => result, Ok(result) => result,
Err(error) => { Err(error) => {
string_callback(error, promise_id, "".to_string()); string_callback(error, promise_id, "".to_string());
return; return;
} }
}; };
▲ Show 20 Lines • Show All 179 Lines • ▼ Show 20 Lines) -> Result<LatestBackupInfoResponse, Box<dyn Error>> {
Ok(LatestBackupInfoResponse { Ok(LatestBackupInfoResponse {
backup_id, backup_id,
user_id, user_id,
siwe_backup_msg, siwe_backup_msg,
}) })
} }
async fn download_backup_keys( async fn download_backup_keys(
backup_id: String, user_identifier: String,
backup_secret: String, backup_secret: String,
backup_id: String,
) -> Result<UserKeys, Box<dyn Error>> { ) -> Result<UserKeys, Box<dyn Error>> {
let backup_client = BackupClient::new(BACKUP_SOCKET_ADDR)?; let backup_client = BackupClient::new(BACKUP_SOCKET_ADDR)?;
let user_identity = get_user_identity_from_secure_store()?;
let backup_descriptor = BackupDescriptor::BackupID { let backup_descriptor = BackupDescriptor::Latest { user_identifier };
backup_id: backup_id.clone(),
user_identity: user_identity.clone(),
};
let mut encrypted_user_keys = backup_client let mut encrypted_user_keys = backup_client
.download_backup_data(&backup_descriptor, RequestedData::UserKeys) .download_backup_data(&backup_descriptor, RequestedData::UserKeys)
.await?; .await?;
let mut backup_key = compute_backup_key_str(&backup_secret, &backup_id)?; let mut backup_key = compute_backup_key_str(&backup_secret, &backup_id)?;
UserKeys::from_encrypted(&mut encrypted_user_keys, &mut backup_key) UserKeys::from_encrypted(&mut encrypted_user_keys, &mut backup_key)
} }
▲ Show 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
} }
/// Stores the Olm account in `pickled_account`. However, Olm account /// Stores the Olm account in `pickled_account`. However, Olm account
/// information might be out of date. We have decided we don't need /// information might be out of date. We have decided we don't need
/// to update this when one-time keys (OTKs) or prekeys change. /// to update this when one-time keys (OTKs) or prekeys change.
/// The reasoning behind this decision is that the backed-up Olm account /// The reasoning behind this decision is that the backed-up Olm account
/// is primarily used for signing an update to the device list. For these /// is primarily used for signing an update to the device list. For these
/// operations only the identity signing key is necessary. /// operations only the identity signing key is necessary.
// This struct should match `UserKeys` in `lib/types/backup-types.js`
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
struct UserKeys { struct UserKeys {
backup_data_key: String, backup_data_key: String,
backup_log_data_key: String, backup_log_data_key: String,
pickle_key: String, pickle_key: String,
pickled_account: String, pickled_account: String,
} }
impl UserKeys { impl UserKeys {
Show All 31 Lines
View Options

native/profile/profile.react.js

Show First 20 Lines • Show All 132 Lines • ▼ Show 20 Lines RUNTIME.spawn(async move {
return; return;
} }
trigger_backup_file_upload(); trigger_backup_file_upload();
// The promise will be resolved when the backup is uploaded // The promise will be resolved when the backup is uploaded
}); });
} }
pub fn retrieve_backup_keys( pub fn get_backup_user_keys(
user_identifier: String,
backup_secret: String, backup_secret: String,
backup_id: String, backup_id: String,
promise_id: u32, promise_id: u32,
) { ) {
RUNTIME.spawn(async move { RUNTIME.spawn(async move {
let result = download_backup_keys(backup_id, backup_secret) let result =
download_backup_keys(user_identifier, backup_secret, backup_id)
.await .await
.map_err(|err| err.to_string()); .map_err(|err| err.to_string());
let result = match result { let result = match result {
Ok(result) => result, Ok(result) => result,
Err(error) => { Err(error) => {
string_callback(error, promise_id, "".to_string()); string_callback(error, promise_id, "".to_string());
return; return;
} }
}; };
▲ Show 20 Lines • Show All 179 Lines • ▼ Show 20 Lines) -> Result<LatestBackupInfoResponse, Box<dyn Error>> {
Ok(LatestBackupInfoResponse { Ok(LatestBackupInfoResponse {
backup_id, backup_id,
user_id, user_id,
siwe_backup_msg, siwe_backup_msg,
}) })
} }
async fn download_backup_keys( async fn download_backup_keys(
backup_id: String, user_identifier: String,
backup_secret: String, backup_secret: String,
backup_id: String,
) -> Result<UserKeys, Box<dyn Error>> { ) -> Result<UserKeys, Box<dyn Error>> {
let backup_client = BackupClient::new(BACKUP_SOCKET_ADDR)?; let backup_client = BackupClient::new(BACKUP_SOCKET_ADDR)?;
let user_identity = get_user_identity_from_secure_store()?;
let backup_descriptor = BackupDescriptor::BackupID { let backup_descriptor = BackupDescriptor::Latest { user_identifier };
backup_id: backup_id.clone(),
user_identity: user_identity.clone(),
};
let mut encrypted_user_keys = backup_client let mut encrypted_user_keys = backup_client
.download_backup_data(&backup_descriptor, RequestedData::UserKeys) .download_backup_data(&backup_descriptor, RequestedData::UserKeys)
.await?; .await?;
let mut backup_key = compute_backup_key_str(&backup_secret, &backup_id)?; let mut backup_key = compute_backup_key_str(&backup_secret, &backup_id)?;
UserKeys::from_encrypted(&mut encrypted_user_keys, &mut backup_key) UserKeys::from_encrypted(&mut encrypted_user_keys, &mut backup_key)
} }
▲ Show 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
} }
/// Stores the Olm account in `pickled_account`. However, Olm account /// Stores the Olm account in `pickled_account`. However, Olm account
/// information might be out of date. We have decided we don't need /// information might be out of date. We have decided we don't need
/// to update this when one-time keys (OTKs) or prekeys change. /// to update this when one-time keys (OTKs) or prekeys change.
/// The reasoning behind this decision is that the backed-up Olm account /// The reasoning behind this decision is that the backed-up Olm account
/// is primarily used for signing an update to the device list. For these /// is primarily used for signing an update to the device list. For these
/// operations only the identity signing key is necessary. /// operations only the identity signing key is necessary.
// This struct should match `UserKeys` in `lib/types/backup-types.js`
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
struct UserKeys { struct UserKeys {
backup_data_key: String, backup_data_key: String,
backup_log_data_key: String, backup_log_data_key: String,
pickle_key: String, pickle_key: String,
pickled_account: String, pickled_account: String,
} }
impl UserKeys { impl UserKeys {
Show All 31 Lines
View Options

native/profile/secondary-device-qr-code-scanner.react.js

Show First 20 Lines • Show All 132 Lines • ▼ Show 20 Lines RUNTIME.spawn(async move {
return; return;
} }
trigger_backup_file_upload(); trigger_backup_file_upload();
// The promise will be resolved when the backup is uploaded // The promise will be resolved when the backup is uploaded
}); });
} }
pub fn retrieve_backup_keys( pub fn get_backup_user_keys(
user_identifier: String,
backup_secret: String, backup_secret: String,
backup_id: String, backup_id: String,
promise_id: u32, promise_id: u32,
) { ) {
RUNTIME.spawn(async move { RUNTIME.spawn(async move {
let result = download_backup_keys(backup_id, backup_secret) let result =
download_backup_keys(user_identifier, backup_secret, backup_id)
.await .await
.map_err(|err| err.to_string()); .map_err(|err| err.to_string());
let result = match result { let result = match result {
Ok(result) => result, Ok(result) => result,
Err(error) => { Err(error) => {
string_callback(error, promise_id, "".to_string()); string_callback(error, promise_id, "".to_string());
return; return;
} }
}; };
▲ Show 20 Lines • Show All 179 Lines • ▼ Show 20 Lines) -> Result<LatestBackupInfoResponse, Box<dyn Error>> {
Ok(LatestBackupInfoResponse { Ok(LatestBackupInfoResponse {
backup_id, backup_id,
user_id, user_id,
siwe_backup_msg, siwe_backup_msg,
}) })
} }
async fn download_backup_keys( async fn download_backup_keys(
backup_id: String, user_identifier: String,
backup_secret: String, backup_secret: String,
backup_id: String,
) -> Result<UserKeys, Box<dyn Error>> { ) -> Result<UserKeys, Box<dyn Error>> {
let backup_client = BackupClient::new(BACKUP_SOCKET_ADDR)?; let backup_client = BackupClient::new(BACKUP_SOCKET_ADDR)?;
let user_identity = get_user_identity_from_secure_store()?;
let backup_descriptor = BackupDescriptor::BackupID { let backup_descriptor = BackupDescriptor::Latest { user_identifier };
backup_id: backup_id.clone(),
user_identity: user_identity.clone(),
};
let mut encrypted_user_keys = backup_client let mut encrypted_user_keys = backup_client
.download_backup_data(&backup_descriptor, RequestedData::UserKeys) .download_backup_data(&backup_descriptor, RequestedData::UserKeys)
.await?; .await?;
let mut backup_key = compute_backup_key_str(&backup_secret, &backup_id)?; let mut backup_key = compute_backup_key_str(&backup_secret, &backup_id)?;
UserKeys::from_encrypted(&mut encrypted_user_keys, &mut backup_key) UserKeys::from_encrypted(&mut encrypted_user_keys, &mut backup_key)
} }
▲ Show 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
} }
/// Stores the Olm account in `pickled_account`. However, Olm account /// Stores the Olm account in `pickled_account`. However, Olm account
/// information might be out of date. We have decided we don't need /// information might be out of date. We have decided we don't need
/// to update this when one-time keys (OTKs) or prekeys change. /// to update this when one-time keys (OTKs) or prekeys change.
/// The reasoning behind this decision is that the backed-up Olm account /// The reasoning behind this decision is that the backed-up Olm account
/// is primarily used for signing an update to the device list. For these /// is primarily used for signing an update to the device list. For these
/// operations only the identity signing key is necessary. /// operations only the identity signing key is necessary.
// This struct should match `UserKeys` in `lib/types/backup-types.js`
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
struct UserKeys { struct UserKeys {
backup_data_key: String, backup_data_key: String,
backup_log_data_key: String, backup_log_data_key: String,
pickle_key: String, pickle_key: String,
pickled_account: String, pickled_account: String,
} }
impl UserKeys { impl UserKeys {
Show All 31 Lines
View Options

native/utils/alert-messages.js

Show First 20 Lines • Show All 132 Lines • ▼ Show 20 Lines RUNTIME.spawn(async move {
return; return;
} }
trigger_backup_file_upload(); trigger_backup_file_upload();
// The promise will be resolved when the backup is uploaded // The promise will be resolved when the backup is uploaded
}); });
} }
pub fn retrieve_backup_keys( pub fn get_backup_user_keys(
user_identifier: String,
backup_secret: String, backup_secret: String,
backup_id: String, backup_id: String,
promise_id: u32, promise_id: u32,
) { ) {
RUNTIME.spawn(async move { RUNTIME.spawn(async move {
let result = download_backup_keys(backup_id, backup_secret) let result =
download_backup_keys(user_identifier, backup_secret, backup_id)
.await .await
.map_err(|err| err.to_string()); .map_err(|err| err.to_string());
let result = match result { let result = match result {
Ok(result) => result, Ok(result) => result,
Err(error) => { Err(error) => {
string_callback(error, promise_id, "".to_string()); string_callback(error, promise_id, "".to_string());
return; return;
} }
}; };
▲ Show 20 Lines • Show All 179 Lines • ▼ Show 20 Lines) -> Result<LatestBackupInfoResponse, Box<dyn Error>> {
Ok(LatestBackupInfoResponse { Ok(LatestBackupInfoResponse {
backup_id, backup_id,
user_id, user_id,
siwe_backup_msg, siwe_backup_msg,
}) })
} }
async fn download_backup_keys( async fn download_backup_keys(
backup_id: String, user_identifier: String,
backup_secret: String, backup_secret: String,
backup_id: String,
) -> Result<UserKeys, Box<dyn Error>> { ) -> Result<UserKeys, Box<dyn Error>> {
let backup_client = BackupClient::new(BACKUP_SOCKET_ADDR)?; let backup_client = BackupClient::new(BACKUP_SOCKET_ADDR)?;
let user_identity = get_user_identity_from_secure_store()?;
let backup_descriptor = BackupDescriptor::BackupID { let backup_descriptor = BackupDescriptor::Latest { user_identifier };
backup_id: backup_id.clone(),
user_identity: user_identity.clone(),
};
let mut encrypted_user_keys = backup_client let mut encrypted_user_keys = backup_client
.download_backup_data(&backup_descriptor, RequestedData::UserKeys) .download_backup_data(&backup_descriptor, RequestedData::UserKeys)
.await?; .await?;
let mut backup_key = compute_backup_key_str(&backup_secret, &backup_id)?; let mut backup_key = compute_backup_key_str(&backup_secret, &backup_id)?;
UserKeys::from_encrypted(&mut encrypted_user_keys, &mut backup_key) UserKeys::from_encrypted(&mut encrypted_user_keys, &mut backup_key)
} }
▲ Show 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
} }
/// Stores the Olm account in `pickled_account`. However, Olm account /// Stores the Olm account in `pickled_account`. However, Olm account
/// information might be out of date. We have decided we don't need /// information might be out of date. We have decided we don't need
/// to update this when one-time keys (OTKs) or prekeys change. /// to update this when one-time keys (OTKs) or prekeys change.
/// The reasoning behind this decision is that the backed-up Olm account /// The reasoning behind this decision is that the backed-up Olm account
/// is primarily used for signing an update to the device list. For these /// is primarily used for signing an update to the device list. For these
/// operations only the identity signing key is necessary. /// operations only the identity signing key is necessary.
// This struct should match `UserKeys` in `lib/types/backup-types.js`
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
struct UserKeys { struct UserKeys {
backup_data_key: String, backup_data_key: String,
backup_log_data_key: String, backup_log_data_key: String,
pickle_key: String, pickle_key: String,
pickled_account: String, pickled_account: String,
} }
impl UserKeys { impl UserKeys {
Show All 31 Lines