Updated to version 2.1.0

shugaoye · shugaoye · commit 2a6a3c17da80 · 2023-06-04T09:51:04.000+08:00
diff --git a/PassXYZLib.nuspec b/PassXYZLib.nuspec
@@ -2,15 +2,15 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
     <metadata>
         <id>PassXYZLib</id>
-        <version>2.0.3</version>
+        <version>2.1.0</version>
         <authors>Roger Ye</authors>
 		<owners>Roger Ye</owners>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<license type="expression">LGPL-3.0-or-later</license>
 		<projectUrl>https://passxyz.github.io/KPCLib/</projectUrl>
 		<description>This is an extension of KPCLib.</description>
       <releaseNotes>
-      - Fixed dependency issue
+      - Updated to version 2.1.0
     </releaseNotes>
 		<copyright>Roger Ye</copyright>
 		<repository url="https://github.com/passxyz/Lib" />
@@ -19,31 +19,31 @@
         <dependency id="HtmlAgilityPack" version="1.11.46" exclude="Build,Analyzers" />
         <dependency id="Markdig" version="0.23.0" exclude="Build,Analyzers" />
         <dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
-        <dependency id="PassXYZ" version="2.1.5.28" exclude="Build,Analyzers" />
+        <dependency id="PassXYZ" version="3.0.0.1" exclude="Build,Analyzers" />
       </group>
       <group targetFramework="net7.0-android33.0">
         <dependency id="HtmlAgilityPack" version="1.11.46" exclude="Build,Analyzers" />
         <dependency id="Markdig" version="0.23.0" exclude="Build,Analyzers" />
         <dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
-        <dependency id="PassXYZ" version="2.1.5.28" exclude="Build,Analyzers" />
+        <dependency id="PassXYZ" version="3.0.0.1" exclude="Build,Analyzers" />
       </group>
       <group targetFramework="net7.0-ios16.1">
         <dependency id="HtmlAgilityPack" version="1.11.46" exclude="Build,Analyzers" />
         <dependency id="Markdig" version="0.23.0" exclude="Build,Analyzers" />
         <dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
-        <dependency id="PassXYZ" version="2.1.5.28" exclude="Build,Analyzers" />
+        <dependency id="PassXYZ" version="3.0.0.1" exclude="Build,Analyzers" />
       </group>
       <group targetFramework="net7.0-maccatalyst16.1">
         <dependency id="HtmlAgilityPack" version="1.11.46" exclude="Build,Analyzers" />
         <dependency id="Markdig" version="0.23.0" exclude="Build,Analyzers" />
         <dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
-        <dependency id="PassXYZ" version="2.1.5.28" exclude="Build,Analyzers" />
+        <dependency id="PassXYZ" version="3.0.0.1" exclude="Build,Analyzers" />
       </group>
       <group targetFramework="net7.0-windows10.0.19041">
         <dependency id="HtmlAgilityPack" version="1.11.46" exclude="Build,Analyzers" />
         <dependency id="Markdig" version="0.23.0" exclude="Build,Analyzers" />
         <dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
-        <dependency id="PassXYZ" version="2.1.5.28" exclude="Build,Analyzers" />
+        <dependency id="PassXYZ" version="3.0.0.1" exclude="Build,Analyzers" />
       </group>
     </dependencies>
         <summary>PassXYZLib added additional features for .NET MAUI.</summary>
@@ -52,6 +52,7 @@
     <file src="PassXYZLib/bin/Release/net7.0/PassXYZLib.dll" target="lib/net7.0/PassXYZLib.dll" />
     <file src="PassXYZLib/bin/Release/net7.0/PureOtp.dll" target="lib/net7.0/PureOtp.dll" />
     <file src="PassXYZLib/bin/Release/net7.0-android/PassXYZLib.dll" target="lib/net7.0-android33.0/PassXYZLib.dll" />
+    <file src="PassXYZLib/bin/Release/net7.0-android/PassXYZLib.aar" target="lib/net7.0-android33.0/PassXYZLib.aar" />
     <file src="PassXYZLib/bin/Release/net7.0-android/PassXYZLib.xml" target="lib/net7.0-android33.0/PassXYZLib.xml" />
     <file src="PassXYZLib/bin/Release/net7.0-android/PureOtp.dll" target="lib/net7.0-android33.0/PureOtp.dll" />
     <file src="PassXYZLib/bin/Release/net7.0-ios/PassXYZLib.dll" target="lib/net7.0-ios16.1/PassXYZLib.dll" />
diff --git a/PassXYZLib.xunit/PassXYZ/DeviceLockTests.cs b/PassXYZLib.xunit/PassXYZ/DeviceLockTests.cs
@@ -10,6 +10,7 @@
 using KeePassLib.Serialization;
 using KeePassLib.Utility;
 using PassXYZLib;
+using PassXYZ.Services;
 
 namespace xunit.PassXYZ
 {
@@ -49,13 +50,21 @@ public class DeviceLockCollection : ICollectionFixture<DeviceLockFixture>
     [Collection("DeviceLock collection")]
     public class DeviceLockTests
     {
+        const string TEST_DB_KEY_DATA = "AAEAAAD/////AQAAAAAAAAAMAgAAAD5QYXNzWFlaLCBWZXJzaW9uPTIuNC40LjEsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAUBAAAAGlBhc3NYWVouU2VydmljZXMuUHhLZXlEYXRhCAAAAAhVc2VybmFtZQJJZAtEZXZpY2VNb2RlbBJEZXZpY2VNYW51ZmFjdHVyZXIKRGV2aWNlTmFtZQ1EZXZpY2VWZXJzaW9uDkRldmljZVBsYXRmb3JtC0RldmljZUlkaW9tAQEBAQEBAQECAAAABgMAAAAIa3BjbGlicHkGBAAAACAxQUQyNERDRTVBRTJERDRGQTQ2RDA3MjcwRDNCOTYzMgYFAAAADkxhdGl0dWRlIEU3NDQwBgYAAAAJRGVsbCBJbmMuBgcAAAAPREVTS1RPUC0yTUVLOFI3BggAAAAPMTAuMC4xODM2My4xNDQwBgkAAAADVVdQBgoAAAAHRGVza3RvcAs=";
         DeviceLockFixture passxyz;
 
         public DeviceLockTests(DeviceLockFixture deviceLockFixture)
         {
             this.passxyz = deviceLockFixture;
         }
 
+        [Fact]
+        public void GetKeyDataTest() 
+        {
+            var data = PxKeyData.FromBase64String(TEST_DB_KEY_DATA);
+            Debug.WriteLine($"Username = {data.Username}");
+        }
+
         [Fact]
         public void IsOpenDbTest()
         {
diff --git a/PassXYZLib.xunit/PassXYZ/MockDeviceInfo.cs b/PassXYZLib.xunit/PassXYZ/MockDeviceInfo.cs
@@ -0,0 +1,21 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Maui.Devices;
+
+namespace PassXYZLib.xunit.PassXYZ
+{
+    public class MockDeviceInfo : IDeviceInfo
+    {
+        public string Model => "Lib";
+        public string Manufacturer => "PassXYZ";
+        public string Name => "PassXYZLib";
+        public Version Version => new(1, 0, 0, 0);
+        public string VersionString => Version.ToString();
+        public DevicePlatform Platform => new();
+        public DeviceIdiom Idiom => new();
+        public DeviceType DeviceType => new();
+    }
+}
diff --git a/PassXYZLib.xunit/PassXYZ/NewDatabaseTests.cs b/PassXYZLib.xunit/PassXYZ/NewDatabaseTests.cs
@@ -0,0 +1,68 @@
+﻿using Xunit;
+using PassXYZ.Utils;
+using System.Diagnostics;
+using PassXYZ.Services;
+
+namespace PassXYZLib.xunit.PassXYZ
+{
+    public class NewDatabaseTests
+    {
+        const string TEST_USER = "NewKeyDataTest";
+        const string TEST_DB_KEY = "123123";
+        readonly User _testUser;
+        readonly PxDatabase _db;
+
+        public NewDatabaseTests() 
+        {
+            _testUser = new User()
+            {
+                Username = TEST_USER,
+                Password = TEST_DB_KEY,
+                IsDeviceLockEnabled = true
+            };
+            _db = new();
+        }
+
+        void Connect() 
+        {
+            var deviceInfo = new MockDeviceInfo();
+            NewKeyData newKeyData = new() 
+            { 
+                Name = deviceInfo.Name,
+                Idiom = deviceInfo.Idiom.ToString(),
+                Manufacturer = deviceInfo.Manufacturer,
+                Model = deviceInfo.Model,
+                Platform = deviceInfo.Platform.ToString(),
+                Version = deviceInfo.Version.ToString(),
+                VersionString = deviceInfo.VersionString,
+                DeviceType = deviceInfo.DeviceType.ToString(),
+            };
+            PxKeyProvider pxKeyProvider = new(newKeyData);
+            if (_testUser.IsKeyFileExist)
+            {
+                _db.Open(_testUser);
+            }
+            else
+            {
+                _db.New(_testUser, pxKeyProvider);
+                ShowWarningsLogger swLogger = new();
+                _db.Save(swLogger);
+            }
+        }
+
+        [Fact]
+        public void IsOpenDbTest()
+        {
+            Connect();
+            Debug.WriteLine($"Username is {_testUser.Username}.");
+            Assert.True((_db.IsOpen));
+        }
+
+        [Fact]
+        public void DeleteUserTest()
+        {
+            _testUser.Delete();
+            Assert.False(_testUser.IsKeyFileExist);
+        }
+    }
+}
diff --git a/PassXYZLib.xunit/PassXYZ/OldDatabaseTests.cs b/PassXYZLib.xunit/PassXYZ/OldDatabaseTests.cs
@@ -0,0 +1,74 @@
+﻿using PassXYZ.Services;
+using PassXYZ.Utils;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace PassXYZLib.xunit.PassXYZ
+{
+    public class OldDatabaseTests
+    {
+        const string TEST_USER = "OldKeyDataTest";
+        const string TEST_DB_KEY = "123123";
+        readonly User _testUser;
+        readonly PxDatabase _db;
+
+        public OldDatabaseTests()
+        {
+            _testUser = new User()
+            {
+                Username = TEST_USER,
+                Password = TEST_DB_KEY,
+                IsDeviceLockEnabled = true
+            };
+            _db = new();
+        }
+
+        void Connect()
+        {
+            var deviceInfo = new MockDeviceInfo();
+            OldKeyData keyData = new()
+            {
+                Name = deviceInfo.Name,
+                Idiom = deviceInfo.Idiom.ToString(),
+                Manufacturer = deviceInfo.Manufacturer,
+                Model = deviceInfo.Model,
+                Platform = deviceInfo.Platform.ToString(),
+                Version = deviceInfo.Version.ToString(),
+                VersionString = deviceInfo.VersionString,
+                DeviceType = deviceInfo.DeviceType.ToString(),
+            };
+            keyData.SetData();
+            PxKeyProvider pxKeyProvider = new(keyData);
+            if (_testUser.IsKeyFileExist)
+            {
+                _db.Open(_testUser);
+            }
+            else
+            {
+                _db.New(_testUser, pxKeyProvider);
+                ShowWarningsLogger swLogger = new();
+                _db.Save(swLogger);
+            }
+        }
+
+        [Fact]
+        public void IsOpenDbTest()
+        {
+            Connect();
+            Debug.WriteLine($"Username is {_testUser.Username}.");
+            Assert.True((_db.IsOpen));
+        }
+
+        [Fact]
+        public void DeleteUserTest()
+        {
+            _testUser.Delete();
+            Assert.False(_testUser.IsKeyFileExist);
+        }
+    }
+}
diff --git a/PassXYZLib.xunit/PxDatabaseTests.cs b/PassXYZLib.xunit/PxDatabaseTests.cs
@@ -422,7 +422,7 @@ public class PxLibInfoTests
         public void PxLibVersion() 
         {
             Debug.WriteLine($"{PxLibInfo.Version}");
-            Assert.Equal(PxLibInfo.Version, new System.Version("2.0.1.0"));
+            Assert.Equal(PxLibInfo.Version, new System.Version("2.1.0.0"));
         }
 
         [Fact]
diff --git a/PassXYZLib/PassXYZLib.csproj b/PassXYZLib/PassXYZLib.csproj
@@ -17,15 +17,16 @@
 
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
-    <Version>2.0.3</Version>
+    <Version>2.1.0</Version>
     <NeutralLanguage>en-US</NeutralLanguage>
+    <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
     <PackageReference Include="Markdig" Version="0.23.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="PassXYZ" Version="2.1.5.28" />
+    <PackageReference Include="PassXYZ" Version="3.0.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/PassXYZLib/PxDatabase.cs b/PassXYZLib/PxDatabase.cs

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`using KeePassLib.Serialization;`
`11`	`11`	`using KeePassLib.Utility;`
`12`	`12`	`using PassXYZLib;`
	`13`	`+using PassXYZ.Services;`
`13`	`14`
`14`	`15`	`namespace xunit.PassXYZ`
`15`	`16`	`{`
`@@ -49,13 +50,21 @@ public class DeviceLockCollection : ICollectionFixture<DeviceLockFixture>`
`49`	`50`	`[Collection("DeviceLock collection")]`
`50`	`51`	`public class DeviceLockTests`
`51`	`52`	`{`
	`53`	+ const string TEST_DB_KEY_DATA = "AAEAAAD/////AQAAAAAAAAAMAgAAAD5QYXNzWFlaLCBWZXJzaW9uPTIuNC40LjEsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAUBAAAAGlBhc3NYWVouU2VydmljZXMuUHhLZXlEYXRhCAAAAAhVc2VybmFtZQJJZAtEZXZpY2VNb2RlbBJEZXZpY2VNYW51ZmFjdHVyZXIKRGV2aWNlTmFtZQ1EZXZpY2VWZXJzaW9uDkRldmljZVBsYXRmb3JtC0RldmljZUlkaW9tAQEBAQEBAQECAAAABgMAAAAIa3BjbGlicHkGBAAAACAxQUQyNERDRTVBRTJERDRGQTQ2RDA3MjcwRDNCOTYzMgYFAAAADkxhdGl0dWRlIEU3NDQwBgYAAAAJRGVsbCBJbmMuBgcAAAAPREVTS1RPUC0yTUVLOFI3BggAAAAPMTAuMC4xODM2My4xNDQwBgkAAAADVVdQBgoAAAAHRGVza3RvcAs=";
`52`	`54`	`DeviceLockFixture passxyz;`
`53`	`55`
`54`	`56`	`public DeviceLockTests(DeviceLockFixture deviceLockFixture)`
`55`	`57`	`{`
`56`	`58`	`this.passxyz = deviceLockFixture;`
`57`	`59`	`}`
`58`	`60`
	`61`	`+ [Fact]`
	`62`	`+ public void GetKeyDataTest()`
	`63`	`+ {`
	`64`	`+ var data = PxKeyData.FromBase64String(TEST_DB_KEY_DATA);`
	`65`	`+ Debug.WriteLine($"Username = {data.Username}");`
	`66`	`+ }`
	`67`	`+`
`59`	`68`	`[Fact]`
`60`	`69`	`public void IsOpenDbTest()`
`61`	`70`	`{`
Original file line number	Diff line number	Diff line change
`@@ -422,7 +422,7 @@ public class PxLibInfoTests`
`422`	`422`	`public void PxLibVersion()`
`423`	`423`	`{`
`424`	`424`	`Debug.WriteLine($"{PxLibInfo.Version}");`
`425`		`- Assert.Equal(PxLibInfo.Version, new System.Version("2.0.1.0"));`
	`425`	`+ Assert.Equal(PxLibInfo.Version, new System.Version("2.1.0.0"));`
`426`	`426`	`}`
`427`	`427`
`428`	`428`	`[Fact]`