From 4bdbc308738ddf62e711e78c10909a89b2cbfe47 Mon Sep 17 00:00:00 2001
From: Hinton <hinton@users.noreply.github.com>
Date: Thu, 27 Apr 2023 14:38:32 +0200
Subject: [PATCH] Dylib

---
 src/iOS.Autofill/AppDelegate.cs               | 15 +++++++++
 src/iOS.Autofill/BitwardenClient.cs           | 31 +++++++++++++++++++
 src/iOS.Autofill/BitwardenClientSafeHandle.cs | 18 +++++++++++
 src/iOS.Autofill/BitwardenClientWrapper.cs    | 23 ++++++++++++++
 src/iOS.Autofill/iOS.Autofill.csproj          |  9 ++++++
 src/iOS/AppDelegate.cs                        |  7 ++++-
 src/iOS/iOS.csproj                            | 26 ++++++++++------
 7 files changed, 118 insertions(+), 11 deletions(-)
 create mode 100644 src/iOS.Autofill/BitwardenClient.cs
 create mode 100644 src/iOS.Autofill/BitwardenClientSafeHandle.cs
 create mode 100644 src/iOS.Autofill/BitwardenClientWrapper.cs

diff --git a/src/iOS.Autofill/AppDelegate.cs b/src/iOS.Autofill/AppDelegate.cs
index e27c57ae6..ca20eda72 100644
--- a/src/iOS.Autofill/AppDelegate.cs
+++ b/src/iOS.Autofill/AppDelegate.cs
@@ -11,6 +11,21 @@ namespace Bit.iOS.Autofill
             get; set;
         }
 
+        public override void FinishedLaunching(UIApplication application)
+        {
+
+            var ln = @"libbitwarden_c.framework/libbitwarden_c";
+            var documentsPath = NSBundle.MainBundle.BundlePath;
+            var filePath = System.IO.Path.Combine(documentsPath, "Frameworks", ln);
+            var ptr = ObjCRuntime.Dlfcn.dlopen(filePath, 0);
+
+            var sdkClient = new BitwardenClient();
+            var test = sdkClient.Fingerprint();
+            
+            
+            base.FinishedLaunching(application);
+        }
+
         public override void OnResignActivation(UIApplication application)
         {
         }
diff --git a/src/iOS.Autofill/BitwardenClient.cs b/src/iOS.Autofill/BitwardenClient.cs
new file mode 100644
index 000000000..0cbef9db4
--- /dev/null
+++ b/src/iOS.Autofill/BitwardenClient.cs
@@ -0,0 +1,31 @@
+using System;
+
+namespace Bit.iOS
+{
+    public class BitwardenClient  : IDisposable
+    {
+        private readonly BitwardenClientSafeHandle handle;
+
+        public BitwardenClient()
+        {
+            handle = BitwardenClientWrapper.init("");
+        }
+
+        public string Fingerprint()
+        {
+            return BitwardenClientWrapper.run_command("{}", handle.Ptr);
+        }
+        
+        protected virtual void Dispose(bool disposing)
+        {
+            if (handle != null && !handle.IsInvalid)
+                handle.Dispose();
+        }
+        
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/iOS.Autofill/BitwardenClientSafeHandle.cs b/src/iOS.Autofill/BitwardenClientSafeHandle.cs
new file mode 100644
index 000000000..eb22ca4d6
--- /dev/null
+++ b/src/iOS.Autofill/BitwardenClientSafeHandle.cs
@@ -0,0 +1,18 @@
+using System;
+using Microsoft.Win32.SafeHandles;
+
+namespace Bit.iOS
+{
+    internal class BitwardenClientSafeHandle : SafeHandleZeroOrMinusOneIsInvalid
+    {
+        public BitwardenClientSafeHandle() : base(true) { }
+
+        public IntPtr Ptr => this.handle;
+
+        protected override bool ReleaseHandle()
+        {
+            BitwardenClientWrapper.free_mem(handle);
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/iOS.Autofill/BitwardenClientWrapper.cs b/src/iOS.Autofill/BitwardenClientWrapper.cs
new file mode 100644
index 000000000..2d06ad412
--- /dev/null
+++ b/src/iOS.Autofill/BitwardenClientWrapper.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Bit.iOS
+{
+  internal static class BitwardenClientWrapper
+  {
+#if Android
+        const string DllName = "libBitwardenC.so";
+#else
+    const string DllName = "__Internal";
+#endif
+      
+    [DllImport(DllName, EntryPoint = "init")]
+    internal static extern BitwardenClientSafeHandle init(string settings);
+    
+    [DllImport(DllName, EntryPoint = "free_mem")]
+        internal static extern void free_mem(IntPtr clientPtr);
+
+    [DllImport(DllName, EntryPoint = "run_command")]
+        internal static extern string run_command(string loginRequest, IntPtr clientPtr);
+  }
+}
\ No newline at end of file
diff --git a/src/iOS.Autofill/iOS.Autofill.csproj b/src/iOS.Autofill/iOS.Autofill.csproj
index ce5fc0b09..a970dc937 100644
--- a/src/iOS.Autofill/iOS.Autofill.csproj
+++ b/src/iOS.Autofill/iOS.Autofill.csproj
@@ -194,6 +194,9 @@
     <InterfaceDefinition Include="MainInterface.storyboard" />
     <BundleResource Include="Resources\MaterialIcons_Regular.ttf" />
     <BundleResource Include="Resources\bwi-font.ttf" />
+    <Compile Include="BitwardenClient.cs" />
+    <Compile Include="BitwardenClientSafeHandle.cs" />
+    <Compile Include="BitwardenClientWrapper.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -278,5 +281,11 @@
   <ItemGroup>
     <BundleResource Include="Resources\yubikey%403x.png" />
   </ItemGroup>
+  <ItemGroup>
+    <NativeReference Include="..\..\..\sdk\libbitwarden_c.framework">
+      <Kind>Framework</Kind>
+      <SmartLink>False</SmartLink>
+    </NativeReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.AppExtension.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/iOS/AppDelegate.cs b/src/iOS/AppDelegate.cs
index 6fc420b50..ff182c9e7 100644
--- a/src/iOS/AppDelegate.cs
+++ b/src/iOS/AppDelegate.cs
@@ -182,10 +182,15 @@ namespace Bit.iOS
                     LoggerHelper.LogEvenIfCantBeResolved(ex);
                 }
             });
+            
+            var ln = @"libbitwarden_c.framework/libbitwarden_c";
+            var documentsPath = NSBundle.MainBundle.BundlePath;
+            var filePath = System.IO.Path.Combine(documentsPath, "Frameworks", ln);
+            var ptr = ObjCRuntime.Dlfcn.dlopen(filePath, 0);
 
             var sdkClient = new BitwardenClient();
             var test = sdkClient.Fingerprint();
-
+            
             return base.FinishedLaunching(app, options);
         }
 
diff --git a/src/iOS/iOS.csproj b/src/iOS/iOS.csproj
index 9c1dc3160..94f3620bc 100644
--- a/src/iOS/iOS.csproj
+++ b/src/iOS/iOS.csproj
@@ -29,7 +29,7 @@
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>true</MtouchDebug>
     <OptimizePNGs>true</OptimizePNGs>
-    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler -gcc_flags "-L${ProjectDir}/../../lib/ios -largon2 -force_load ${ProjectDir}/../../lib/ios/libargon2.a -lbitwarden_c -force_load ${ProjectDir}/../../lib/ios/libbitwarden_c.a"</MtouchExtraArgs>
+    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler -gcc_flags "-L${ProjectDir}/../../lib/ios -largon2 -force_load ${ProjectDir}/../../lib/ios/libargon2.a"</MtouchExtraArgs>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
@@ -41,7 +41,7 @@
     <MtouchLink>Full</MtouchLink>
     <MtouchArch>x86_64</MtouchArch>
     <ConsolePause>false</ConsolePause>
-    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB --linkskip=CsvHelper --linkskip=BitwardeniOSShareExtension -gcc_flags "-L${ProjectDir}/../../lib/ios -largon2 -force_load ${ProjectDir}/../../lib/ios/libargon2.a -lbitwarden_c -force_load ${ProjectDir}/../../lib/ios/libbitwarden_c.a"</MtouchExtraArgs>
+    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB --linkskip=CsvHelper --linkskip=BitwardeniOSShareExtension -gcc_flags "-L${ProjectDir}/../../lib/ios -largon2 -force_load ${ProjectDir}/../../lib/ios/libargon2.a"</MtouchExtraArgs>
     <OptimizePNGs>true</OptimizePNGs>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
   </PropertyGroup>
@@ -60,7 +60,7 @@
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchLink>None</MtouchLink>
     <MtouchFloat32>false</MtouchFloat32>
-    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler -gcc_flags "-L${ProjectDir}/../../lib/ios -largon2 -force_load ${ProjectDir}/../../lib/ios/libargon2.a -lbitwarden_c -force_load ${ProjectDir}/../../lib/ios/libbitwarden_c.a"</MtouchExtraArgs>
+    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler -gcc_flags "-L${ProjectDir}/../../lib/ios -largon2 -force_load ${ProjectDir}/../../lib/ios/libargon2.a"</MtouchExtraArgs>
     <OptimizePNGs>true</OptimizePNGs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
@@ -74,7 +74,7 @@
     <CodesignKey>iPhone Developer</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchLink>Full</MtouchLink>
-    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB --linkskip=CsvHelper --linkskip=BitwardeniOSShareExtension -gcc_flags "-L${ProjectDir}/../../lib/ios -largon2 -force_load ${ProjectDir}/../../lib/ios/libargon2.a -lbitwarden_c -force_load ${ProjectDir}/../../lib/ios/libbitwarden_c.a"</MtouchExtraArgs>
+    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB --linkskip=CsvHelper --linkskip=BitwardeniOSShareExtension -gcc_flags "-L${ProjectDir}/../../lib/ios -largon2 -force_load ${ProjectDir}/../../lib/ios/libargon2.a"</MtouchExtraArgs>
     <OptimizePNGs>true</OptimizePNGs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
@@ -89,7 +89,7 @@
     <CodesignKey>iPhone Distribution</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchLink>Full</MtouchLink>
-    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB --linkskip=CsvHelper --linkskip=BitwardeniOSShareExtension -gcc_flags "-L${ProjectDir}/../../lib/ios -largon2 -force_load ${ProjectDir}/../../lib/ios/libargon2.a -lbitwarden_c -force_load ${ProjectDir}/../../lib/ios/libbitwarden_c.a"</MtouchExtraArgs>
+    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB --linkskip=CsvHelper --linkskip=BitwardeniOSShareExtension -gcc_flags "-L${ProjectDir}/../../lib/ios -largon2 -force_load ${ProjectDir}/../../lib/ios/libargon2.a"</MtouchExtraArgs>
     <CodesignProvision>Automatic:AdHoc</CodesignProvision>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
@@ -103,7 +103,7 @@
     <CodesignProvision>Automatic:AppStore</CodesignProvision>
     <CodesignKey>iPhone Distribution</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB --linkskip=CsvHelper --linkskip=BitwardeniOSShareExtension -gcc_flags "-L${ProjectDir}/../../lib/ios -largon2 -force_load ${ProjectDir}/../../lib/ios/libargon2.a -lbitwarden_c -force_load ${ProjectDir}/../../lib/ios/libbitwarden_c.a"</MtouchExtraArgs>
+    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB --linkskip=CsvHelper --linkskip=BitwardeniOSShareExtension -gcc_flags "-L${ProjectDir}/../../lib/ios -largon2 -force_load ${ProjectDir}/../../lib/ios/libargon2.a"</MtouchExtraArgs>
     <OptimizePNGs>true</OptimizePNGs>
     <MtouchLink>Full</MtouchLink>
   </PropertyGroup>
@@ -115,7 +115,7 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB --linkskip=CsvHelper -gcc_flags "-L${ProjectDir}/../../lib/ios -largon2 -force_load ${ProjectDir}/../../lib/ios/libargon2.a -lbitwarden_c -force_load ${ProjectDir}/../../lib/ios/libbitwarden_c.a"</MtouchExtraArgs>
+    <MtouchExtraArgs>--nodevcodeshare --http-message-handler=NSUrlSessionHandler --linkskip=BitwardeniOS --linkskip=BitwardeniOSCore --linkskip=BitwardeniOSAutofill --linkskip=BitwardeniOSExtension --linkskip=BitwardenApp --linkskip=BitwardenCore --linkskip=LiteDB --linkskip=CsvHelper -gcc_flags "-L${ProjectDir}/../../lib/ios -largon2 -force_load ${ProjectDir}/../../lib/ios/libargon2.a"</MtouchExtraArgs>
     <OptimizePNGs>true</OptimizePNGs>
     <MtouchLink>SdkOnly</MtouchLink>
   </PropertyGroup>
@@ -144,9 +144,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />
-    <Compile Include="BitwardenClient.cs" />
-    <Compile Include="BitwardenClientSafeHandle.cs" />
-    <Compile Include="BitwardenClientWrapper.cs" />
     <Compile Include="AppDelegate.cs" />
     <Compile Include="Services\iOSPushNotificationHandler.cs" />
     <Compile Include="Services\iOSPushNotificationService.cs" />
@@ -186,6 +183,9 @@
     <ImageAsset Include="Resources\Assets.xcassets\empty_items_state.imageset\Empty-items-state-dark.pdf" />
     <ImageAsset Include="Resources\Assets.xcassets\empty_items_state.imageset\Empty-items-state.pdf" />
     <ImageAsset Include="Resources\Assets.xcassets\empty_items_state.imageset\Contents.json" />
+    <Compile Include="BitwardenClient.cs" />
+    <Compile Include="BitwardenClientSafeHandle.cs" />
+    <Compile Include="BitwardenClientWrapper.cs" />
   </ItemGroup>
   <ItemGroup>
     <InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -427,6 +427,12 @@
   <ItemGroup Condition=" '$(Configuration)' != 'Debug' ">
       <_ResolvedWatchAppReferences Include="$(WatchAppBundleFullPath)" />
   </ItemGroup>
+  <ItemGroup>
+    <NativeReference Include="..\..\..\sdk\libbitwarden_c.framework">
+      <Kind>Framework</Kind>
+      <SmartLink>False</SmartLink>
+    </NativeReference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(_ResolvedWatchAppReferences)' != '' ">
       <CodesignExtraArgs>--deep</CodesignExtraArgs>
   </PropertyGroup>