Merge pull request #104 from BrandonPotter/feature/Net60Release

v2.5 release candidate
BrandonPotter · Apr 13, 2022 · 725d5a9 · 725d5a9
2 parents c464ba3 + 3a48b7b
commit 725d5a9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/Google.Authenticator/Google.Authenticator.csproj b/Google.Authenticator/Google.Authenticator.csproj
@@ -7,7 +7,7 @@
     <Description>Google Authenticator Two-Factor Authentication Library (Not officially affiliated with Google.)</Description>
     <Authors>Brandon Potter</Authors>
     <Company>Brandon Potter</Company>
-    <Version>2.4.0</Version>
+    <Version>2.5.0</Version>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/BrandonPotter/GoogleAuthenticator</PackageProjectUrl>
     <PackageId>GoogleAuthenticator</PackageId>

diff --git a/Google.Authenticator/TwoFactorAuthenticator.cs b/Google.Authenticator/TwoFactorAuthenticator.cs
@@ -60,7 +60,13 @@ public SetupCode GenerateSetupCode(string issuer,
                 throw new NullReferenceException("Account Title is null");
             }
 
+            // MS wants us to change this to use EscapeDataString - https://docs.microsoft.com/en-us/dotnet/fundamentals/syslib-diagnostics/syslib0013
+            // But that changes the output. Specifically "[email protected]" becomes "a%40b.com"
+            // See issue https://github.com/BrandonPotter/GoogleAuthenticator/issues/103
+            #pragma warning disable SYSLIB0013
             accountTitleNoSpaces = RemoveWhitespace(Uri.EscapeUriString(accountTitleNoSpaces));
+            #pragma warning restore SYSLIB0013
+
             var encodedSecretKey = Base32Encoding.ToString(accountSecretKey);
 
             var provisionUrl = string.IsNullOrWhiteSpace(issuer)
@@ -81,7 +87,7 @@ private static string GenerateQrCodeUrl(int qrPixelsPerModule, string provisionU
             var qrCodeUrl = "";
             try
             {
-                               using (var qrGenerator = new QRCodeGenerator())
+                using (var qrGenerator = new QRCodeGenerator())
                 using (var qrCodeData = qrGenerator.CreateQrCode(provisionUrl, QRCodeGenerator.ECCLevel.Q))
                 #if NET6_0
                     using (var qrCode = new PngByteQRCode(qrCodeData))
@@ -98,7 +104,6 @@ private static string GenerateQrCodeUrl(int qrPixelsPerModule, string provisionU
                         qrCodeUrl = $"data:image/png;base64,{Convert.ToBase64String(ms.ToArray())}";
                     }
                 #endif
-
             }
             catch (TypeInitializationException e)
             {

diff --git a/README.md b/README.md
@@ -34,6 +34,12 @@ TwoFactorAuthenticator tfa = new TwoFactorAuthenticator();
 bool result = tfa.ValidateTwoFactorPIN(key, txtCode.Text)
 ```
 
+## Updates
+
+### 2.5.0
+Now runs on .Net 6.0.  
+Technically the QR Coder library we rely on still does not fully support .Net 6.0 so it is possible there will be other niggling issues, but for now all tests pass for .Net 6.0 on both Windows and Linux.
+
 ## Common Pitfalls
 
 * Old documentation indicated specifying width and height for the QR code, but changes in QR generation now uses pixels per module (QR "pixel") so using a value too high will result in a huge image that can overrun memory allocations