Paths

Table of Contentst

-
native/
-
cpp/CommonCpp/
-
CommonCpp/
-
NativeModules/
1/3
CommCoreModule.h
1/3
CommCoreModule.cpp
-
_generated/
1/3
commJSI-generated.cpp
1/3
commJSI.h
-
native_rust_library/src/
-
src/
-
backup.rs
-
lib.rs
-
schema/
-
CommCoreModuleSchema.js

[native] Expose backup ct1 and ct2 functions to JS
ClosedPublic
Actions

Authored by bartek on Mar 18 2024, 3:59 AM.

Details

Reviewers

michal
kamil

Commits

rCOMMbda9552147ac: [native] Expose backup ct1 and ct2 functions to JS

Summary

In addition to restoreBackup(), exposed functions that separately get backup keys and data via JSI. They're needed for secondary device auth

Depends on D11344

Test Plan

Modified backupRestoreProtocol in useClientBackup to call retrieveBackupKeys and then restoreBackupData, instead of single restoreBackup() call.

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

bartek created this revision.Mar 18 2024, 3:59 AM

bartek held this revision as a draft.

Herald added subscribers: tomek, ashoat. · View Herald TranscriptMar 18 2024, 3:59 AM

Harbormaster failed remote builds in B27545: Diff 38116!Mar 18 2024, 4:13 AM

bartek added a child revision: D11346: [lib][native] Call backup restore protocol after QR auth.Mar 18 2024, 4:31 AM

Fix typo

bartek published this revision for review.Mar 18 2024, 5:10 AM

Harbormaster completed remote builds in B27550: Diff 38121.Mar 18 2024, 5:12 AM

michal accepted this revision.Mar 19 2024, 5:17 AM

This revision is now accepted and ready to land.Mar 19 2024, 5:17 AM

Closed by commit rCOMMbda9552147ac: [native] Expose backup ct1 and ct2 functions to JS (authored by bartek). · Explain WhyMar 21 2024, 4:29 AM

This revision was automatically updated to reflect the committed changes.

bartek added a commit: rCOMMbda9552147ac: [native] Expose backup ct1 and ct2 functions to JS.

Revision Contents
Changeset List

Path

Size

native/

cpp/

CommonCpp/

NativeModules/

CommCoreModule.h

7 lines

CommCoreModule.cpp

31 lines

_generated/

commJSI-generated.cpp

commJSI.h

native_rust_library/

src/

backup.rs

71 lines

lib.rs

11 lines

schema/

CommCoreModuleSchema.js

6 lines

Diff 38256

View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.h

use std::collections::HashMap; use std::collections::HashMap;

use comm_lib::aws::ddb::types::AttributeValue; use comm_lib::aws::ddb::types::AttributeValue;

use comm_lib::aws::ddb::types::ReturnValue;

use comm_lib::database::AttributeExtractor; use comm_lib::database::AttributeExtractor;

use comm_lib::database::AttributeMap; use comm_lib::database::AttributeMap;

use comm_lib::database::DBItemAttributeError; use comm_lib::database::DBItemAttributeError;

use comm_lib::database::DBItemError; use comm_lib::database::DBItemError;

use comm_lib::database::TryFromAttribute; use comm_lib::database::TryFromAttribute;

use comm_lib::database::Value; use comm_lib::database::Value;

use tracing::error; use tracing::error;

▲ Show 20 Lines • Show All 47 Lines • ▼ Show 20 Lines ) -> Result<Vec<FarcasterUserData>, Error> {

Ok(users) Ok(users)

} }

pub async fn add_farcaster_id( pub async fn add_farcaster_id(

&self, &self,

user_id: String, user_id: String,

farcaster_id: String, farcaster_id: String,

) -> Result<(), Error> { ) -> Result<(), Error> {

let update_expression = let update_expression = format!(

format!("SET {} = :val", USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME); "SET {} = if_not_exists({}, :val)",

let expression_attribute_values = USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME,

HashMap::from([(":val".to_string(), AttributeValue::S(farcaster_id))]); USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME

);

bartekUnsubmitted

Not Done

) -> Result<(), Error> {

let update_expression = format!(

- "SET {} = if_not_exists({}, :val)",

+ "SET {0} = if_not_exists({0}, :val)",

USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME,

- USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME

);

let expression_attribute_values = HashMap::from([(

You don't have to provide the same value twice

bartek: You don't have to provide the same value twice

let expression_attribute_values = HashMap::from([(

":val".to_string(),

AttributeValue::S(farcaster_id.clone()),

)]);

self let response = self

.client .client

.update_item() .update_item()

.table_name(USERS_TABLE) .table_name(USERS_TABLE)

.key(USERS_TABLE_PARTITION_KEY, AttributeValue::S(user_id)) .key(USERS_TABLE_PARTITION_KEY, AttributeValue::S(user_id))

.update_expression(update_expression) .update_expression(update_expression)

.set_expression_attribute_values(Some(expression_attribute_values)) .set_expression_attribute_values(Some(expression_attribute_values))

.return_values(ReturnValue::UpdatedNew)

.send() .send()

.await .await

.map_err(|e| Error::AwsSdk(e.into()))?; .map_err(|e| Error::AwsSdk(e.into()))?;

bartekUnsubmitted

Not Done

Does UpdateExpression if_not_exists fail the operation if given value already exists? The docs don't say this explicitly, but I guess

if_not_exists (path, value)

If the item does not contain an attribute at the specified path, if_not_exists evaluates to value; otherwise, it evaluates to path.

means that if the ID already exists, the expression evaluates to SET farcasterID = farcasterID so it's a no-op.

According to your test plan, it succeeds so it's alright

bartek: Does `UpdateExpression` `if_not_exists` fail the operation if given value already exists?

varunAuthorUnsubmitted

Done

yeah i checked and it succeeds so assuming DDB treats it as a no-op

varun: yeah i checked and it succeeds so assuming DDB treats it as a no-op

match response.attributes {

None => return Err(Error::MissingItem),

Some(mut attrs) => {

let farcaster_id_from_table: String =

attrs.take_attr(USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME)?;

if farcaster_id_from_table != farcaster_id {

return Err(Error::CannotOverwrite);

}

Ok(()) Ok(())

} }

impl TryFrom<AttributeMap> for FarcasterUserData { impl TryFrom<AttributeMap> for FarcasterUserData {

type Error = DBItemError; type Error = DBItemError;

fn try_from(mut attrs: AttributeMap) -> Result<Self, Self::Error> { fn try_from(mut attrs: AttributeMap) -> Result<Self, Self::Error> {

Show All 28 Lines

View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp

use std::collections::HashMap; use std::collections::HashMap;

use comm_lib::aws::ddb::types::AttributeValue; use comm_lib::aws::ddb::types::AttributeValue;

use comm_lib::aws::ddb::types::ReturnValue;

use comm_lib::database::AttributeExtractor; use comm_lib::database::AttributeExtractor;

use comm_lib::database::AttributeMap; use comm_lib::database::AttributeMap;

use comm_lib::database::DBItemAttributeError; use comm_lib::database::DBItemAttributeError;

use comm_lib::database::DBItemError; use comm_lib::database::DBItemError;

use comm_lib::database::TryFromAttribute; use comm_lib::database::TryFromAttribute;

use comm_lib::database::Value; use comm_lib::database::Value;

use tracing::error; use tracing::error;

▲ Show 20 Lines • Show All 47 Lines • ▼ Show 20 Lines ) -> Result<Vec<FarcasterUserData>, Error> {

Ok(users) Ok(users)

} }

pub async fn add_farcaster_id( pub async fn add_farcaster_id(

&self, &self,

user_id: String, user_id: String,

farcaster_id: String, farcaster_id: String,

) -> Result<(), Error> { ) -> Result<(), Error> {

let update_expression = let update_expression = format!(

format!("SET {} = :val", USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME); "SET {} = if_not_exists({}, :val)",

let expression_attribute_values = USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME,

HashMap::from([(":val".to_string(), AttributeValue::S(farcaster_id))]); USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME

);

bartekUnsubmitted

Not Done

) -> Result<(), Error> {

let update_expression = format!(

- "SET {} = if_not_exists({}, :val)",

+ "SET {0} = if_not_exists({0}, :val)",

USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME,

- USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME

);

let expression_attribute_values = HashMap::from([(

You don't have to provide the same value twice

bartek: You don't have to provide the same value twice

let expression_attribute_values = HashMap::from([(

":val".to_string(),

AttributeValue::S(farcaster_id.clone()),

)]);

self let response = self

.client .client

.update_item() .update_item()

.table_name(USERS_TABLE) .table_name(USERS_TABLE)

.key(USERS_TABLE_PARTITION_KEY, AttributeValue::S(user_id)) .key(USERS_TABLE_PARTITION_KEY, AttributeValue::S(user_id))

.update_expression(update_expression) .update_expression(update_expression)

.set_expression_attribute_values(Some(expression_attribute_values)) .set_expression_attribute_values(Some(expression_attribute_values))

.return_values(ReturnValue::UpdatedNew)

.send() .send()

.await .await

.map_err(|e| Error::AwsSdk(e.into()))?; .map_err(|e| Error::AwsSdk(e.into()))?;

bartekUnsubmitted

Not Done

Does UpdateExpression if_not_exists fail the operation if given value already exists? The docs don't say this explicitly, but I guess

if_not_exists (path, value)

If the item does not contain an attribute at the specified path, if_not_exists evaluates to value; otherwise, it evaluates to path.

means that if the ID already exists, the expression evaluates to SET farcasterID = farcasterID so it's a no-op.

According to your test plan, it succeeds so it's alright

bartek: Does `UpdateExpression` `if_not_exists` fail the operation if given value already exists?

varunAuthorUnsubmitted

Done

yeah i checked and it succeeds so assuming DDB treats it as a no-op

varun: yeah i checked and it succeeds so assuming DDB treats it as a no-op

match response.attributes {

None => return Err(Error::MissingItem),

Some(mut attrs) => {

let farcaster_id_from_table: String =

attrs.take_attr(USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME)?;

if farcaster_id_from_table != farcaster_id {

return Err(Error::CannotOverwrite);

}

Ok(()) Ok(())

} }

impl TryFrom<AttributeMap> for FarcasterUserData { impl TryFrom<AttributeMap> for FarcasterUserData {

type Error = DBItemError; type Error = DBItemError;

fn try_from(mut attrs: AttributeMap) -> Result<Self, Self::Error> { fn try_from(mut attrs: AttributeMap) -> Result<Self, Self::Error> {

Show All 28 Lines

View Options

native/cpp/CommonCpp/_generated/commJSI-generated.cpp

use std::collections::HashMap; use std::collections::HashMap;

use comm_lib::aws::ddb::types::AttributeValue; use comm_lib::aws::ddb::types::AttributeValue;

use comm_lib::aws::ddb::types::ReturnValue;

use comm_lib::database::AttributeExtractor; use comm_lib::database::AttributeExtractor;

use comm_lib::database::AttributeMap; use comm_lib::database::AttributeMap;

use comm_lib::database::DBItemAttributeError; use comm_lib::database::DBItemAttributeError;

use comm_lib::database::DBItemError; use comm_lib::database::DBItemError;

use comm_lib::database::TryFromAttribute; use comm_lib::database::TryFromAttribute;

use comm_lib::database::Value; use comm_lib::database::Value;

use tracing::error; use tracing::error;

▲ Show 20 Lines • Show All 47 Lines • ▼ Show 20 Lines ) -> Result<Vec<FarcasterUserData>, Error> {

Ok(users) Ok(users)

} }

pub async fn add_farcaster_id( pub async fn add_farcaster_id(

&self, &self,

user_id: String, user_id: String,

farcaster_id: String, farcaster_id: String,

) -> Result<(), Error> { ) -> Result<(), Error> {

let update_expression = let update_expression = format!(

format!("SET {} = :val", USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME); "SET {} = if_not_exists({}, :val)",

let expression_attribute_values = USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME,

HashMap::from([(":val".to_string(), AttributeValue::S(farcaster_id))]); USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME

);

bartekUnsubmitted

Not Done

) -> Result<(), Error> {

let update_expression = format!(

- "SET {} = if_not_exists({}, :val)",

+ "SET {0} = if_not_exists({0}, :val)",

USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME,

- USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME

);

let expression_attribute_values = HashMap::from([(

You don't have to provide the same value twice

bartek: You don't have to provide the same value twice

let expression_attribute_values = HashMap::from([(

":val".to_string(),

AttributeValue::S(farcaster_id.clone()),

)]);

self let response = self

.client .client

.update_item() .update_item()

.table_name(USERS_TABLE) .table_name(USERS_TABLE)

.key(USERS_TABLE_PARTITION_KEY, AttributeValue::S(user_id)) .key(USERS_TABLE_PARTITION_KEY, AttributeValue::S(user_id))

.update_expression(update_expression) .update_expression(update_expression)

.set_expression_attribute_values(Some(expression_attribute_values)) .set_expression_attribute_values(Some(expression_attribute_values))

.return_values(ReturnValue::UpdatedNew)

.send() .send()

.await .await

.map_err(|e| Error::AwsSdk(e.into()))?; .map_err(|e| Error::AwsSdk(e.into()))?;

bartekUnsubmitted

Not Done

Does UpdateExpression if_not_exists fail the operation if given value already exists? The docs don't say this explicitly, but I guess

if_not_exists (path, value)

If the item does not contain an attribute at the specified path, if_not_exists evaluates to value; otherwise, it evaluates to path.

means that if the ID already exists, the expression evaluates to SET farcasterID = farcasterID so it's a no-op.

According to your test plan, it succeeds so it's alright

bartek: Does `UpdateExpression` `if_not_exists` fail the operation if given value already exists?

varunAuthorUnsubmitted

Done

yeah i checked and it succeeds so assuming DDB treats it as a no-op

varun: yeah i checked and it succeeds so assuming DDB treats it as a no-op

match response.attributes {

None => return Err(Error::MissingItem),

Some(mut attrs) => {

let farcaster_id_from_table: String =

attrs.take_attr(USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME)?;

if farcaster_id_from_table != farcaster_id {

return Err(Error::CannotOverwrite);

}

Ok(()) Ok(())

} }

impl TryFrom<AttributeMap> for FarcasterUserData { impl TryFrom<AttributeMap> for FarcasterUserData {

type Error = DBItemError; type Error = DBItemError;

fn try_from(mut attrs: AttributeMap) -> Result<Self, Self::Error> { fn try_from(mut attrs: AttributeMap) -> Result<Self, Self::Error> {

Show All 28 Lines

View Options

native/cpp/CommonCpp/_generated/commJSI.h

use std::collections::HashMap; use std::collections::HashMap;

use comm_lib::aws::ddb::types::AttributeValue; use comm_lib::aws::ddb::types::AttributeValue;

use comm_lib::aws::ddb::types::ReturnValue;

use comm_lib::database::AttributeExtractor; use comm_lib::database::AttributeExtractor;

use comm_lib::database::AttributeMap; use comm_lib::database::AttributeMap;

use comm_lib::database::DBItemAttributeError; use comm_lib::database::DBItemAttributeError;

use comm_lib::database::DBItemError; use comm_lib::database::DBItemError;

use comm_lib::database::TryFromAttribute; use comm_lib::database::TryFromAttribute;

use comm_lib::database::Value; use comm_lib::database::Value;

use tracing::error; use tracing::error;

▲ Show 20 Lines • Show All 47 Lines • ▼ Show 20 Lines ) -> Result<Vec<FarcasterUserData>, Error> {

Ok(users) Ok(users)

} }

pub async fn add_farcaster_id( pub async fn add_farcaster_id(

&self, &self,

user_id: String, user_id: String,

farcaster_id: String, farcaster_id: String,

) -> Result<(), Error> { ) -> Result<(), Error> {

let update_expression = let update_expression = format!(

format!("SET {} = :val", USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME); "SET {} = if_not_exists({}, :val)",

let expression_attribute_values = USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME,

HashMap::from([(":val".to_string(), AttributeValue::S(farcaster_id))]); USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME

);

bartekUnsubmitted

Not Done

) -> Result<(), Error> {

let update_expression = format!(

- "SET {} = if_not_exists({}, :val)",

+ "SET {0} = if_not_exists({0}, :val)",

USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME,

- USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME

);

let expression_attribute_values = HashMap::from([(

You don't have to provide the same value twice

bartek: You don't have to provide the same value twice

let expression_attribute_values = HashMap::from([(

":val".to_string(),

AttributeValue::S(farcaster_id.clone()),

)]);

self let response = self

.client .client

.update_item() .update_item()

.table_name(USERS_TABLE) .table_name(USERS_TABLE)

.key(USERS_TABLE_PARTITION_KEY, AttributeValue::S(user_id)) .key(USERS_TABLE_PARTITION_KEY, AttributeValue::S(user_id))

.update_expression(update_expression) .update_expression(update_expression)

.set_expression_attribute_values(Some(expression_attribute_values)) .set_expression_attribute_values(Some(expression_attribute_values))

.return_values(ReturnValue::UpdatedNew)

.send() .send()

.await .await

.map_err(|e| Error::AwsSdk(e.into()))?; .map_err(|e| Error::AwsSdk(e.into()))?;

bartekUnsubmitted

Not Done

Does UpdateExpression if_not_exists fail the operation if given value already exists? The docs don't say this explicitly, but I guess

if_not_exists (path, value)

If the item does not contain an attribute at the specified path, if_not_exists evaluates to value; otherwise, it evaluates to path.

means that if the ID already exists, the expression evaluates to SET farcasterID = farcasterID so it's a no-op.

According to your test plan, it succeeds so it's alright

bartek: Does `UpdateExpression` `if_not_exists` fail the operation if given value already exists?

varunAuthorUnsubmitted

Done

yeah i checked and it succeeds so assuming DDB treats it as a no-op

varun: yeah i checked and it succeeds so assuming DDB treats it as a no-op

match response.attributes {

None => return Err(Error::MissingItem),

Some(mut attrs) => {

let farcaster_id_from_table: String =

attrs.take_attr(USERS_TABLE_FARCASTER_ID_ATTRIBUTE_NAME)?;

if farcaster_id_from_table != farcaster_id {

return Err(Error::CannotOverwrite);

}

Ok(()) Ok(())

} }

impl TryFrom<AttributeMap> for FarcasterUserData { impl TryFrom<AttributeMap> for FarcasterUserData {

type Error = DBItemError; type Error = DBItemError;

fn try_from(mut attrs: AttributeMap) -> Result<Self, Self::Error> { fn try_from(mut attrs: AttributeMap) -> Result<Self, Self::Error> {

Show All 28 Lines

View Options

native/native_rust_library/src/backup.rs

View Options

native/native_rust_library/src/lib.rs

View Options

native/schema/CommCoreModuleSchema.js

[native] Expose backup ct1 and ct2 functions to JSClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 38256

native/cpp/CommonCpp/NativeModules/CommCoreModule.h

native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp

native/cpp/CommonCpp/_generated/commJSI-generated.cpp

native/cpp/CommonCpp/_generated/commJSI.h

native/native_rust_library/src/backup.rs

native/native_rust_library/src/lib.rs

native/schema/CommCoreModuleSchema.js

[native] Expose backup ct1 and ct2 functions to JS
ClosedPublic
Actions

Revision Contents
Changeset List