Page MenuHomePhabricator
Differential D14182

[native] Update device list as a part of the restoration
ClosedPublic
Actions

Authored by tomek on Jan 7 2025, 1:21 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Mar 9, 8:58 PM
Unknown Object (File)
Sun, Mar 9, 8:58 PM
Unknown Object (File)
Sun, Mar 9, 8:57 PM
Unknown Object (File)
Sun, Mar 9, 8:57 PM
Unknown Object (File)
Feb 23 2025, 6:06 PM
Unknown Object (File)
Feb 12 2025, 12:46 PM
Unknown Object (File)
Feb 6 2025, 3:44 AM
Unknown Object (File)
Feb 6 2025, 3:44 AM
View All 34 Files
Subscribers
ashoat

Details

Reviewers
kamil
bartek
Commits
rCOMM4778815ea6f0: [native] Update device list as a part of the restoration
Summary

After the restoration, the device list in the store is empty, which means that the current device can't be recognized as the primary one. To solve that we can update the store as a part of the success restoration action.

https://linear.app/comm/issue/ENG-10033/regenerate-a-new-backup

Depends on D14180

Test Plan

Add some logs to the code that checks if a device is primary and check that it returns true just after the restoration. Also, check the SIWE restoration - a screen on which a new backup is created should be shown just after the restoration - this verifies that the device was successfully recognized as primary because the screen is only shown on the primary devices.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
lib/
actions/
6 lines
reducers/
6 lines
types/
3 lines
native/
account/
28 lines

Diff 46612

View Options

lib/actions/user-actions.js

Show All 30 Lines
use super::DatabaseClient; use super::DatabaseClient;
impl DatabaseClient { impl DatabaseClient {
/// Gets the next one-time key for the account and then, in a transaction, /// Gets the next one-time key for the account and then, in a transaction,
/// deletes the key and updates the key count /// deletes the key and updates the key count
/// ///
/// Returns the retrieved one-time key if it exists and a boolean indicating /// Returns the retrieved one-time key if it exists and a boolean indicating
/// whether the `spawn_refresh_keys_task`` was called /// whether the `spawn_refresh_keys_task`` was called
#[tracing::instrument(skip_all)]
pub(super) async fn get_one_time_key( pub(super) async fn get_one_time_key(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
can_request_more_keys: bool, can_request_more_keys: bool,
) -> Result<(Option<String>, bool), Error> { ) -> Result<(Option<String>, bool), Error> {
use crate::constants::devices_table; use crate::constants::devices_table;
▲ Show 20 Lines • Show All 102 Lines • ▼ Show 20 Lines loop {
); );
return Err(Error::AwsSdk(dynamo_db_error)); return Err(Error::AwsSdk(dynamo_db_error));
} }
} }
} }
} }
} }
#[tracing::instrument(skip_all)]
async fn get_one_time_keys( async fn get_one_time_keys(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
num_keys: Option<usize>, num_keys: Option<usize>,
) -> Result<Vec<OTKRow>, Error> { ) -> Result<Vec<OTKRow>, Error> {
use crate::constants::one_time_keys_table::*; use crate::constants::one_time_keys_table::*;
Show All 33 Lines if let Some(limit) = num_keys {
error!("There are fewer one-time keys than the number requested"); error!("There are fewer one-time keys than the number requested");
return Err(Error::NotEnoughOneTimeKeys); return Err(Error::NotEnoughOneTimeKeys);
} }
} }
Ok(otk_rows) Ok(otk_rows)
} }
#[tracing::instrument(skip_all)]
pub async fn append_one_time_prekeys( pub async fn append_one_time_prekeys(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
content_one_time_keys: &Vec<String>, content_one_time_keys: &Vec<String>,
notif_one_time_keys: &Vec<String>, notif_one_time_keys: &Vec<String>,
) -> Result<(), Error> { ) -> Result<(), Error> {
use crate::constants::retry; use crate::constants::retry;
▲ Show 20 Lines • Show All 115 Lines • ▼ Show 20 Lines loop {
} }
} }
} }
} }
Ok(()) Ok(())
} }
#[tracing::instrument(skip_all)]
async fn get_otk_count( async fn get_otk_count(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
) -> Result<usize, Error> { ) -> Result<usize, Error> {
use crate::constants::devices_table; use crate::constants::devices_table;
▲ Show 20 Lines • Show All 142 Lines • Show Last 20 Lines
View Options

lib/reducers/aux-user-reducer.js

Show All 30 Lines
use super::DatabaseClient; use super::DatabaseClient;
impl DatabaseClient { impl DatabaseClient {
/// Gets the next one-time key for the account and then, in a transaction, /// Gets the next one-time key for the account and then, in a transaction,
/// deletes the key and updates the key count /// deletes the key and updates the key count
/// ///
/// Returns the retrieved one-time key if it exists and a boolean indicating /// Returns the retrieved one-time key if it exists and a boolean indicating
/// whether the `spawn_refresh_keys_task`` was called /// whether the `spawn_refresh_keys_task`` was called
#[tracing::instrument(skip_all)]
pub(super) async fn get_one_time_key( pub(super) async fn get_one_time_key(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
can_request_more_keys: bool, can_request_more_keys: bool,
) -> Result<(Option<String>, bool), Error> { ) -> Result<(Option<String>, bool), Error> {
use crate::constants::devices_table; use crate::constants::devices_table;
▲ Show 20 Lines • Show All 102 Lines • ▼ Show 20 Lines loop {
); );
return Err(Error::AwsSdk(dynamo_db_error)); return Err(Error::AwsSdk(dynamo_db_error));
} }
} }
} }
} }
} }
#[tracing::instrument(skip_all)]
async fn get_one_time_keys( async fn get_one_time_keys(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
num_keys: Option<usize>, num_keys: Option<usize>,
) -> Result<Vec<OTKRow>, Error> { ) -> Result<Vec<OTKRow>, Error> {
use crate::constants::one_time_keys_table::*; use crate::constants::one_time_keys_table::*;
Show All 33 Lines if let Some(limit) = num_keys {
error!("There are fewer one-time keys than the number requested"); error!("There are fewer one-time keys than the number requested");
return Err(Error::NotEnoughOneTimeKeys); return Err(Error::NotEnoughOneTimeKeys);
} }
} }
Ok(otk_rows) Ok(otk_rows)
} }
#[tracing::instrument(skip_all)]
pub async fn append_one_time_prekeys( pub async fn append_one_time_prekeys(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
content_one_time_keys: &Vec<String>, content_one_time_keys: &Vec<String>,
notif_one_time_keys: &Vec<String>, notif_one_time_keys: &Vec<String>,
) -> Result<(), Error> { ) -> Result<(), Error> {
use crate::constants::retry; use crate::constants::retry;
▲ Show 20 Lines • Show All 115 Lines • ▼ Show 20 Lines loop {
} }
} }
} }
} }
Ok(()) Ok(())
} }
#[tracing::instrument(skip_all)]
async fn get_otk_count( async fn get_otk_count(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
) -> Result<usize, Error> { ) -> Result<usize, Error> {
use crate::constants::devices_table; use crate::constants::devices_table;
▲ Show 20 Lines • Show All 142 Lines • Show Last 20 Lines
View Options

lib/types/redux-types.js

Show All 30 Lines
use super::DatabaseClient; use super::DatabaseClient;
impl DatabaseClient { impl DatabaseClient {
/// Gets the next one-time key for the account and then, in a transaction, /// Gets the next one-time key for the account and then, in a transaction,
/// deletes the key and updates the key count /// deletes the key and updates the key count
/// ///
/// Returns the retrieved one-time key if it exists and a boolean indicating /// Returns the retrieved one-time key if it exists and a boolean indicating
/// whether the `spawn_refresh_keys_task`` was called /// whether the `spawn_refresh_keys_task`` was called
#[tracing::instrument(skip_all)]
pub(super) async fn get_one_time_key( pub(super) async fn get_one_time_key(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
can_request_more_keys: bool, can_request_more_keys: bool,
) -> Result<(Option<String>, bool), Error> { ) -> Result<(Option<String>, bool), Error> {
use crate::constants::devices_table; use crate::constants::devices_table;
▲ Show 20 Lines • Show All 102 Lines • ▼ Show 20 Lines loop {
); );
return Err(Error::AwsSdk(dynamo_db_error)); return Err(Error::AwsSdk(dynamo_db_error));
} }
} }
} }
} }
} }
#[tracing::instrument(skip_all)]
async fn get_one_time_keys( async fn get_one_time_keys(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
num_keys: Option<usize>, num_keys: Option<usize>,
) -> Result<Vec<OTKRow>, Error> { ) -> Result<Vec<OTKRow>, Error> {
use crate::constants::one_time_keys_table::*; use crate::constants::one_time_keys_table::*;
Show All 33 Lines if let Some(limit) = num_keys {
error!("There are fewer one-time keys than the number requested"); error!("There are fewer one-time keys than the number requested");
return Err(Error::NotEnoughOneTimeKeys); return Err(Error::NotEnoughOneTimeKeys);
} }
} }
Ok(otk_rows) Ok(otk_rows)
} }
#[tracing::instrument(skip_all)]
pub async fn append_one_time_prekeys( pub async fn append_one_time_prekeys(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
content_one_time_keys: &Vec<String>, content_one_time_keys: &Vec<String>,
notif_one_time_keys: &Vec<String>, notif_one_time_keys: &Vec<String>,
) -> Result<(), Error> { ) -> Result<(), Error> {
use crate::constants::retry; use crate::constants::retry;
▲ Show 20 Lines • Show All 115 Lines • ▼ Show 20 Lines loop {
} }
} }
} }
} }
Ok(()) Ok(())
} }
#[tracing::instrument(skip_all)]
async fn get_otk_count( async fn get_otk_count(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
) -> Result<usize, Error> { ) -> Result<usize, Error> {
use crate::constants::devices_table; use crate::constants::devices_table;
▲ Show 20 Lines • Show All 142 Lines • Show Last 20 Lines
View Options

native/account/restore.js

Show All 30 Lines
use super::DatabaseClient; use super::DatabaseClient;
impl DatabaseClient { impl DatabaseClient {
/// Gets the next one-time key for the account and then, in a transaction, /// Gets the next one-time key for the account and then, in a transaction,
/// deletes the key and updates the key count /// deletes the key and updates the key count
/// ///
/// Returns the retrieved one-time key if it exists and a boolean indicating /// Returns the retrieved one-time key if it exists and a boolean indicating
/// whether the `spawn_refresh_keys_task`` was called /// whether the `spawn_refresh_keys_task`` was called
#[tracing::instrument(skip_all)]
pub(super) async fn get_one_time_key( pub(super) async fn get_one_time_key(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
can_request_more_keys: bool, can_request_more_keys: bool,
) -> Result<(Option<String>, bool), Error> { ) -> Result<(Option<String>, bool), Error> {
use crate::constants::devices_table; use crate::constants::devices_table;
▲ Show 20 Lines • Show All 102 Lines • ▼ Show 20 Lines loop {
); );
return Err(Error::AwsSdk(dynamo_db_error)); return Err(Error::AwsSdk(dynamo_db_error));
} }
} }
} }
} }
} }
#[tracing::instrument(skip_all)]
async fn get_one_time_keys( async fn get_one_time_keys(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
num_keys: Option<usize>, num_keys: Option<usize>,
) -> Result<Vec<OTKRow>, Error> { ) -> Result<Vec<OTKRow>, Error> {
use crate::constants::one_time_keys_table::*; use crate::constants::one_time_keys_table::*;
Show All 33 Lines if let Some(limit) = num_keys {
error!("There are fewer one-time keys than the number requested"); error!("There are fewer one-time keys than the number requested");
return Err(Error::NotEnoughOneTimeKeys); return Err(Error::NotEnoughOneTimeKeys);
} }
} }
Ok(otk_rows) Ok(otk_rows)
} }
#[tracing::instrument(skip_all)]
pub async fn append_one_time_prekeys( pub async fn append_one_time_prekeys(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
content_one_time_keys: &Vec<String>, content_one_time_keys: &Vec<String>,
notif_one_time_keys: &Vec<String>, notif_one_time_keys: &Vec<String>,
) -> Result<(), Error> { ) -> Result<(), Error> {
use crate::constants::retry; use crate::constants::retry;
▲ Show 20 Lines • Show All 115 Lines • ▼ Show 20 Lines loop {
} }
} }
} }
} }
Ok(()) Ok(())
} }
#[tracing::instrument(skip_all)]
async fn get_otk_count( async fn get_otk_count(
&self, &self,
user_id: &str, user_id: &str,
device_id: &str, device_id: &str,
account_type: OlmAccountType, account_type: OlmAccountType,
) -> Result<usize, Error> { ) -> Result<usize, Error> {
use crate::constants::devices_table; use crate::constants::devices_table;
▲ Show 20 Lines • Show All 142 Lines • Show Last 20 Lines