From 434b7a68e7cf4b8e763ac0a7bee43aca3a3695de Mon Sep 17 00:00:00 2001
From: Haiping Chen <haiping008@gmail.com>
Date: Mon, 13 May 2024 08:57:39 -0500
Subject: [PATCH] Upgrade LLamaSharp to v0.12

---
 .../BotSharp.OpenAPI/BotSharp.OpenAPI.csproj       |  8 +++++---
 .../BotSharp.OpenAPI/BotSharpOpenApiExtensions.cs  | 14 ++++++++++++++
 .../BotSharp.Plugin.LLamaSharp.csproj              |  2 +-
 src/WebStarter/WebStarter.csproj                   |  4 ++--
 src/WebStarter/appsettings.json                    |  4 ++++
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/Infrastructure/BotSharp.OpenAPI/BotSharp.OpenAPI.csproj b/src/Infrastructure/BotSharp.OpenAPI/BotSharp.OpenAPI.csproj
index f3495bb9..22fcc9e0 100644
--- a/src/Infrastructure/BotSharp.OpenAPI/BotSharp.OpenAPI.csproj
+++ b/src/Infrastructure/BotSharp.OpenAPI/BotSharp.OpenAPI.csproj
@@ -22,17 +22,19 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.4" />
     <PackageReference Include="AspNet.Security.OAuth.GitHub" Version="8.0.0" />
     <PackageReference Include="AspNet.Security.OAuth.Keycloak" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.2" />
+    <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.4" />
   </ItemGroup>
   
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="6.0.27" />
     <PackageReference Include="AspNet.Security.OAuth.GitHub" Version="6.0.15" />
     <PackageReference Include="AspNet.Security.OAuth.Keycloak" Version="6.0.15" />
+    <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="6.0.15" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.25" />
     <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.26" />
   </ItemGroup>
diff --git a/src/Infrastructure/BotSharp.OpenAPI/BotSharpOpenApiExtensions.cs b/src/Infrastructure/BotSharp.OpenAPI/BotSharpOpenApiExtensions.cs
index 63a9bc92..eabdba84 100644
--- a/src/Infrastructure/BotSharp.OpenAPI/BotSharpOpenApiExtensions.cs
+++ b/src/Infrastructure/BotSharp.OpenAPI/BotSharpOpenApiExtensions.cs
@@ -126,6 +126,20 @@ public static class BotSharpOpenApiExtensions
             });
         }
 
+        // Wexin OAuth
+        if (!string.IsNullOrWhiteSpace(config["OAuth:Wexin:ClientId"]) && !string.IsNullOrWhiteSpace(config["OAuth:Wexin:ClientSecret"]))
+        {
+            builder = builder.AddWeixin(options =>
+            {
+                options.ClientId = config["OAuth:GitHub:ClientId"];
+                options.ClientSecret = config["OAuth:GitHub:ClientSecret"];
+                options.Scope.Add("user:email");
+                options.Backchannel = builder.Services.BuildServiceProvider()
+                    .GetRequiredService<IHttpClientFactory>()
+                    .CreateClient();
+            });
+        }
+
         // Add services to the container.
         services.AddControllers()
             .AddJsonOptions(options =>
diff --git a/src/Plugins/BotSharp.Plugin.LLamaSharp/BotSharp.Plugin.LLamaSharp.csproj b/src/Plugins/BotSharp.Plugin.LLamaSharp/BotSharp.Plugin.LLamaSharp.csproj
index cb9087e9..722dfa41 100644
--- a/src/Plugins/BotSharp.Plugin.LLamaSharp/BotSharp.Plugin.LLamaSharp.csproj
+++ b/src/Plugins/BotSharp.Plugin.LLamaSharp/BotSharp.Plugin.LLamaSharp.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LLamaSharp" Version="0.11.2" />
+    <PackageReference Include="LLamaSharp" Version="0.12.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebStarter/WebStarter.csproj b/src/WebStarter/WebStarter.csproj
index 89b09482..bef66c67 100644
--- a/src/WebStarter/WebStarter.csproj
+++ b/src/WebStarter/WebStarter.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>$(TargetFramework)</TargetFramework>
@@ -22,7 +22,7 @@
 
   <ItemGroup>
     <PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebStarter/appsettings.json b/src/WebStarter/appsettings.json
index c6555f32..5482e6b1 100644
--- a/src/WebStarter/appsettings.json
+++ b/src/WebStarter/appsettings.json
@@ -33,6 +33,10 @@
       "ClientId": "",
       "ClientSecret": "",
       "Version": 22
+    },
+    "Weixin": {
+      "AppId": "",
+      "AppSecret": ""
     }
   },