Refactor terminate session function

spruceid · Jan 26, 2024 · 95ca3ca · 95ca3ca
1 parent d1be8fd
commit 95ca3ca
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 21 deletions.
diff --git a/WalletSdkRs/RustFramework.xcframework/Info.plist b/WalletSdkRs/RustFramework.xcframework/Info.plist
@@ -10,34 +10,34 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libwallet_sdk_rs.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libwallet_sdk_rs.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libwallet_sdk_rs.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

diff --git a/WalletSdkRs/RustFramework.xcframework/ios-arm64/libwallet_sdk_rs.a b/WalletSdkRs/RustFramework.xcframework/ios-arm64/libwallet_sdk_rs.a
diff --git a/WalletSdkRs/RustFramework.xcframework/ios-arm64_x86_64-simulator/libwallet_sdk_rs.a b/WalletSdkRs/RustFramework.xcframework/ios-arm64_x86_64-simulator/libwallet_sdk_rs.a
diff --git a/WalletSdkRs/Sources/WalletSdkRs/wallet_sdk_rs.swift b/WalletSdkRs/Sources/WalletSdkRs/wallet_sdk_rs.swift
@@ -1308,8 +1308,8 @@ public func submitSignature(sessionManager: SessionManager, signature: Data) thr
     )
 }
 
-public func terminateSession() throws -> String {
-    return try  FfiConverterString.lift(
+public func terminateSession() throws -> Data {
+    return try  FfiConverterData.lift(
         try rustCallWithError(FfiConverterTypeTerminationError.lift) {
     uniffi_wallet_sdk_rs_fn_func_terminate_session($0)
 }
@@ -1346,7 +1346,7 @@ private var initializationResult: InitializationResult {
     if (uniffi_wallet_sdk_rs_checksum_func_submit_signature() != 58193) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_wallet_sdk_rs_checksum_func_terminate_session() != 30335) {
+    if (uniffi_wallet_sdk_rs_checksum_func_terminate_session() != 35293) {
         return InitializationResult.apiChecksumMismatch
     }
     if (uniffi_wallet_sdk_rs_checksum_method_mdoc_id() != 56888) {

diff --git a/src/lib.rs b/src/lib.rs
@@ -10,7 +10,7 @@ use isomdl::{
         device_engagement::{CentralClientMode, DeviceRetrievalMethods},
         device_request,
         helpers::NonEmptyMap,
-        BleOptions, DeviceRetrievalMethod, SessionEstablishment,
+        session, BleOptions, DeviceRetrievalMethod, SessionEstablishment,
     },
     presentation::{
         device::{self, Document, SessionManagerEngaged, SessionManagerInit},
@@ -257,19 +257,15 @@ pub enum TerminationError {
 }
 
 #[uniffi::export]
-fn terminate_session() -> Result<String, TerminationError> {
-    use isomdl::definitions::session::{SessionData, Status};
-
-    let msg = SessionData {
+fn terminate_session() -> Result<Vec<u8>, TerminationError> {
+    let msg = session::SessionData {
         data: None,
-        status: Some(Status::SessionTermination),
+        status: Some(session::Status::SessionTermination),
     };
     let msg_bytes = serde_cbor::to_vec(&msg).map_err(|e| TerminationError::Generic {
         value: format!("Could not serialize message bytes: {e:?}"),
     })?;
-    let mut response = hex::encode(msg_bytes);
-    response.insert_str(0, "0x");
-    Ok(response)
+    Ok(msg_bytes)
 }
 
 #[derive(uniffi::Object)]