diff --git a/native/cpp/CommonCpp/NativeModules/CommRustModule.h b/native/cpp/CommonCpp/NativeModules/CommRustModule.h --- a/native/cpp/CommonCpp/NativeModules/CommRustModule.h +++ b/native/cpp/CommonCpp/NativeModules/CommRustModule.h @@ -82,8 +82,8 @@ virtual jsi::Value restoreUser( jsi::Runtime &rt, jsi::String userID, - std::optional siweMessage, - std::optional siweSignature, + std::optional siweSocialProofMessage, + std::optional siweSocialProofSignature, jsi::String keyPayload, jsi::String keyPayloadSignature, jsi::String contentPrekey, diff --git a/native/cpp/CommonCpp/NativeModules/CommRustModule.cpp b/native/cpp/CommonCpp/NativeModules/CommRustModule.cpp --- a/native/cpp/CommonCpp/NativeModules/CommRustModule.cpp +++ b/native/cpp/CommonCpp/NativeModules/CommRustModule.cpp @@ -320,8 +320,8 @@ jsi::Value CommRustModule::restoreUser( jsi::Runtime &rt, jsi::String userID, - std::optional siweMessage, - std::optional siweSignature, + std::optional siweSocialProofMessage, + std::optional siweSocialProofSignature, jsi::String keyPayload, jsi::String keyPayloadSignature, jsi::String contentPrekey, @@ -331,13 +331,15 @@ jsi::Array contentOneTimeKeys, jsi::Array notifOneTimeKeys, jsi::String deviceList) { - rust::String siweMessageRust = ""; - if (siweMessage.has_value()) { - siweMessageRust = jsiStringToRustString(siweMessage.value(), rt); + rust::String siweSocialProofMessageRust = ""; + if (siweSocialProofMessage.has_value()) { + siweSocialProofMessageRust = + jsiStringToRustString(siweSocialProofMessage.value(), rt); } - rust::String siweSignatureRust = ""; - if (siweSignature.has_value()) { - siweSignatureRust = jsiStringToRustString(siweSignature.value(), rt); + rust::String siweSocialProofSignatureRust = ""; + if (siweSocialProofSignature.has_value()) { + siweSocialProofSignatureRust = + jsiStringToRustString(siweSocialProofSignature.value(), rt); } auto userIDRust = jsiStringToRustString(userID, rt); auto keyPayloadRust = jsiStringToRustString(keyPayload, rt); @@ -360,8 +362,8 @@ {promise, this->jsInvoker_, innerRt}); identityRestoreUser( userIDRust, - siweMessageRust, - siweSignatureRust, + siweSocialProofMessageRust, + siweSocialProofSignatureRust, keyPayloadRust, keyPayloadSignatureRust, contentPrekeyRust, diff --git a/native/cpp/CommonCpp/_generated/rustJSI.h b/native/cpp/CommonCpp/_generated/rustJSI.h --- a/native/cpp/CommonCpp/_generated/rustJSI.h +++ b/native/cpp/CommonCpp/_generated/rustJSI.h @@ -26,7 +26,7 @@ virtual jsi::Value logInPasswordUser(jsi::Runtime &rt, jsi::String username, jsi::String password, jsi::String keyPayload, jsi::String keyPayloadSignature, jsi::String contentPrekey, jsi::String contentPrekeySignature, jsi::String notifPrekey, jsi::String notifPrekeySignature, jsi::Array contentOneTimeKeys, jsi::Array notifOneTimeKeys) = 0; virtual jsi::Value registerWalletUser(jsi::Runtime &rt, jsi::String siweMessage, jsi::String siweSignature, jsi::String keyPayload, jsi::String keyPayloadSignature, jsi::String contentPrekey, jsi::String contentPrekeySignature, jsi::String notifPrekey, jsi::String notifPrekeySignature, jsi::Array contentOneTimeKeys, jsi::Array notifOneTimeKeys, jsi::String farcasterID, jsi::String initialDeviceList) = 0; virtual jsi::Value logInWalletUser(jsi::Runtime &rt, jsi::String siweMessage, jsi::String siweSignature, jsi::String keyPayload, jsi::String keyPayloadSignature, jsi::String contentPrekey, jsi::String contentPrekeySignature, jsi::String notifPrekey, jsi::String notifPrekeySignature, jsi::Array contentOneTimeKeys, jsi::Array notifOneTimeKeys) = 0; - virtual jsi::Value restoreUser(jsi::Runtime &rt, jsi::String userID, std::optional siweMessage, std::optional siweSignature, jsi::String keyPayload, jsi::String keyPayloadSignature, jsi::String contentPrekey, jsi::String contentPrekeySignature, jsi::String notifPrekey, jsi::String notifPrekeySignature, jsi::Array contentOneTimeKeys, jsi::Array notifOneTimeKeys, jsi::String deviceList) = 0; + virtual jsi::Value restoreUser(jsi::Runtime &rt, jsi::String userID, std::optional siweSocialProofMessage, std::optional siweSocialProofSignature, jsi::String keyPayload, jsi::String keyPayloadSignature, jsi::String contentPrekey, jsi::String contentPrekeySignature, jsi::String notifPrekey, jsi::String notifPrekeySignature, jsi::Array contentOneTimeKeys, jsi::Array notifOneTimeKeys, jsi::String deviceList) = 0; virtual jsi::Value updatePassword(jsi::Runtime &rt, jsi::String userID, jsi::String deviceID, jsi::String accessToken, jsi::String oldPassword, jsi::String newPassword) = 0; virtual jsi::Value deletePasswordUser(jsi::Runtime &rt, jsi::String userID, jsi::String deviceID, jsi::String accessToken, jsi::String password) = 0; virtual jsi::Value deleteWalletUser(jsi::Runtime &rt, jsi::String userID, jsi::String deviceID, jsi::String accessToken) = 0; @@ -119,13 +119,13 @@ return bridging::callFromJs( rt, &T::logInWalletUser, jsInvoker_, instance_, std::move(siweMessage), std::move(siweSignature), std::move(keyPayload), std::move(keyPayloadSignature), std::move(contentPrekey), std::move(contentPrekeySignature), std::move(notifPrekey), std::move(notifPrekeySignature), std::move(contentOneTimeKeys), std::move(notifOneTimeKeys)); } - jsi::Value restoreUser(jsi::Runtime &rt, jsi::String userID, std::optional siweMessage, std::optional siweSignature, jsi::String keyPayload, jsi::String keyPayloadSignature, jsi::String contentPrekey, jsi::String contentPrekeySignature, jsi::String notifPrekey, jsi::String notifPrekeySignature, jsi::Array contentOneTimeKeys, jsi::Array notifOneTimeKeys, jsi::String deviceList) override { + jsi::Value restoreUser(jsi::Runtime &rt, jsi::String userID, std::optional siweSocialProofMessage, std::optional siweSocialProofSignature, jsi::String keyPayload, jsi::String keyPayloadSignature, jsi::String contentPrekey, jsi::String contentPrekeySignature, jsi::String notifPrekey, jsi::String notifPrekeySignature, jsi::Array contentOneTimeKeys, jsi::Array notifOneTimeKeys, jsi::String deviceList) override { static_assert( bridging::getParameterCount(&T::restoreUser) == 13, "Expected restoreUser(...) to have 13 parameters"); return bridging::callFromJs( - rt, &T::restoreUser, jsInvoker_, instance_, std::move(userID), std::move(siweMessage), std::move(siweSignature), std::move(keyPayload), std::move(keyPayloadSignature), std::move(contentPrekey), std::move(contentPrekeySignature), std::move(notifPrekey), std::move(notifPrekeySignature), std::move(contentOneTimeKeys), std::move(notifOneTimeKeys), std::move(deviceList)); + rt, &T::restoreUser, jsInvoker_, instance_, std::move(userID), std::move(siweSocialProofMessage), std::move(siweSocialProofSignature), std::move(keyPayload), std::move(keyPayloadSignature), std::move(contentPrekey), std::move(contentPrekeySignature), std::move(notifPrekey), std::move(notifPrekeySignature), std::move(contentOneTimeKeys), std::move(notifOneTimeKeys), std::move(deviceList)); } jsi::Value updatePassword(jsi::Runtime &rt, jsi::String userID, jsi::String deviceID, jsi::String accessToken, jsi::String oldPassword, jsi::String newPassword) override { static_assert( diff --git a/native/identity-service/identity-service-context-provider.react.js b/native/identity-service/identity-service-context-provider.react.js --- a/native/identity-service/identity-service-context-provider.react.js +++ b/native/identity-service/identity-service-context-provider.react.js @@ -551,8 +551,8 @@ restoreUser: async ( userID: string, deviceList: SignedDeviceList, - siweMessage?: string, - siweSignature?: string, + siweSocialProofMessage?: string, + siweSocialProofSignature?: string, ) => { await commCoreModule.initializeCryptoAccount(); const [ @@ -566,8 +566,8 @@ ]); const restoreResult = await commRustModule.restoreUser( userID, - siweMessage, - siweSignature, + siweSocialProofMessage, + siweSocialProofSignature, blobPayload, signature, prekeys.contentPrekey, diff --git a/native/native_rust_library/src/identity.rs b/native/native_rust_library/src/identity.rs --- a/native/native_rust_library/src/identity.rs +++ b/native/native_rust_library/src/identity.rs @@ -147,8 +147,8 @@ pub struct RestoreUserInfo { pub user_id: String, - pub siwe_message: Option, - pub siwe_signature: Option, + pub siwe_social_proof_message: Option, + pub siwe_social_proof_signature: Option, pub device_keys: DeviceKeys, pub device_list: String, } diff --git a/native/native_rust_library/src/identity/login.rs b/native/native_rust_library/src/identity/login.rs --- a/native/native_rust_library/src/identity/login.rs +++ b/native/native_rust_library/src/identity/login.rs @@ -96,8 +96,8 @@ #[instrument] pub fn restore_user( user_id: String, - siwe_message: String, - siwe_signature: String, + siwe_social_proof_message: String, + siwe_social_proof_signature: String, key_payload: String, key_payload_signature: String, content_prekey: String, @@ -110,12 +110,14 @@ promise_id: u32, ) { RUNTIME.spawn(async move { - let siwe_message = Some(siwe_message).filter(|it| !it.is_empty()); - let siwe_signature = Some(siwe_signature).filter(|it| !it.is_empty()); + let siwe_social_proof_message = + Some(siwe_social_proof_message).filter(|it| !it.is_empty()); + let siwe_social_proof_signature = + Some(siwe_social_proof_signature).filter(|it| !it.is_empty()); let restored_user_info = RestoreUserInfo { user_id, - siwe_message, - siwe_signature, + siwe_social_proof_message, + siwe_social_proof_signature, device_list, device_keys: DeviceKeys { key_payload, @@ -268,8 +270,8 @@ ) -> Result { let restore_request = RestoreUserRequest { user_id: wallet_user_info.user_id, - siwe_message: wallet_user_info.siwe_message, - siwe_signature: wallet_user_info.siwe_signature, + siwe_message: wallet_user_info.siwe_social_proof_message, + siwe_signature: wallet_user_info.siwe_social_proof_signature, device_list: wallet_user_info.device_list, device_key_upload: Some(wallet_user_info.device_keys.into()), }; 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 @@ -132,8 +132,8 @@ #[cxx_name = "identityRestoreUser"] fn restore_user( user_id: String, - siwe_message: String, - siwe_signature: String, + siwe_social_proof_message: String, + siwe_social_proof_signature: String, key_payload: String, key_payload_signature: String, content_prekey: String, diff --git a/native/schema/CommRustModuleSchema.js b/native/schema/CommRustModuleSchema.js --- a/native/schema/CommRustModuleSchema.js +++ b/native/schema/CommRustModuleSchema.js @@ -76,8 +76,8 @@ ) => Promise; +restoreUser: ( userID: string, - siweMessage: ?string, - siweSignature: ?string, + siweSocialProofMessage: ?string, + siweSocialProofSignature: ?string, keyPayload: string, keyPayloadSignature: string, contentPrekey: string,