From bd7915cbad6346397b762a2016e6257386134432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sun, 30 Aug 2020 19:33:47 +0300
Subject: [PATCH] Created Volo.Abp.Identity.Blazor package. Moved
 usermanagement to this package.

---
 modules/identity/.gitignore                   |  4 +++
 modules/identity/Volo.Abp.Identity.sln        | 15 +++++++---
 .../AbpIdentityBlazorModule.cs                | 12 ++++++++
 .../Volo.Abp.Identity.Blazor/FodyWeavers.xml  |  3 ++
 .../Volo.Abp.Identity.Blazor/FodyWeavers.xsd  | 30 +++++++++++++++++++
 .../Pages/UserManagement.razor                |  2 +-
 .../Pages/UserManagement.razor.cs             |  3 +-
 .../Volo.Abp.Identity.Blazor.csproj           | 20 +++++++++++++
 .../Volo.Abp.Identity.Blazor/_Imports.razor   |  1 +
 nupkg/common.ps1                              |  1 +
 .../App.razor                                 |  4 ++-
 .../MyCompanyName.MyProjectName.Blazor.csproj |  4 +++
 .../MyProjectNameBlazorModule.cs              |  4 ++-
 .../_Imports.razor                            |  1 +
 14 files changed, 95 insertions(+), 9 deletions(-)
 create mode 100644 modules/identity/.gitignore
 create mode 100644 modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs
 create mode 100644 modules/identity/src/Volo.Abp.Identity.Blazor/FodyWeavers.xml
 create mode 100644 modules/identity/src/Volo.Abp.Identity.Blazor/FodyWeavers.xsd
 rename {templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor => modules/identity/src/Volo.Abp.Identity.Blazor}/Pages/UserManagement.razor (90%)
 rename {templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor => modules/identity/src/Volo.Abp.Identity.Blazor}/Pages/UserManagement.razor.cs (87%)
 create mode 100644 modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.csproj
 create mode 100644 modules/identity/src/Volo.Abp.Identity.Blazor/_Imports.razor

diff --git a/modules/identity/.gitignore b/modules/identity/.gitignore
new file mode 100644
index 0000000000..dcd876a3c7
--- /dev/null
+++ b/modules/identity/.gitignore
@@ -0,0 +1,4 @@
+src/Volo.Abp.Identity.HttpApi/Properties/launchSettings.json
+src/Volo.Abp.Identity.Web/Properties/launchSettings.json
+test/Volo.Abp.Identity.AspNetCore.Tests/Properties/launchSettings.json
+src/Volo.Abp.Identity.AspNetCore/Properties/launchSettings.json
diff --git a/modules/identity/Volo.Abp.Identity.sln b/modules/identity/Volo.Abp.Identity.sln
index 388cd0c555..23336bdc02 100644
--- a/modules/identity/Volo.Abp.Identity.sln
+++ b/modules/identity/Volo.Abp.Identity.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27428.1
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30413.136
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AADC5A0A-F100-4511-87DE-B74E55F5B69B}"
 EndProject
@@ -37,9 +37,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Identity.Domain.Te
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Identity.AspNetCore", "src\Volo.Abp.Identity.AspNetCore\Volo.Abp.Identity.AspNetCore.csproj", "{D5EFC912-75A0-4856-9B8D-DFDD4CD66BAB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.PermissionManagement.Domain.Identity", "src\Volo.Abp.PermissionManagement.Domain.Identity\Volo.Abp.PermissionManagement.Domain.Identity.csproj", "{736F91E7-8A70-441B-89DE-0E29A348E718}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.PermissionManagement.Domain.Identity", "src\Volo.Abp.PermissionManagement.Domain.Identity\Volo.Abp.PermissionManagement.Domain.Identity.csproj", "{736F91E7-8A70-441B-89DE-0E29A348E718}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Identity.AspNetCore.Tests", "test\Volo.Abp.Identity.AspNetCore.Tests\Volo.Abp.Identity.AspNetCore.Tests.csproj", "{89C094EB-D80A-4976-9C10-7CE3EBEEE877}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Identity.AspNetCore.Tests", "test\Volo.Abp.Identity.AspNetCore.Tests\Volo.Abp.Identity.AspNetCore.Tests.csproj", "{89C094EB-D80A-4976-9C10-7CE3EBEEE877}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Identity.Blazor", "src\Volo.Abp.Identity.Blazor\Volo.Abp.Identity.Blazor.csproj", "{3F7BB653-3F3A-4889-B73C-E463F239099A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -115,6 +117,10 @@ Global
 		{89C094EB-D80A-4976-9C10-7CE3EBEEE877}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{89C094EB-D80A-4976-9C10-7CE3EBEEE877}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{89C094EB-D80A-4976-9C10-7CE3EBEEE877}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F7BB653-3F3A-4889-B73C-E463F239099A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F7BB653-3F3A-4889-B73C-E463F239099A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F7BB653-3F3A-4889-B73C-E463F239099A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F7BB653-3F3A-4889-B73C-E463F239099A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -137,6 +143,7 @@ Global
 		{D5EFC912-75A0-4856-9B8D-DFDD4CD66BAB} = {AADC5A0A-F100-4511-87DE-B74E55F5B69B}
 		{736F91E7-8A70-441B-89DE-0E29A348E718} = {AADC5A0A-F100-4511-87DE-B74E55F5B69B}
 		{89C094EB-D80A-4976-9C10-7CE3EBEEE877} = {9FACAF96-A681-4B36-A938-A37DCA0B7EC1}
+		{3F7BB653-3F3A-4889-B73C-E463F239099A} = {AADC5A0A-F100-4511-87DE-B74E55F5B69B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {05740D37-83CF-4041-9C2A-D89F1B3DB5A4}
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs
new file mode 100644
index 0000000000..7a74bc8673
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs
@@ -0,0 +1,12 @@
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.Identity.Blazor
+{
+    [DependsOn(
+        typeof(AbpIdentityHttpApiClientModule)
+        )]
+    public class AbpIdentityBlazorModule : AbpModule
+    {
+
+    }
+}
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/FodyWeavers.xml b/modules/identity/src/Volo.Abp.Identity.Blazor/FodyWeavers.xml
new file mode 100644
index 0000000000..be0de3a908
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
\ No newline at end of file
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/FodyWeavers.xsd b/modules/identity/src/Volo.Abp.Identity.Blazor/FodyWeavers.xsd
new file mode 100644
index 0000000000..3f3946e282
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/UserManagement.razor
similarity index 90%
rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/UserManagement.razor
rename to modules/identity/src/Volo.Abp.Identity.Blazor/Pages/UserManagement.razor
index 1de28d16e6..a18b56022f 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/UserManagement.razor
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/UserManagement.razor
@@ -4,7 +4,7 @@
 @using Microsoft.AspNetCore.Authorization
 @inject IIdentityUserAppService UserAppService
 
-<h1>UserManagement</h1>
+<h1>UserManagement (in the Identity Module)</h1>
 
 <button class="btn btn-primary" @onclick="GetUsersAsync">Get user list</button>
 
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/UserManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/UserManagement.razor.cs
similarity index 87%
rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/UserManagement.razor.cs
rename to modules/identity/src/Volo.Abp.Identity.Blazor/Pages/UserManagement.razor.cs
index 3b8552987f..b663b1b6be 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/UserManagement.razor.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/UserManagement.razor.cs
@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
-using Volo.Abp.Identity;
 
-namespace MyCompanyName.MyProjectName.Blazor.Pages
+namespace Volo.Abp.Identity.Blazor.Pages
 {
     public partial class UserManagement : ComponentBase
     {
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.csproj b/modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.csproj
new file mode 100644
index 0000000000..85bbf1a77c
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+  <Import Project="..\..\..\..\configureawait.props" />
+  <Import Project="..\..\..\..\common.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <RazorLangVersion>3.0</RazorLangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.7" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Volo.Abp.Identity.HttpApi.Client\Volo.Abp.Identity.HttpApi.Client.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/_Imports.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/_Imports.razor
new file mode 100644
index 0000000000..77285129da
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/_Imports.razor
@@ -0,0 +1 @@
+@using Microsoft.AspNetCore.Components.Web
diff --git a/nupkg/common.ps1 b/nupkg/common.ps1
index b1c5e1abd3..e39f02c919 100644
--- a/nupkg/common.ps1
+++ b/nupkg/common.ps1
@@ -208,6 +208,7 @@ $projects = (
     "modules/identity/src/Volo.Abp.Identity.HttpApi",
     "modules/identity/src/Volo.Abp.Identity.MongoDB",
     "modules/identity/src/Volo.Abp.Identity.Web",
+    "modules/identity/src/Volo.Abp.Identity.Blazor",
     "modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity",
     
     # modules/identityserver
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/App.razor b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/App.razor
index f96456573f..aca2f1c23c 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/App.razor
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/App.razor
@@ -1,7 +1,9 @@
 @using Volo.Abp.AspNetCore.Mvc.Client
 @inject ICachedApplicationConfigurationClient ConfigurationClient
 <CascadingAuthenticationState>
-    <Router AppAssembly="@typeof(Program).Assembly">
+    <Router 
+        AppAssembly="@typeof(Program).Assembly" 
+        AdditionalAssemblies="new []{ typeof(UserManagement).Assembly }">
         <Found Context="routeData">
             <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
                 <NotAuthorized>
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
index 7a20d1005e..268bd4a062 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
@@ -16,6 +16,10 @@
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Http.Client.IdentityModel.WebAssembly\Volo.Abp.Http.Client.IdentityModel.WebAssembly.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.Blazor\Volo.Abp.Identity.Blazor.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\MyCompanyName.MyProjectName.HttpApi.Client\MyCompanyName.MyProjectName.HttpApi.Client.csproj" />
   </ItemGroup>
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs
index cde615b593..459fede935 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs
@@ -6,6 +6,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Components.WebAssembly;
 using Volo.Abp.Autofac;
 using Volo.Abp.Http.Client.IdentityModel.WebAssembly;
+using Volo.Abp.Identity.Blazor;
 using Volo.Abp.Modularity;
 
 namespace MyCompanyName.MyProjectName.Blazor
@@ -14,7 +15,8 @@ namespace MyCompanyName.MyProjectName.Blazor
         typeof(AbpAutofacModule),
         typeof(MyProjectNameHttpApiClientModule),
         typeof(AbpHttpClientIdentityModelWebAssemblyModule),
-        typeof(AbpAspNetCoreComponentsWebAssemblyModule)
+        typeof(AbpAspNetCoreComponentsWebAssemblyModule),
+        typeof(AbpIdentityBlazorModule)
     )]
     public class MyProjectNameBlazorModule : AbpModule
     {
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor
index d65eae16bc..4ca212ca43 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor
@@ -7,3 +7,4 @@
 @using Microsoft.JSInterop
 @using MyCompanyName.MyProjectName.Blazor
 @using MyCompanyName.MyProjectName.Blazor.Shared
+@using Volo.Abp.Identity.Blazor.Pages
\ No newline at end of file