Page MenuHomePhabricator
Differential D11609

[lib] Narrow `TraditionalRelationshipRequest` to exclude 'farcaster' action
ClosedPublic
Actions

Authored by atul on Apr 9 2024, 9:41 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Apr 6, 8:58 AM
Unknown Object (File)
Mar 8 2025, 2:16 PM
Unknown Object (File)
Mar 8 2025, 2:16 PM
Unknown Object (File)
Mar 8 2025, 2:16 PM
Unknown Object (File)
Mar 8 2025, 2:15 PM
Unknown Object (File)
Mar 8 2025, 2:15 PM
Unknown Object (File)
Mar 8 2025, 2:15 PM
Unknown Object (File)
Mar 8 2025, 2:15 PM
View All Files
Subscribers
ashoat

Details

Reviewers
ginsu
tomek
will
varun
Commits
rCOMM1638313148ad: [lib] Narrow `TraditionalRelationshipRequest` to exclude 'farcaster' action
Summary

Narrow TraditionalRelationshipRequest to exclude 'farcaster' action and make necessary changes across native/web client.

Will update validators/keyserver in subsequent diffs.

Depends on D11607

Test Plan

flow + validators will be tested in subsequent diffs.

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

atul created this revision.Apr 9 2024, 9:41 PM
Herald added a subscriber: ashoat. · View Herald TranscriptApr 9 2024, 9:41 PM
atul added a child revision: D11610: [keyserver] Narrow `updateRelationshipInputValidator` to exclude `farcaster` action.Apr 9 2024, 9:53 PM
Harbormaster completed remote builds in B28111: Diff 38967.Apr 9 2024, 9:57 PM
atul requested review of this revision.Apr 9 2024, 9:57 PM
tomek accepted this revision.Apr 10 2024, 6:51 AM
tomek added inline comments.
lib/hooks/relationship-prompt.js
12–13 ↗(On Diff #38967)

Can we merge these imports?

This revision is now accepted and ready to land.Apr 10 2024, 6:51 AM
atul added inline comments.Apr 10 2024, 12:20 PM
lib/hooks/relationship-prompt.js
12–13 ↗(On Diff #38967)

Ah yeah, thanks for catching that

atul updated this revision to Diff 39006.Apr 10 2024, 12:20 PM

address @tomek's feedback

Harbormaster completed remote builds in B28138: Diff 39006.Apr 10 2024, 12:38 PM
atul added a comment.Apr 17 2024, 12:13 PM

This diff is safe to land since we're just narrowing flow types on the clients. No runtime changes so this shouldn't break anything.

atul updated this revision to Diff 39196.Apr 17 2024, 12:15 PM

rebase and land

atul added a comment.Apr 17 2024, 12:24 PM

JK, we need D11606 to land this

0ed33c.png (1×1 px, 606 KB)

Harbormaster failed remote builds in B28274: Diff 39196!Apr 17 2024, 12:28 PM
atul updated this revision to Diff 39249.Apr 18 2024, 1:20 PM

rebase and land

This revision was landed with ongoing or failed builds.Apr 18 2024, 1:26 PM
Closed by commit rCOMM1638313148ad: [lib] Narrow `TraditionalRelationshipRequest` to exclude 'farcaster' action (authored by atul). · Explain Why
This revision was automatically updated to reflect the committed changes.
atul added a commit: rCOMM1638313148ad: [lib] Narrow `TraditionalRelationshipRequest` to exclude 'farcaster' action.
Harbormaster completed remote builds in B28308: Diff 39249.Apr 18 2024, 1:46 PM

Revision Contents
Changeset List

PathSize
lib/
hooks/
6 lines
shared/
4 lines
types/
2 lines
native/
chat/
settings/
4 lines
profile/
6 lines
web/
settings/
relationship/
4 lines

Diff 39006

View Options

lib/hooks/relationship-prompt.js

Show All 12 Lines
use lazy_static::lazy_static; use lazy_static::lazy_static;
use serde::Serialize; use serde::Serialize;
use std::sync::Arc; use std::sync::Arc;
use tokio::runtime::{Builder, Runtime}; use tokio::runtime::{Builder, Runtime};
use tonic::Status; use tonic::Status;
use tracing::instrument; use tracing::instrument;
mod argon2_tools; mod argon2_tools;
mod backup;
mod constants; mod constants;
use argon2_tools::compute_backup_key_str; use argon2_tools::compute_backup_key_str;
mod generated { mod generated {
// We get the CODE_VERSION from this generated file // We get the CODE_VERSION from this generated file
include!(concat!(env!("OUT_DIR"), "/version.rs")); include!(concat!(env!("OUT_DIR"), "/version.rs"));
} }
Show All 11 Lines Builder::new_multi_thread()
.worker_threads(1) .worker_threads(1)
.max_blocking_threads(1) .max_blocking_threads(1)
.enable_all() .enable_all()
.build() .build()
.unwrap() .unwrap()
); );
} }
use backup::ffi::*;
#[cxx::bridge] #[cxx::bridge]
mod ffi { mod ffi {
extern "Rust" { extern "Rust" {
#[cxx_name = "identityRegisterUser"] #[cxx_name = "identityRegisterUser"]
fn register_user( fn register_user(
username: String, username: String,
password: String, password: String,
▲ Show 20 Lines • Show All 117 Lines • ▼ Show 20 Lines unsafe extern "C++" {
#[allow(unused)] #[allow(unused)]
#[cxx_name = "aesDecrypt"] #[cxx_name = "aesDecrypt"]
fn decrypt( fn decrypt(
key: &mut [u8], key: &mut [u8],
sealed_data: &mut [u8], sealed_data: &mut [u8],
plaintext: &mut [u8], plaintext: &mut [u8],
) -> Result<()>; ) -> Result<()>;
} }
// Backup
extern "Rust" {
#[cxx_name = "createBackup"]
fn create_backup_sync(
backup_id: String,
backup_secret: String,
pickle_key: String,
pickled_account: String,
user_data: String,
promise_id: u32,
);
#[cxx_name = "restoreBackup"]
fn restore_backup_sync(
backup_id: String,
backup_secret: String,
encrypted_user_keys: String,
encrypted_user_data: String,
promise_id: u32,
);
}
} }
fn handle_string_result_as_callback<E>( fn handle_string_result_as_callback<E>(
result: Result<String, E>, result: Result<String, E>,
promise_id: u32, promise_id: u32,
) where ) where
E: std::fmt::Display, E: std::fmt::Display,
{ {
▲ Show 20 Lines • Show All 634 Lines • Show Last 20 Lines
View Options

lib/shared/relationship-utils.js

Show All 12 Lines
use lazy_static::lazy_static; use lazy_static::lazy_static;
use serde::Serialize; use serde::Serialize;
use std::sync::Arc; use std::sync::Arc;
use tokio::runtime::{Builder, Runtime}; use tokio::runtime::{Builder, Runtime};
use tonic::Status; use tonic::Status;
use tracing::instrument; use tracing::instrument;
mod argon2_tools; mod argon2_tools;
mod backup;
mod constants; mod constants;
use argon2_tools::compute_backup_key_str; use argon2_tools::compute_backup_key_str;
mod generated { mod generated {
// We get the CODE_VERSION from this generated file // We get the CODE_VERSION from this generated file
include!(concat!(env!("OUT_DIR"), "/version.rs")); include!(concat!(env!("OUT_DIR"), "/version.rs"));
} }
Show All 11 Lines Builder::new_multi_thread()
.worker_threads(1) .worker_threads(1)
.max_blocking_threads(1) .max_blocking_threads(1)
.enable_all() .enable_all()
.build() .build()
.unwrap() .unwrap()
); );
} }
use backup::ffi::*;
#[cxx::bridge] #[cxx::bridge]
mod ffi { mod ffi {
extern "Rust" { extern "Rust" {
#[cxx_name = "identityRegisterUser"] #[cxx_name = "identityRegisterUser"]
fn register_user( fn register_user(
username: String, username: String,
password: String, password: String,
▲ Show 20 Lines • Show All 117 Lines • ▼ Show 20 Lines unsafe extern "C++" {
#[allow(unused)] #[allow(unused)]
#[cxx_name = "aesDecrypt"] #[cxx_name = "aesDecrypt"]
fn decrypt( fn decrypt(
key: &mut [u8], key: &mut [u8],
sealed_data: &mut [u8], sealed_data: &mut [u8],
plaintext: &mut [u8], plaintext: &mut [u8],
) -> Result<()>; ) -> Result<()>;
} }
// Backup
extern "Rust" {
#[cxx_name = "createBackup"]
fn create_backup_sync(
backup_id: String,
backup_secret: String,
pickle_key: String,
pickled_account: String,
user_data: String,
promise_id: u32,
);
#[cxx_name = "restoreBackup"]
fn restore_backup_sync(
backup_id: String,
backup_secret: String,
encrypted_user_keys: String,
encrypted_user_data: String,
promise_id: u32,
);
}
} }
fn handle_string_result_as_callback<E>( fn handle_string_result_as_callback<E>(
result: Result<String, E>, result: Result<String, E>,
promise_id: u32, promise_id: u32,
) where ) where
E: std::fmt::Display, E: std::fmt::Display,
{ {
▲ Show 20 Lines • Show All 634 Lines • Show Last 20 Lines
View Options

lib/types/relationship-types.js

Show All 12 Lines
use lazy_static::lazy_static; use lazy_static::lazy_static;
use serde::Serialize; use serde::Serialize;
use std::sync::Arc; use std::sync::Arc;
use tokio::runtime::{Builder, Runtime}; use tokio::runtime::{Builder, Runtime};
use tonic::Status; use tonic::Status;
use tracing::instrument; use tracing::instrument;
mod argon2_tools; mod argon2_tools;
mod backup;
mod constants; mod constants;
use argon2_tools::compute_backup_key_str; use argon2_tools::compute_backup_key_str;
mod generated { mod generated {
// We get the CODE_VERSION from this generated file // We get the CODE_VERSION from this generated file
include!(concat!(env!("OUT_DIR"), "/version.rs")); include!(concat!(env!("OUT_DIR"), "/version.rs"));
} }
Show All 11 Lines Builder::new_multi_thread()
.worker_threads(1) .worker_threads(1)
.max_blocking_threads(1) .max_blocking_threads(1)
.enable_all() .enable_all()
.build() .build()
.unwrap() .unwrap()
); );
} }
use backup::ffi::*;
#[cxx::bridge] #[cxx::bridge]
mod ffi { mod ffi {
extern "Rust" { extern "Rust" {
#[cxx_name = "identityRegisterUser"] #[cxx_name = "identityRegisterUser"]
fn register_user( fn register_user(
username: String, username: String,
password: String, password: String,
▲ Show 20 Lines • Show All 117 Lines • ▼ Show 20 Lines unsafe extern "C++" {
#[allow(unused)] #[allow(unused)]
#[cxx_name = "aesDecrypt"] #[cxx_name = "aesDecrypt"]
fn decrypt( fn decrypt(
key: &mut [u8], key: &mut [u8],
sealed_data: &mut [u8], sealed_data: &mut [u8],
plaintext: &mut [u8], plaintext: &mut [u8],
) -> Result<()>; ) -> Result<()>;
} }
// Backup
extern "Rust" {
#[cxx_name = "createBackup"]
fn create_backup_sync(
backup_id: String,
backup_secret: String,
pickle_key: String,
pickled_account: String,
user_data: String,
promise_id: u32,
);
#[cxx_name = "restoreBackup"]
fn restore_backup_sync(
backup_id: String,
backup_secret: String,
encrypted_user_keys: String,
encrypted_user_data: String,
promise_id: u32,
);
}
} }
fn handle_string_result_as_callback<E>( fn handle_string_result_as_callback<E>(
result: Result<String, E>, result: Result<String, E>,
promise_id: u32, promise_id: u32,
) where ) where
E: std::fmt::Display, E: std::fmt::Display,
{ {
▲ Show 20 Lines • Show All 634 Lines • Show Last 20 Lines
View Options

native/chat/settings/thread-settings-edit-relationship.react.js

Show All 12 Lines
use lazy_static::lazy_static; use lazy_static::lazy_static;
use serde::Serialize; use serde::Serialize;
use std::sync::Arc; use std::sync::Arc;
use tokio::runtime::{Builder, Runtime}; use tokio::runtime::{Builder, Runtime};
use tonic::Status; use tonic::Status;
use tracing::instrument; use tracing::instrument;
mod argon2_tools; mod argon2_tools;
mod backup;
mod constants; mod constants;
use argon2_tools::compute_backup_key_str; use argon2_tools::compute_backup_key_str;
mod generated { mod generated {
// We get the CODE_VERSION from this generated file // We get the CODE_VERSION from this generated file
include!(concat!(env!("OUT_DIR"), "/version.rs")); include!(concat!(env!("OUT_DIR"), "/version.rs"));
} }
Show All 11 Lines Builder::new_multi_thread()
.worker_threads(1) .worker_threads(1)
.max_blocking_threads(1) .max_blocking_threads(1)
.enable_all() .enable_all()
.build() .build()
.unwrap() .unwrap()
); );
} }
use backup::ffi::*;
#[cxx::bridge] #[cxx::bridge]
mod ffi { mod ffi {
extern "Rust" { extern "Rust" {
#[cxx_name = "identityRegisterUser"] #[cxx_name = "identityRegisterUser"]
fn register_user( fn register_user(
username: String, username: String,
password: String, password: String,
▲ Show 20 Lines • Show All 117 Lines • ▼ Show 20 Lines unsafe extern "C++" {
#[allow(unused)] #[allow(unused)]
#[cxx_name = "aesDecrypt"] #[cxx_name = "aesDecrypt"]
fn decrypt( fn decrypt(
key: &mut [u8], key: &mut [u8],
sealed_data: &mut [u8], sealed_data: &mut [u8],
plaintext: &mut [u8], plaintext: &mut [u8],
) -> Result<()>; ) -> Result<()>;
} }
// Backup
extern "Rust" {
#[cxx_name = "createBackup"]
fn create_backup_sync(
backup_id: String,
backup_secret: String,
pickle_key: String,
pickled_account: String,
user_data: String,
promise_id: u32,
);
#[cxx_name = "restoreBackup"]
fn restore_backup_sync(
backup_id: String,
backup_secret: String,
encrypted_user_keys: String,
encrypted_user_data: String,
promise_id: u32,
);
}
} }
fn handle_string_result_as_callback<E>( fn handle_string_result_as_callback<E>(
result: Result<String, E>, result: Result<String, E>,
promise_id: u32, promise_id: u32,
) where ) where
E: std::fmt::Display, E: std::fmt::Display,
{ {
▲ Show 20 Lines • Show All 634 Lines • Show Last 20 Lines
View Options

native/profile/relationship-list-item.react.js

Show All 12 Lines
use lazy_static::lazy_static; use lazy_static::lazy_static;
use serde::Serialize; use serde::Serialize;
use std::sync::Arc; use std::sync::Arc;
use tokio::runtime::{Builder, Runtime}; use tokio::runtime::{Builder, Runtime};
use tonic::Status; use tonic::Status;
use tracing::instrument; use tracing::instrument;
mod argon2_tools; mod argon2_tools;
mod backup;
mod constants; mod constants;
use argon2_tools::compute_backup_key_str; use argon2_tools::compute_backup_key_str;
mod generated { mod generated {
// We get the CODE_VERSION from this generated file // We get the CODE_VERSION from this generated file
include!(concat!(env!("OUT_DIR"), "/version.rs")); include!(concat!(env!("OUT_DIR"), "/version.rs"));
} }
Show All 11 Lines Builder::new_multi_thread()
.worker_threads(1) .worker_threads(1)
.max_blocking_threads(1) .max_blocking_threads(1)
.enable_all() .enable_all()
.build() .build()
.unwrap() .unwrap()
); );
} }
use backup::ffi::*;
#[cxx::bridge] #[cxx::bridge]
mod ffi { mod ffi {
extern "Rust" { extern "Rust" {
#[cxx_name = "identityRegisterUser"] #[cxx_name = "identityRegisterUser"]
fn register_user( fn register_user(
username: String, username: String,
password: String, password: String,
▲ Show 20 Lines • Show All 117 Lines • ▼ Show 20 Lines unsafe extern "C++" {
#[allow(unused)] #[allow(unused)]
#[cxx_name = "aesDecrypt"] #[cxx_name = "aesDecrypt"]
fn decrypt( fn decrypt(
key: &mut [u8], key: &mut [u8],
sealed_data: &mut [u8], sealed_data: &mut [u8],
plaintext: &mut [u8], plaintext: &mut [u8],
) -> Result<()>; ) -> Result<()>;
} }
// Backup
extern "Rust" {
#[cxx_name = "createBackup"]
fn create_backup_sync(
backup_id: String,
backup_secret: String,
pickle_key: String,
pickled_account: String,
user_data: String,
promise_id: u32,
);
#[cxx_name = "restoreBackup"]
fn restore_backup_sync(
backup_id: String,
backup_secret: String,
encrypted_user_keys: String,
encrypted_user_data: String,
promise_id: u32,
);
}
} }
fn handle_string_result_as_callback<E>( fn handle_string_result_as_callback<E>(
result: Result<String, E>, result: Result<String, E>,
promise_id: u32, promise_id: u32,
) where ) where
E: std::fmt::Display, E: std::fmt::Display,
{ {
▲ Show 20 Lines • Show All 634 Lines • Show Last 20 Lines
View Options

web/settings/relationship/add-users-list-modal.react.js

Show All 12 Lines
use lazy_static::lazy_static; use lazy_static::lazy_static;
use serde::Serialize; use serde::Serialize;
use std::sync::Arc; use std::sync::Arc;
use tokio::runtime::{Builder, Runtime}; use tokio::runtime::{Builder, Runtime};
use tonic::Status; use tonic::Status;
use tracing::instrument; use tracing::instrument;
mod argon2_tools; mod argon2_tools;
mod backup;
mod constants; mod constants;
use argon2_tools::compute_backup_key_str; use argon2_tools::compute_backup_key_str;
mod generated { mod generated {
// We get the CODE_VERSION from this generated file // We get the CODE_VERSION from this generated file
include!(concat!(env!("OUT_DIR"), "/version.rs")); include!(concat!(env!("OUT_DIR"), "/version.rs"));
} }
Show All 11 Lines Builder::new_multi_thread()
.worker_threads(1) .worker_threads(1)
.max_blocking_threads(1) .max_blocking_threads(1)
.enable_all() .enable_all()
.build() .build()
.unwrap() .unwrap()
); );
} }
use backup::ffi::*;
#[cxx::bridge] #[cxx::bridge]
mod ffi { mod ffi {
extern "Rust" { extern "Rust" {
#[cxx_name = "identityRegisterUser"] #[cxx_name = "identityRegisterUser"]
fn register_user( fn register_user(
username: String, username: String,
password: String, password: String,
▲ Show 20 Lines • Show All 117 Lines • ▼ Show 20 Lines unsafe extern "C++" {
#[allow(unused)] #[allow(unused)]
#[cxx_name = "aesDecrypt"] #[cxx_name = "aesDecrypt"]
fn decrypt( fn decrypt(
key: &mut [u8], key: &mut [u8],
sealed_data: &mut [u8], sealed_data: &mut [u8],
plaintext: &mut [u8], plaintext: &mut [u8],
) -> Result<()>; ) -> Result<()>;
} }
// Backup
extern "Rust" {
#[cxx_name = "createBackup"]
fn create_backup_sync(
backup_id: String,
backup_secret: String,
pickle_key: String,
pickled_account: String,
user_data: String,
promise_id: u32,
);
#[cxx_name = "restoreBackup"]
fn restore_backup_sync(
backup_id: String,
backup_secret: String,
encrypted_user_keys: String,
encrypted_user_data: String,
promise_id: u32,
);
}
} }
fn handle_string_result_as_callback<E>( fn handle_string_result_as_callback<E>(
result: Result<String, E>, result: Result<String, E>,
promise_id: u32, promise_id: u32,
) where ) where
E: std::fmt::Display, E: std::fmt::Display,
{ {
▲ Show 20 Lines • Show All 634 Lines • Show Last 20 Lines