Page Menu
Home
Phorge
Search
Configure Global Search
Log In
Files
F33320488
D7198.1768843198.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Size
6 KB
Referenced Files
None
Subscribers
None
D7198.1768843198.diff
View Options
diff --git a/native/native_rust_library/src/identity_client.rs b/native/native_rust_library/src/identity_client.rs
--- a/native/native_rust_library/src/identity_client.rs
+++ b/native/native_rust_library/src/identity_client.rs
@@ -4,29 +4,49 @@
pub async fn register_user(
mut _client: Box<IdentityClient>,
- _user_id: String,
- _signing_public_key: String,
_username: String,
_password: String,
+ _key_payload: String,
+ _key_payload_signature: String,
+ _identity_prekey: String,
+ _identity_prekey_signature: String,
+ _notif_prekey: String,
+ _notif_prekey_signature: String,
+ _identity_onetime_keys: Vec<String>,
+ _notif_onetime_keys: Vec<String>,
) -> Result<String, Status> {
unimplemented!();
}
+// User could be logging in from new device, need to resend device information
pub async fn login_user_pake(
mut _client: Box<IdentityClient>,
- _user_id: String,
- _signing_public_key: String,
+ _username: String,
_password: String,
+ _key_payload: String,
+ _key_payload_signature: String,
+ _identity_prekey: String,
+ _identity_prekey_signature: String,
+ _notif_prekey: String,
+ _notif_prekey_signature: String,
+ _identity_onetime_keys: Vec<String>,
+ _notif_onetime_keys: Vec<String>,
) -> Result<String, Status> {
unimplemented!();
}
pub async fn login_user_wallet(
mut _client: Box<IdentityClient>,
- _user_id: String,
- _signing_public_key: String,
_siwe_message: String,
_siwe_signature: String,
+ _key_payload: String,
+ _key_payload_signature: String,
+ _identity_prekey: String,
+ _identity_prekey_signature: String,
+ _notif_prekey: String,
+ _notif_prekey_signature: String,
+ _identity_onetime_keys: Vec<String>,
+ _notif_onetime_keys: Vec<String>,
) -> Result<String, Status> {
unimplemented!();
}
diff --git a/native/native_rust_library/src/lib.rs b/native/native_rust_library/src/lib.rs
--- a/native/native_rust_library/src/lib.rs
+++ b/native/native_rust_library/src/lib.rs
@@ -47,27 +47,46 @@
#[cxx_name = "identityRegisterUserBlocking"]
fn identity_register_user_blocking(
client: Box<IdentityClient>,
- user_id: String,
- signing_public_key: String,
username: String,
password: String,
+ key_payload: String,
+ key_payload_signature: String,
+ identity_prekey: String,
+ identity_prekey_signature: String,
+ notif_prekey: String,
+ notif_prekey_signature: String,
+ identity_onetime_keys: Vec<String>,
+ notif_onetime_keys: Vec<String>,
) -> Result<String>;
#[cxx_name = "identityLoginUserPakeBlocking"]
fn identity_login_user_pake_blocking(
client: Box<IdentityClient>,
- user_id: String,
- signing_public_key: String,
+ username: String,
password: String,
+ key_payload: String,
+ key_payload_signature: String,
+ identity_prekey: String,
+ identity_prekey_signature: String,
+ notif_prekey: String,
+ notif_prekey_signature: String,
+ identity_onetime_keys: Vec<String>,
+ notif_onetime_keys: Vec<String>,
) -> Result<String>;
#[cxx_name = "identityLoginUserWalletBlocking"]
fn identity_login_user_wallet_blocking(
client: Box<IdentityClient>,
- user_id: String,
- signing_public_key: String,
siwe_message: String,
siwe_signature: String,
+ key_payload: String,
+ key_payload_signature: String,
+ identity_prekey: String,
+ identity_prekey_signature: String,
+ notif_prekey: String,
+ notif_prekey_signature: String,
+ identity_onetime_keys: Vec<String>,
+ notif_onetime_keys: Vec<String>,
) -> Result<String>;
// Tunnelbroker Service Client
@@ -97,49 +116,87 @@
#[instrument]
fn identity_register_user_blocking(
client: Box<IdentityClient>,
- user_id: String,
- signing_public_key: String,
username: String,
password: String,
+ key_payload: String,
+ key_payload_signature: String,
+ identity_prekey: String,
+ identity_prekey_signature: String,
+ notif_prekey: String,
+ notif_prekey_signature: String,
+ identity_onetime_keys: Vec<String>,
+ notif_onetime_keys: Vec<String>,
) -> Result<String, Status> {
RUNTIME.block_on(identity_client::register_user(
client,
- user_id,
- signing_public_key,
username,
password,
+ key_payload,
+ key_payload_signature,
+ identity_prekey,
+ identity_prekey_signature,
+ notif_prekey,
+ notif_prekey_signature,
+ identity_onetime_keys,
+ notif_onetime_keys,
))
}
#[instrument]
fn identity_login_user_pake_blocking(
client: Box<IdentityClient>,
- user_id: String,
- signing_public_key: String,
+ username: String,
password: String,
+ key_payload: String,
+ key_payload_signature: String,
+ identity_prekey: String,
+ identity_prekey_signature: String,
+ notif_prekey: String,
+ notif_prekey_signature: String,
+ identity_onetime_keys: Vec<String>,
+ notif_onetime_keys: Vec<String>,
) -> Result<String, Status> {
RUNTIME.block_on(identity_client::login_user_pake(
client,
- user_id,
- signing_public_key,
+ username,
password,
+ key_payload,
+ key_payload_signature,
+ identity_prekey,
+ identity_prekey_signature,
+ notif_prekey,
+ notif_prekey_signature,
+ identity_onetime_keys,
+ notif_onetime_keys,
))
}
#[instrument]
fn identity_login_user_wallet_blocking(
client: Box<IdentityClient>,
- user_id: String,
- signing_public_key: String,
siwe_message: String,
siwe_signature: String,
+ key_payload: String,
+ key_payload_signature: String,
+ identity_prekey: String,
+ identity_prekey_signature: String,
+ notif_prekey: String,
+ notif_prekey_signature: String,
+ identity_onetime_keys: Vec<String>,
+ notif_onetime_keys: Vec<String>,
) -> Result<String, Status> {
RUNTIME.block_on(identity_client::login_user_wallet(
client,
- user_id,
- signing_public_key,
siwe_message,
siwe_signature,
+ key_payload,
+ key_payload_signature,
+ identity_prekey,
+ identity_prekey_signature,
+ notif_prekey,
+ notif_prekey_signature,
+ identity_onetime_keys,
+ notif_onetime_keys,
))
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Jan 19, 5:19 PM (12 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5957461
Default Alt Text
D7198.1768843198.diff (6 KB)
Attached To
Mode
D7198: [Native] Update native_rust_library ffi to reflect client gRPC
Attached
Detach File
Event Timeline
Log In to Comment