Merge pull request #44 from linianhui/upgrade-package

linianhui · web-flow · commit c9db42cc6f21 · 2021-05-22T22:10:22.000+08:00
Upgrade package
diff --git a/1-src/web.oauth2.client.aspnetcore/Views/Shared/_Layout.cshtml b/1-src/web.oauth2.client.aspnetcore/Views/Shared/_Layout.cshtml
@@ -1,4 +1,4 @@
-﻿<!DOCTYPE html>
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8" />
@@ -8,8 +8,8 @@
     <header>
         <nav>
             @if (this.User != null
-               && this.User.Identity != null
-               && this.User.Identity.IsAuthenticated == true)
+             && this.User.Identity != null
+             && this.User.Identity.IsAuthenticated == true)
             {
                 @Html.RouteLink("Logout", "account-logout")
             }
@@ -19,11 +19,35 @@
                 <br />
                 @Html.RouteLink("Login (QQ Mobile)", "account-login", new { idp = "qq", returnUri = this.Context.Request.Path.Value, isMobile = true })
                 <br />
-                @Html.RouteLink("Login (Github)", "account-login", new { idp = "github", returnUri = this.Context.Request.Path.Value})
+                @Html.RouteLink("Login (Github)", "account-login", new { idp = "github", returnUri = this.Context.Request.Path.Value })
             }
         </nav>
     </header>
     <br />
     @RenderBody()
+    <footer>
+        @{ var OSArchitecture = System.Runtime.InteropServices.RuntimeInformation.OSArchitecture.ToString();
+            var OSDescription = System.Runtime.InteropServices.RuntimeInformation.OSDescription;
+            var ProcessArchitecture = System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture.ToString();
+            var FrameworkDescription = System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription; }
+        <br />
+        <table>
+            <tr>
+                <td colspan="2">Runtime Info</td>
+            </tr>
+            <tr>
+                <td>OS</td>
+                <td>@OSDescription @OSArchitecture</td>
+            </tr>
+            <tr>
+                <td>CPU</td>
+                <td>@ProcessArchitecture</td>
+            </tr>
+            <tr>
+                <td>Framework</td>
+                <td>@FrameworkDescription</td>
+            </tr>
+        </table>
+    </footer>
 </body>
-</html>
+</html>
diff --git a/1-src/web.oidc.client.hybrid/Views/Shared/_Layout.cshtml b/1-src/web.oidc.client.hybrid/Views/Shared/_Layout.cshtml
@@ -1,4 +1,4 @@
-﻿@using Microsoft.AspNetCore.Http.Extensions
+@using Microsoft.AspNetCore.Http.Extensions
 <!DOCTYPE html>
 <html>
 <head>
@@ -9,8 +9,8 @@
     <header>
         <nav>
             @if (this.User != null
-              && this.User.Identity != null
-              && this.User.Identity.IsAuthenticated == true)
+            && this.User.Identity != null
+            && this.User.Identity.IsAuthenticated == true)
             {
                 @Html.RouteLink("Logout", "account-logout")
             }
@@ -26,5 +26,30 @@
     </header>
     <br />
     @RenderBody()
+
+    <footer>
+        @{ var OSArchitecture = System.Runtime.InteropServices.RuntimeInformation.OSArchitecture.ToString();
+            var OSDescription = System.Runtime.InteropServices.RuntimeInformation.OSDescription;
+            var ProcessArchitecture = System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture.ToString();
+            var FrameworkDescription = System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription; }
+        <br />
+        <table>
+            <tr>
+                <td colspan="2">Runtime Info</td>
+            </tr>
+            <tr>
+                <td>OS</td>
+                <td>@OSDescription @OSArchitecture</td>
+            </tr>
+            <tr>
+                <td>CPU</td>
+                <td>@ProcessArchitecture</td>
+            </tr>
+            <tr>
+                <td>Framework</td>
+                <td>@FrameworkDescription</td>
+            </tr>
+        </table>
+    </footer>
 </body>
-</html>
+</html>
diff --git a/1-src/web.oidc.server.ids4/Views/Shared/_Layout.cshtml b/1-src/web.oidc.server.ids4/Views/Shared/_Layout.cshtml
@@ -1,4 +1,4 @@
-﻿<!DOCTYPE html>
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8" />
@@ -8,5 +8,30 @@
     <div>
         @RenderBody()
     </div>
+    <footer>
+        @{
+            var OSArchitecture = System.Runtime.InteropServices.RuntimeInformation.OSArchitecture.ToString();
+            var OSDescription = System.Runtime.InteropServices.RuntimeInformation.OSDescription;
+            var ProcessArchitecture = System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture.ToString();
+            var FrameworkDescription = System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription; }
+        <br/>
+        <table>
+            <tr>
+                <td colspan="2">Runtime Info</td>
+            </tr>
+            <tr>
+                <td>OS</td>
+                <td>@OSDescription @OSArchitecture</td>
+            </tr>
+            <tr>
+                <td>CPU</td>
+                <td>@ProcessArchitecture</td>
+            </tr>
+            <tr>
+                <td>Framework</td>
+                <td>@FrameworkDescription</td>
+            </tr>
+        </table>
+    </footer>
 </body>
 </html>
diff --git a/1-src/web.oidc.server.ids4/web.oidc.server.ids4.csproj b/1-src/web.oidc.server.ids4/web.oidc.server.ids4.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IdentityServer4" Version="4.1.1" />
+    <PackageReference Include="IdentityServer4" Version="4.1.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/1-src/wpf.oidc.client.authorization-code/Main.xaml.cs b/1-src/wpf.oidc.client.authorization-code/Main.xaml.cs
@@ -1,5 +1,4 @@
 using System.Windows;
-using Newtonsoft.Json;
 using WPFClient.Models;
 using WPFClient.Oidc;
 
@@ -44,11 +43,13 @@ private TokenModel GetTokenModel()
                 return new TokenModel();
             }
 
+            var json= token.RootElement;
+
             return new TokenModel
             {
-                Token = token.ToString(Formatting.Indented),
-                IdToken = JwtModel.From(token.Value<string>("id_token")),
-                AccessToken = JwtModel.From(token.Value<string>("access_token")),
+                Token = json.ToString(),
+                IdToken = JwtModel.From(json.GetProperty("id_token").GetString()),
+                AccessToken = JwtModel.From(json.GetProperty("access_token").GetString()),
             };
         }
     }
diff --git a/1-src/wpf.oidc.client.authorization-code/Models/JwtModel.cs b/1-src/wpf.oidc.client.authorization-code/Models/JwtModel.cs
@@ -1,5 +1,5 @@
-﻿using Newtonsoft.Json;
 using System.IdentityModel.Tokens.Jwt;
+using System.Text.Json;
 
 namespace WPFClient.Models
 {
@@ -13,7 +13,10 @@ public class JwtModel
 
         public override string ToString()
         {
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
+            return JsonSerializer.Serialize(this, new JsonSerializerOptions
+            {
+                WriteIndented = true
+            });
         }
 
         public static JwtModel From(string jwtString)
diff --git a/1-src/wpf.oidc.client.authorization-code/Oidc/TokenFile.cs b/1-src/wpf.oidc.client.authorization-code/Oidc/TokenFile.cs
@@ -1,18 +1,18 @@
-﻿using Newtonsoft.Json.Linq;
 using System;
 using System.IO;
+using System.Text.Json;
 
 namespace WPFClient.Oidc
 {
     public static class TokenFile
     {
         private static string TokenFilePath => Environment.CurrentDirectory + "/token.json";
 
-        public static JObject Read()
+        public static JsonDocument Read()
         {
             if (File.Exists(TokenFilePath))
             {
-                return JObject.Parse(File.ReadAllText(TokenFilePath));
+                return JsonDocument.Parse(File.ReadAllText(TokenFilePath));
             }
 
             return null;
diff --git a/1-src/wpf.oidc.client.authorization-code/wpf.oidc.client.authorization-code.csproj b/1-src/wpf.oidc.client.authorization-code/wpf.oidc.client.authorization-code.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.7.1" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.11.1" />
+    <PackageReference Include="System.Text.Json" Version="5.0.2" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Windows;`
`2`		`-using Newtonsoft.Json;`
`3`	`2`	`using WPFClient.Models;`
`4`	`3`	`using WPFClient.Oidc;`
`5`	`4`
`@@ -44,11 +43,13 @@ private TokenModel GetTokenModel()`
`44`	`43`	`return new TokenModel();`
`45`	`44`	`}`
`46`	`45`
	`46`	`+ var json= token.RootElement;`
	`47`	`+`
`47`	`48`	`return new TokenModel`
`48`	`49`	`{`
`49`		`- Token = token.ToString(Formatting.Indented),`
`50`		`- IdToken = JwtModel.From(token.Value<string>("id_token")),`
`51`		`- AccessToken = JwtModel.From(token.Value<string>("access_token")),`
	`50`	`+ Token = json.ToString(),`
	`51`	`+ IdToken = JwtModel.From(json.GetProperty("id_token").GetString()),`
	`52`	`+ AccessToken = JwtModel.From(json.GetProperty("access_token").GetString()),`
`52`	`53`	`};`
`53`	`54`	`}`
`54`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-using Newtonsoft.Json;`
`2`	`1`	`using System.IdentityModel.Tokens.Jwt;`
	`2`	`+using System.Text.Json;`
`3`	`3`
`4`	`4`	`namespace WPFClient.Models`
`5`	`5`	`{`
`@@ -13,7 +13,10 @@ public class JwtModel`
`13`	`13`
`14`	`14`	`public override string ToString()`
`15`	`15`	`{`
`16`		`- return JsonConvert.SerializeObject(this, Formatting.Indented);`
	`16`	`+ return JsonSerializer.Serialize(this, new JsonSerializerOptions`
	`17`	`+ {`
	`18`	`+ WriteIndented = true`
	`19`	`+ });`
`17`	`20`	`}`
`18`	`21`
`19`	`22`	`public static JwtModel From(string jwtString)`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,18 @@`
`1`		`-using Newtonsoft.Json.Linq;`
`2`	`1`	`using System;`
`3`	`2`	`using System.IO;`
	`3`	`+using System.Text.Json;`
`4`	`4`
`5`	`5`	`namespace WPFClient.Oidc`
`6`	`6`	`{`
`7`	`7`	`public static class TokenFile`
`8`	`8`	`{`
`9`	`9`	`private static string TokenFilePath => Environment.CurrentDirectory + "/token.json";`
`10`	`10`
`11`		`- public static JObject Read()`
	`11`	`+ public static JsonDocument Read()`
`12`	`12`	`{`
`13`	`13`	`if (File.Exists(TokenFilePath))`
`14`	`14`	`{`
`15`		`- return JObject.Parse(File.ReadAllText(TokenFilePath));`
	`15`	`+ return JsonDocument.Parse(File.ReadAllText(TokenFilePath));`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`return null;`