Page MenuHomePhabricator
Differential D12108

[native][web] Get rid of unnecessary React state for QR code URL
ClosedPublic
Actions

Authored by ashoat on May 20 2024, 3:54 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 29, 7:38 AM
Unknown Object (File)
Sat, Mar 29, 12:26 AM
Unknown Object (File)
Sun, Mar 23, 11:19 AM
Unknown Object (File)
Sat, Mar 22, 4:20 AM
Unknown Object (File)
Sat, Mar 15, 12:54 AM
Unknown Object (File)
Feb 27 2025, 11:10 PM
Unknown Object (File)
Feb 26 2025, 8:02 AM
Unknown Object (File)
Feb 26 2025, 8:02 AM
View All 71 Files
Subscribers
tomek

Details

Reviewers
bartek
Commits
rCOMM46643c3a9b5c: [native][web] Get rid of unnecessary React state for QR code URL
Summary

This can be derived from other state. We should avoid duplicating state to prevent the possibility of it becoming inconsistent.

Depends on D12107

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/
10 lines
web/
account/
14 lines

Diff 40432

View Options

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

use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use crate::comm_service::{backup, blob, tunnelbroker}; use crate::comm_service::{backup, blob, tunnelbroker};
use crate::config::CONFIG; use crate::config::CONFIG;
use crate::constants::staff::AUTHORITATIVE_KEYSERVER_OWNER_USER_ID;
use crate::database::{DeviceListUpdate, PlatformDetails}; use crate::database::{DeviceListUpdate, PlatformDetails};
use crate::device_list::validation::DeviceListValidator; use crate::device_list::validation::DeviceListValidator;
use crate::device_list::SignedDeviceList; use crate::device_list::SignedDeviceList;
use crate::error::consume_error; use crate::error::consume_error;
use crate::log::redact_sensitive_data; use crate::log::redact_sensitive_data;
use crate::{ use crate::{
client_service::{handle_db_error, WorkflowInProgress}, client_service::{handle_db_error, WorkflowInProgress},
constants::{error_types, request_metadata, staff, tonic_status_messages}, constants::{error_types, request_metadata, staff, tonic_status_messages},
Show All 19 Linesuse super::protos::auth::{
PrivilegedResetUserPasswordFinishRequest, PrivilegedResetUserPasswordFinishRequest,
PrivilegedResetUserPasswordStartRequest, PrivilegedResetUserPasswordStartRequest,
PrivilegedResetUserPasswordStartResponse, RefreshUserPrekeysRequest, PrivilegedResetUserPasswordStartResponse, RefreshUserPrekeysRequest,
UpdateDeviceListRequest, UpdateUserPasswordFinishRequest, UpdateDeviceListRequest, UpdateUserPasswordFinishRequest,
UpdateUserPasswordStartRequest, UpdateUserPasswordStartResponse, UpdateUserPasswordStartRequest, UpdateUserPasswordStartResponse,
UploadOneTimeKeysRequest, UserDevicesPlatformDetails, UserIdentitiesRequest, UploadOneTimeKeysRequest, UserDevicesPlatformDetails, UserIdentitiesRequest,
UserIdentitiesResponse, UserIdentitiesResponse,
}; };
use super::protos::unauth::Empty; use super::protos::unauth::{DeviceType, Empty};
#[derive(derive_more::Constructor)] #[derive(derive_more::Constructor)]
pub struct AuthenticatedService { pub struct AuthenticatedService {
db_client: DatabaseClient, db_client: DatabaseClient,
blob_client: BlobServiceClient, blob_client: BlobServiceClient,
comm_auth_service: AuthService, comm_auth_service: AuthService,
} }
▲ Show 20 Lines • Show All 424 Lines • ▼ Show 20 Lines ) -> Result<tonic::Response<Empty>, tonic::Status> {
self self
.verify_device_on_device_list( .verify_device_on_device_list(
&user_id, &user_id,
&device_id, &device_id,
DeviceListItemKind::Primary, DeviceListItemKind::Primary,
) )
.await?; .await?;
if user_id == AUTHORITATIVE_KEYSERVER_OWNER_USER_ID {
self.log_out_authoritative_keyserver_owner().await?;
return Ok(Response::new(Empty {}));
}
// Get and verify singleton device list // Get and verify singleton device list
let parsed_device_list: SignedDeviceList = let parsed_device_list: SignedDeviceList =
message.signed_device_list.parse()?; message.signed_device_list.parse()?;
let update_payload = DeviceListUpdate::try_from(parsed_device_list)?; let update_payload = DeviceListUpdate::try_from(parsed_device_list)?;
crate::device_list::verify_singleton_device_list( crate::device_list::verify_singleton_device_list(
&update_payload, &update_payload,
&device_id, &device_id,
▲ Show 20 Lines • Show All 704 Lines • ▼ Show 20 Lines let s2s_token =
errorType = error_types::HTTP_LOG, errorType = error_types::HTTP_LOG,
"Failed to retrieve service-to-service token: {err:?}", "Failed to retrieve service-to-service token: {err:?}",
); );
tonic::Status::aborted(tonic_status_messages::UNEXPECTED_ERROR) tonic::Status::aborted(tonic_status_messages::UNEXPECTED_ERROR)
})?; })?;
let blob_client = self.blob_client.with_authentication(s2s_token.into()); let blob_client = self.blob_client.with_authentication(s2s_token.into());
Ok(blob_client) Ok(blob_client)
} }
/// for authoritatative keyserver owner, instead of primary device logout,
/// we should remove all devices but keyserver, remove backup
/// and create an unsigned device list update, effectively downgrading
/// the user back to v1 flows
async fn log_out_authoritative_keyserver_owner(
&self,
) -> Result<(), tonic::Status> {
let user_id = AUTHORITATIVE_KEYSERVER_OWNER_USER_ID;
let devices = self.db_client.get_current_devices(user_id).await?;
let keyserver_device_id = devices
.iter()
.find(|it| matches!(it.device_type(), DeviceType::Keyserver))
.map(|keyserver| &keyserver.device_id);
let new_device_list = if let Some(keyserver_id) = keyserver_device_id {
vec![keyserver_id.to_string()]
} else {
Vec::new()
};
let device_list_update = DeviceListUpdate::new_unsigned(new_device_list)?;
let validator = None::<DeviceListValidator>;
self
.db_client
.apply_devicelist_update(user_id, device_list_update, validator, true)
.await?;
backup::delete_backup_user_data(user_id, &self.comm_auth_service).await?;
Ok(())
}
} }
#[derive( #[derive(
Clone, serde::Serialize, serde::Deserialize, derive_more::Constructor, Clone, serde::Serialize, serde::Deserialize, derive_more::Constructor,
)] )]
pub struct DeletePasswordUserInfo { pub struct DeletePasswordUserInfo {
pub opaque_server_login: comm_opaque2::server::Login, pub opaque_server_login: comm_opaque2::server::Login,
} }
Show All 14 Lines
View Options

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

use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use crate::comm_service::{backup, blob, tunnelbroker}; use crate::comm_service::{backup, blob, tunnelbroker};
use crate::config::CONFIG; use crate::config::CONFIG;
use crate::constants::staff::AUTHORITATIVE_KEYSERVER_OWNER_USER_ID;
use crate::database::{DeviceListUpdate, PlatformDetails}; use crate::database::{DeviceListUpdate, PlatformDetails};
use crate::device_list::validation::DeviceListValidator; use crate::device_list::validation::DeviceListValidator;
use crate::device_list::SignedDeviceList; use crate::device_list::SignedDeviceList;
use crate::error::consume_error; use crate::error::consume_error;
use crate::log::redact_sensitive_data; use crate::log::redact_sensitive_data;
use crate::{ use crate::{
client_service::{handle_db_error, WorkflowInProgress}, client_service::{handle_db_error, WorkflowInProgress},
constants::{error_types, request_metadata, staff, tonic_status_messages}, constants::{error_types, request_metadata, staff, tonic_status_messages},
Show All 19 Linesuse super::protos::auth::{
PrivilegedResetUserPasswordFinishRequest, PrivilegedResetUserPasswordFinishRequest,
PrivilegedResetUserPasswordStartRequest, PrivilegedResetUserPasswordStartRequest,
PrivilegedResetUserPasswordStartResponse, RefreshUserPrekeysRequest, PrivilegedResetUserPasswordStartResponse, RefreshUserPrekeysRequest,
UpdateDeviceListRequest, UpdateUserPasswordFinishRequest, UpdateDeviceListRequest, UpdateUserPasswordFinishRequest,
UpdateUserPasswordStartRequest, UpdateUserPasswordStartResponse, UpdateUserPasswordStartRequest, UpdateUserPasswordStartResponse,
UploadOneTimeKeysRequest, UserDevicesPlatformDetails, UserIdentitiesRequest, UploadOneTimeKeysRequest, UserDevicesPlatformDetails, UserIdentitiesRequest,
UserIdentitiesResponse, UserIdentitiesResponse,
}; };
use super::protos::unauth::Empty; use super::protos::unauth::{DeviceType, Empty};
#[derive(derive_more::Constructor)] #[derive(derive_more::Constructor)]
pub struct AuthenticatedService { pub struct AuthenticatedService {
db_client: DatabaseClient, db_client: DatabaseClient,
blob_client: BlobServiceClient, blob_client: BlobServiceClient,
comm_auth_service: AuthService, comm_auth_service: AuthService,
} }
▲ Show 20 Lines • Show All 424 Lines • ▼ Show 20 Lines ) -> Result<tonic::Response<Empty>, tonic::Status> {
self self
.verify_device_on_device_list( .verify_device_on_device_list(
&user_id, &user_id,
&device_id, &device_id,
DeviceListItemKind::Primary, DeviceListItemKind::Primary,
) )
.await?; .await?;
if user_id == AUTHORITATIVE_KEYSERVER_OWNER_USER_ID {
self.log_out_authoritative_keyserver_owner().await?;
return Ok(Response::new(Empty {}));
}
// Get and verify singleton device list // Get and verify singleton device list
let parsed_device_list: SignedDeviceList = let parsed_device_list: SignedDeviceList =
message.signed_device_list.parse()?; message.signed_device_list.parse()?;
let update_payload = DeviceListUpdate::try_from(parsed_device_list)?; let update_payload = DeviceListUpdate::try_from(parsed_device_list)?;
crate::device_list::verify_singleton_device_list( crate::device_list::verify_singleton_device_list(
&update_payload, &update_payload,
&device_id, &device_id,
▲ Show 20 Lines • Show All 704 Lines • ▼ Show 20 Lines let s2s_token =
errorType = error_types::HTTP_LOG, errorType = error_types::HTTP_LOG,
"Failed to retrieve service-to-service token: {err:?}", "Failed to retrieve service-to-service token: {err:?}",
); );
tonic::Status::aborted(tonic_status_messages::UNEXPECTED_ERROR) tonic::Status::aborted(tonic_status_messages::UNEXPECTED_ERROR)
})?; })?;
let blob_client = self.blob_client.with_authentication(s2s_token.into()); let blob_client = self.blob_client.with_authentication(s2s_token.into());
Ok(blob_client) Ok(blob_client)
} }
/// for authoritatative keyserver owner, instead of primary device logout,
/// we should remove all devices but keyserver, remove backup
/// and create an unsigned device list update, effectively downgrading
/// the user back to v1 flows
async fn log_out_authoritative_keyserver_owner(
&self,
) -> Result<(), tonic::Status> {
let user_id = AUTHORITATIVE_KEYSERVER_OWNER_USER_ID;
let devices = self.db_client.get_current_devices(user_id).await?;
let keyserver_device_id = devices
.iter()
.find(|it| matches!(it.device_type(), DeviceType::Keyserver))
.map(|keyserver| &keyserver.device_id);
let new_device_list = if let Some(keyserver_id) = keyserver_device_id {
vec![keyserver_id.to_string()]
} else {
Vec::new()
};
let device_list_update = DeviceListUpdate::new_unsigned(new_device_list)?;
let validator = None::<DeviceListValidator>;
self
.db_client
.apply_devicelist_update(user_id, device_list_update, validator, true)
.await?;
backup::delete_backup_user_data(user_id, &self.comm_auth_service).await?;
Ok(())
}
} }
#[derive( #[derive(
Clone, serde::Serialize, serde::Deserialize, derive_more::Constructor, Clone, serde::Serialize, serde::Deserialize, derive_more::Constructor,
)] )]
pub struct DeletePasswordUserInfo { pub struct DeletePasswordUserInfo {
pub opaque_server_login: comm_opaque2::server::Login, pub opaque_server_login: comm_opaque2::server::Login,
} }
Show All 14 Lines