From 647cc252d4524e0283407888b61be91c0b2b01de Mon Sep 17 00:00:00 2001
From: Argo <argo@163.com>
Date: Tue, 14 Dec 2021 04:50:25 +0000
Subject: [PATCH] =?UTF-8?q?!93=20feat(#I4ME4A):=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=20*=20feat:=20=E5=A2=9E=E5=8A=A0=E6=A8=A1=E6=8B=9F?=
 =?UTF-8?q?=E8=B4=A6=E6=88=B7=E7=99=BB=E5=BD=95=E9=80=BB=E8=BE=91=20*=20fe?=
 =?UTF-8?q?at:=20=E5=A2=9E=E5=8A=A0=E8=AE=A4=E8=AF=81=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=20*=20feat:=20=E5=A2=9E=E5=8A=A0=E9=87=8D?=
 =?UTF-8?q?=E5=AE=9A=E5=90=91=E7=BB=84=E4=BB=B6=20*=20refactor:=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8E=E5=8F=B0=E6=96=87=E4=BB=B6=20*=20wi?=
 =?UTF-8?q?p:=20=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BootstrapAdmin-Blazor.slnf                    |  2 ++
 BootstrapAdmin.sln                            | 14 ++++++++++
 .../BootstrapAdmin.Web.Core.csproj            |  3 +-
 src/blazor/admin/BootstrapAdmin.Web/App.razor | 21 ++++++++------
 .../BootstrapAdmin.Web.csproj                 |  1 +
 .../Components/DictSearch.razor               | 11 --------
 .../Components/DictSearch.razor.cs            | 26 +++++++++++++++++
 .../Components/RedirectToLogin.cs             | 28 +++++++++++++++++++
 .../Extensions/ServicesExtensions.cs          |  5 ++++
 .../Services/RoleService.cs                   | 14 ++++++++++
 .../Shared/MainLayout.razor                   |  3 ++
 .../appsettings.Development.json              |  1 +
 .../appsettings.Development.json              |  1 +
 13 files changed, 109 insertions(+), 21 deletions(-)
 create mode 100644 src/blazor/admin/BootstrapAdmin.Web/Components/DictSearch.razor.cs
 create mode 100644 src/blazor/admin/BootstrapAdmin.Web/Components/RedirectToLogin.cs
 create mode 100644 src/blazor/admin/BootstrapAdmin.Web/Services/RoleService.cs

diff --git a/BootstrapAdmin-Blazor.slnf b/BootstrapAdmin-Blazor.slnf
index 94ec6aaa..2c0c0818 100644
--- a/BootstrapAdmin-Blazor.slnf
+++ b/BootstrapAdmin-Blazor.slnf
@@ -2,6 +2,8 @@
   "solution": {
     "path": "BootstrapAdmin.sln",
     "projects": [
+      "..\\..\\Longbow.Utility\\src\\Bootstrap.Security.Blazor\\Bootstrap.Security.Blazor.csproj",
+      "..\\BootstrapBlazor\\src\\BootstrapBlazor\\BootstrapBlazor.csproj",
       "src\\blazor\\admin\\BootstrapAdmin.DataAccess.EFCore\\BootstrapAdmin.DataAccess.EFCore.csproj",
       "src\\blazor\\admin\\BootstrapAdmin.DataAccess.Models\\BootstrapAdmin.DataAccess.Models.csproj",
       "src\\blazor\\admin\\BootstrapAdmin.DataAccess.PetaPoco\\BootstrapAdmin.DataAccess.PetaPoco.csproj",
diff --git a/BootstrapAdmin.sln b/BootstrapAdmin.sln
index 5b939a26..ddc49a5c 100644
--- a/BootstrapAdmin.sln
+++ b/BootstrapAdmin.sln
@@ -153,6 +153,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapAdmin.DataAccess.P
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapAdmin.Web.Core", "src\blazor\admin\BootstrapAdmin.Web.Core\BootstrapAdmin.Web.Core.csproj", "{DA143654-C258-410D-B5DC-FE446ED99CE4}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapBlazor", "..\BootstrapBlazor\src\BootstrapBlazor\BootstrapBlazor.csproj", "{02BC5E4F-83DF-4255-9831-41D7AE7D4DDC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bootstrap.Security.Blazor", "..\..\Longbow.Utility\src\Bootstrap.Security.Blazor\Bootstrap.Security.Blazor.csproj", "{A704A8DB-BB87-40DF-9F91-EFF21741BD88}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -215,6 +219,14 @@ Global
 		{DA143654-C258-410D-B5DC-FE446ED99CE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DA143654-C258-410D-B5DC-FE446ED99CE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DA143654-C258-410D-B5DC-FE446ED99CE4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{02BC5E4F-83DF-4255-9831-41D7AE7D4DDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{02BC5E4F-83DF-4255-9831-41D7AE7D4DDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{02BC5E4F-83DF-4255-9831-41D7AE7D4DDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{02BC5E4F-83DF-4255-9831-41D7AE7D4DDC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A704A8DB-BB87-40DF-9F91-EFF21741BD88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A704A8DB-BB87-40DF-9F91-EFF21741BD88}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A704A8DB-BB87-40DF-9F91-EFF21741BD88}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A704A8DB-BB87-40DF-9F91-EFF21741BD88}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -251,6 +263,8 @@ Global
 		{7E3861AB-F797-4A9F-B7CE-0E35751FFCD9} = {45ADEF9B-C8BD-4224-9E12-F6716E85A22C}
 		{20D03C52-0F8B-47B6-BCA8-CF0812F82722} = {45ADEF9B-C8BD-4224-9E12-F6716E85A22C}
 		{DA143654-C258-410D-B5DC-FE446ED99CE4} = {45ADEF9B-C8BD-4224-9E12-F6716E85A22C}
+		{02BC5E4F-83DF-4255-9831-41D7AE7D4DDC} = {45ADEF9B-C8BD-4224-9E12-F6716E85A22C}
+		{A704A8DB-BB87-40DF-9F91-EFF21741BD88} = {45ADEF9B-C8BD-4224-9E12-F6716E85A22C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {221EAE38-5F75-4391-9A48-E462A9F3B8FC}
diff --git a/src/blazor/admin/BootstrapAdmin.Web.Core/BootstrapAdmin.Web.Core.csproj b/src/blazor/admin/BootstrapAdmin.Web.Core/BootstrapAdmin.Web.Core.csproj
index effd4d28..e9a432df 100644
--- a/src/blazor/admin/BootstrapAdmin.Web.Core/BootstrapAdmin.Web.Core.csproj
+++ b/src/blazor/admin/BootstrapAdmin.Web.Core/BootstrapAdmin.Web.Core.csproj
@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="BootstrapBlazor" Version="6.1.1-beta03" />
+    <!--<PackageReference Include="BootstrapBlazor" Version="6.1.1-beta03" />-->
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\BootstrapBlazor\src\BootstrapBlazor\BootstrapBlazor.csproj" />
     <ProjectReference Include="..\BootstrapAdmin.DataAccess.Models\BootstrapAdmin.DataAccess.Models.csproj" />
   </ItemGroup>
 
diff --git a/src/blazor/admin/BootstrapAdmin.Web/App.razor b/src/blazor/admin/BootstrapAdmin.Web/App.razor
index b9431eaf..0b03bb99 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/App.razor
+++ b/src/blazor/admin/BootstrapAdmin.Web/App.razor
@@ -1,11 +1,14 @@
 <BootstrapBlazorRoot>
-    <Router AppAssembly="@typeof(App).Assembly">
-        <Found Context="routeData">
-            <PageTitle>@Title</PageTitle>
-            <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
-        </Found>
-        <NotFound>
-            <LayoutView Layout="@typeof(NotFoundLayout)" />
-        </NotFound>
-    </Router>
+    <CascadingAuthenticationState>
+        <Router AppAssembly="@typeof(App).Assembly">
+            <Found Context="routeData">
+                <PageTitle>@Title</PageTitle>
+                <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
+                </AuthorizeRouteView>
+            </Found>
+            <NotFound>
+                <LayoutView Layout="@typeof(NotFoundLayout)" />
+            </NotFound>
+        </Router>
+    </CascadingAuthenticationState>
 </BootstrapBlazorRoot>
diff --git a/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.csproj b/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.csproj
index 38f9a134..7428b042 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.csproj
+++ b/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.csproj
@@ -5,6 +5,7 @@
   </PropertyGroup>
   
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\..\Longbow.Utility\src\Bootstrap.Security.Blazor\Bootstrap.Security.Blazor.csproj" />
     <ProjectReference Include="..\BootstrapAdmin.DataAccess.EFCore\BootstrapAdmin.DataAccess.EFCore.csproj" />
     <ProjectReference Include="..\BootstrapAdmin.DataAccess.PetaPoco\BootstrapAdmin.DataAccess.PetaPoco.csproj" />
   </ItemGroup>
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Components/DictSearch.razor b/src/blazor/admin/BootstrapAdmin.Web/Components/DictSearch.razor
index e09a4e40..324fddde 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/Components/DictSearch.razor
+++ b/src/blazor/admin/BootstrapAdmin.Web/Components/DictSearch.razor
@@ -12,14 +12,3 @@
         <Select Items="@Items" @bind-Value="Value.Define" ShowLabel="true" />
     </div>
 </div>
-
-@code {
-    private IEnumerable<SelectedItem>? Items { get; set; } = typeof(EnumDictDefine).ToSelectList(new SelectedItem("", "全部"));
-
-    [Parameter]
-    [NotNull]
-    public DictsSearchModel? Value { get; set; }
-
-    [Parameter]
-    public EventCallback<DictsSearchModel> ValueChanged { get; set; }
-}
\ No newline at end of file
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Components/DictSearch.razor.cs b/src/blazor/admin/BootstrapAdmin.Web/Components/DictSearch.razor.cs
new file mode 100644
index 00000000..649971cb
--- /dev/null
+++ b/src/blazor/admin/BootstrapAdmin.Web/Components/DictSearch.razor.cs
@@ -0,0 +1,26 @@
+using BootstrapAdmin.DataAccess.Models;
+using BootstrapAdmin.Web.Models;
+
+namespace BootstrapAdmin.Web.Components
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public partial class DictSearch
+    {
+        private IEnumerable<SelectedItem>? Items { get; set; } = typeof(EnumDictDefine).ToSelectList(new SelectedItem("", "全部"));
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [Parameter]
+        [NotNull]
+        public DictsSearchModel? Value { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [Parameter]
+        public EventCallback<DictsSearchModel> ValueChanged { get; set; }
+    }
+}
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Components/RedirectToLogin.cs b/src/blazor/admin/BootstrapAdmin.Web/Components/RedirectToLogin.cs
new file mode 100644
index 00000000..964a09dd
--- /dev/null
+++ b/src/blazor/admin/BootstrapAdmin.Web/Components/RedirectToLogin.cs
@@ -0,0 +1,28 @@
+namespace BootstrapAdmin.Web.Components
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class RedirectToLogin : ComponentBase
+    {
+        [Inject]
+        [NotNull]
+        private NavigationManager? Navigation { get; set; }
+
+#if DEBUG
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="firstRender"></param>
+        protected override void OnAfterRender(bool firstRender)
+        {
+            Navigation.NavigateTo($"/Account/Login", true);
+        }
+#else
+        protected override void OnInitialized()
+        {
+            Navigation.NavigateTo($"/Account/Login", true);
+        }
+#endif
+    }
+}
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServicesExtensions.cs b/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServicesExtensions.cs
index 6ab0fa7b..2dd0dda0 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServicesExtensions.cs
+++ b/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServicesExtensions.cs
@@ -1,4 +1,6 @@
 using BootstrapAdmin.Web.Services;
+using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Components.Authorization;
 using System.Text;
 
 namespace Microsoft.Extensions.DependencyInjection
@@ -61,6 +63,9 @@ namespace Microsoft.Extensions.DependencyInjection
             // 增加 BootstrapBlazor 组件
             services.AddBootstrapBlazor();
 
+            // 增加认证授权服务
+            services.AddBootstrapAdminAuthentication<RoleService>();
+
             // 增加 BootstrapApp 上下文服务
             services.AddSingleton<BootstrapAppContext>();
 
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Services/RoleService.cs b/src/blazor/admin/BootstrapAdmin.Web/Services/RoleService.cs
new file mode 100644
index 00000000..2d714784
--- /dev/null
+++ b/src/blazor/admin/BootstrapAdmin.Web/Services/RoleService.cs
@@ -0,0 +1,14 @@
+using Bootstrap.Security.Blazor;
+
+namespace BootstrapAdmin.Web.Services
+{
+    class RoleService : IRoleService
+    {
+        /// <summary>
+        /// 通过当前登录用户名获取角色集合方法
+        /// </summary>
+        /// <param name="userName"></param>
+        /// <returns></returns>
+        public List<string> GetRolesByUserName(string userName) => new List<string>() { "Administrators" };
+    }
+}
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Shared/MainLayout.razor b/src/blazor/admin/BootstrapAdmin.Web/Shared/MainLayout.razor
index dae2155e..17f17220 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/Shared/MainLayout.razor
+++ b/src/blazor/admin/BootstrapAdmin.Web/Shared/MainLayout.razor
@@ -30,4 +30,7 @@
     <Footer>
         <div class="flex-fill text-center text-dark">Bootstrap Admin Blazor 版 &copy;</div>
     </Footer>
+    <NotAuthorized>
+        <RedirectToLogin />
+    </NotAuthorized>
 </Layout>
diff --git a/src/blazor/admin/BootstrapAdmin.Web/appsettings.Development.json b/src/blazor/admin/BootstrapAdmin.Web/appsettings.Development.json
index 02a4aec5..b4b6e31e 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/appsettings.Development.json
+++ b/src/blazor/admin/BootstrapAdmin.Web/appsettings.Development.json
@@ -1,5 +1,6 @@
 {
   "DetailedErrors": true,
+  "SimulateUserName": "Admin",
   "AutoGenerateDatabase": true,
   "DB": [
     {
diff --git a/src/mvc/admin/Bootstrap.Admin/appsettings.Development.json b/src/mvc/admin/Bootstrap.Admin/appsettings.Development.json
index f17c4800..40780ff4 100644
--- a/src/mvc/admin/Bootstrap.Admin/appsettings.Development.json
+++ b/src/mvc/admin/Bootstrap.Admin/appsettings.Development.json
@@ -21,6 +21,7 @@
       "Url": "https://client.blazor.zone/api/Interface/Log"
     }
   },
+  "SimulateUserName": "Admin",
   "AutoGenerateDatabase": true,
   "DB": [
     {