修复二维码登录并更新证书 (#1773)

Richasy · Sep 24, 2023 · 23706da · 23706da
1 parent 11f6cf6
commit 23706da
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 20 deletions.
diff --git a/src/App/App.csproj b/src/App/App.csproj
@@ -26,6 +26,7 @@
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <PackageCertificateKeyFile>App_TemporaryKey.pfx</PackageCertificateKeyFile>
     <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
+    <PackageCertificateThumbprint>C3B9A35BB185E430F381F524A644B2598DDF2500</PackageCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>

diff --git a/src/App/App_TemporaryKey.pfx b/src/App/App_TemporaryKey.pfx
diff --git a/src/Lib/SignIn.Uwp/AuthorizeProvider/AuthorizeProvider.Extension.cs b/src/Lib/SignIn.Uwp/AuthorizeProvider/AuthorizeProvider.Extension.cs
@@ -2,6 +2,8 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing.Imaging;
+using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Runtime.InteropServices.WindowsRuntime;
@@ -17,13 +19,13 @@
 using Bili.Models.Enums;
 using Bili.Toolkit.Interfaces;
 using Newtonsoft.Json.Linq;
+using QRCoder;
 using Windows.Security.Cryptography.Core;
 using Windows.Storage;
+using Windows.Storage.Streams;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Media.Imaging;
 using Windows.Web.Http.Filters;
-using ZXing;
-using ZXing.Common;
 using static Bili.Models.App.Constants.ApiConstants;
 using static Bili.Models.App.Constants.ServiceConstants;
 
@@ -229,7 +231,7 @@ internal async Task<string> GetConfirmUriAsync()
             return null;
         }
 
-        internal async Task<WriteableBitmap> GetQRImageAsync()
+        internal async Task<BitmapImage> GetQRImageAsync()
         {
             try
             {
@@ -244,17 +246,22 @@ internal async Task<WriteableBitmap> GetQRImageAsync()
                 var result = await httpProvider.ParseAsync<ServerResponse<QRInfo>>(response);
 
                 _internalQRAuthCode = result.Data.AuthCode;
-                var barcodeWriter = new BarcodeWriter();
-                barcodeWriter.Format = BarcodeFormat.QR_CODE;
-                barcodeWriter.Options = new EncodingOptions()
+                var generator = new QRCodeGenerator();
+                var data = generator.CreateQrCode(result.Data.Url, QRCodeGenerator.ECCLevel.Q);
+                var code = new BitmapByteQRCode(data);
+                var image = code.GetGraphic(20);
+                using (var stream = new InMemoryRandomAccessStream())
                 {
-                    Margin = 1,
-                    Height = 200,
-                    Width = 200,
-                };
+                    using (var writer = new DataWriter(stream.GetOutputStreamAt(0)))
+                    {
+                        writer.WriteBytes(image);
+                        await writer.StoreAsync();
+                    }
 
-                var img = barcodeWriter.Write(result.Data.Url);
-                return img;
+                    var bitmap = new BitmapImage();
+                    await bitmap.SetSourceAsync(stream);
+                    return bitmap;
+                }
             }
             catch
             {

diff --git a/src/Lib/SignIn.Uwp/SignIn.Uwp.csproj b/src/Lib/SignIn.Uwp/SignIn.Uwp.csproj
@@ -133,12 +133,12 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.14</Version>
     </PackageReference>
+    <PackageReference Include="QRCoder">
+      <Version>1.4.3</Version>
+    </PackageReference>
     <PackageReference Include="QueryString.NET">
       <Version>1.0.0</Version>
     </PackageReference>
-    <PackageReference Include="ZXing.Net">
-      <Version>0.16.8</Version>
-    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Page Include="SignInDialog.xaml">

diff --git a/src/Lib/SignIn.Uwp/SignInDialog.xaml.cs b/src/Lib/SignIn.Uwp/SignInDialog.xaml.cs
@@ -172,11 +172,12 @@ private async Task LoadQRCodeAsync()
         {
             HideQRTip();
             QRLoadingRing.IsActive = true;
-            var imgSource = await _authorizeProvider.GetQRImageAsync();
-            if (imgSource != null)
+            var bitmapImage = await _authorizeProvider.GetQRImageAsync();
+            if (bitmapImage != null)
             {
-                QRCodeImage.Source = imgSource;
+                QRCodeImage.Source = bitmapImage;
                 _authorizeProvider.StartQRLoginListener();
+                QRTipBlock.Visibility = Visibility.Visible;
             }
             else
             {

diff --git a/src/Models/Models.App/Constants/ApiConstants.cs b/src/Models/Models.App/Constants/ApiConstants.cs
@@ -14,6 +14,7 @@ public static class ApiConstants
         public const string _vcBase = "https://api.vc.bilibili.com";
         public const string _liveBase = "https://api.live.bilibili.com";
         public const string _passBase = "https://passport.bilibili.com";
+        public const string _passSnmBase = "https://passport.snm0516.aisee.tv";
         public const string _bangumiBase = "https://bangumi.bilibili.com";
         public const string _grpcBase = "https://grpc.biliapi.net";
 
@@ -50,12 +51,12 @@ public static class Passport
             /// <summary>
             /// 获取登录二维码.
             /// </summary>
-            public const string QRCode = _passBase + "/x/passport-tv-login/qrcode/auth_code";
+            public const string QRCode = _passSnmBase + "/x/passport-tv-login/qrcode/auth_code";
 
             /// <summary>
             /// 登录二维码轮询状态.
             /// </summary>
-            public const string QRCodeCheck = _passBase + "/x/passport-tv-login/qrcode/poll";
+            public const string QRCodeCheck = _passSnmBase + "/x/passport-tv-login/qrcode/poll";
 
             /// <summary>
             /// cookie转访问令牌.