Revize 5a0687b9

Merged ad-auth with frontend

Leuze.sln

@@ -35 +35 @@
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Leuze.Tests.Core.Domain", "tests\Core\Leuze.Tests.Core.Domain\Leuze.Tests.Core.Domain.csproj", "{8ECAEA01-61F3-402D-B94E-E54FC0C94C8E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Leuze.Core.Infrastructure.ActiveDirectory", "src\Core\Infrastructure\Leuze.Core.Infrastructure.ActiveDirectory\Leuze.Core.Infrastructure.ActiveDirectory.csproj", "{1407144F-48F6-404E-A890-961B739D030D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Leuze.Core.Infrastructure.ActiveDirectory", "src\Core\Infrastructure\Leuze.Core.Infrastructure.ActiveDirectory\Leuze.Core.Infrastructure.ActiveDirectory.csproj", "{1407144F-48F6-404E-A890-961B739D030D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Leuze.Tests.Core.Infrastructure.ActiveDirectory", "tests\Core\Leuze.Tests.Core.Infrastructure.ActiveDirectory\Leuze.Tests.Core.Infrastructure.ActiveDirectory.csproj", "{C1813611-5FF2-4E70-B7E5-A4E8553F0B66}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Leuze.Tests.Core.Infrastructure.ActiveDirectory", "tests\Core\Leuze.Tests.Core.Infrastructure.ActiveDirectory\Leuze.Tests.Core.Infrastructure.ActiveDirectory.csproj", "{C1813611-5FF2-4E70-B7E5-A4E8553F0B66}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/Core/Application/Leuze.Core.Application.UI/App.razor

@@ -1 +1 @@
 @using System.Reflection
 @using ExtCore.Infrastructure
-
-<Router AppAssembly="@typeof(CoreUIExtension).Assembly" AdditionalAssemblies="LoadAdditionalAssemblies">
-    <Found Context="routeData">
-        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
-    </Found>
-    <NotFound>
-        <LayoutView Layout="@typeof(MainLayout)">
-            <p>Sorry, there's nothing at this address.</p>
-        </LayoutView>
-    </NotFound>
-</Router>
+<CascadingAuthenticationState>
+    <Router AppAssembly="@typeof(CoreUIExtension).Assembly" AdditionalAssemblies="LoadAdditionalAssemblies">
+        <Found Context="routeData">
+            <AuthorizeRouteView RouteData="@routeData"/>
+        </Found>
+        <NotFound>
+            <LayoutView Layout="@typeof(MainLayout)">
+                <p>Sorry, there's nothing at this address.</p>
+            </LayoutView>
+        </NotFound>
+    </Router>
+</CascadingAuthenticationState>
 
 @code {
     public IEnumerable<Assembly> LoadAdditionalAssemblies { get; set; } = null!;

src/Core/Application/Leuze.Core.Application.UI/Pages/Index.razor

@@ -1 +1 @@
 @page "/"
+@layout MainLayout
 
 <h1>Hello, world!</h1>
 

src/Core/Application/Leuze.Core.Application.UI/Shared/MainLayout.razor

@@ -1 +1 @@
 @inherits LayoutComponentBase
+@inject NavigationManager _navManager
 <div class="top-row px-4">
-    <img src="Resources/Icons/logo.svg" alt="logo" style="width:111px;height:28px;">
-    <img src="Resources/Icons/sign-out.svg" style="width:18px;height:20px;">
-
+    <img src="Resources/Icons/logo.svg" alt="logo" style="width:111px;height:28px;"/>
+    <img src="Resources/Icons/sign-out.svg" style="width:18px;height:20px;"/>
 </div>
-    <div class="page">  
-        <div class="sidebar">
-            <NavMenu />
-        </div>
+
+
+<div class="page">
+    <div class="sidebar">
+        <NavMenu />
+    </div>
 
         <div class="main">
             <div class="content px-4">
@@ -15 +17 @@
             </div>
         </div>
     </div>
+
+@code {
+
+    /*protected override void OnAfterRender(bool firstRender)
+    {
+        base.OnAfterRender(firstRender);
+        if (firstRender) _navManager.NavigateTo("account/login");
+    }*/
+}

src/Core/Application/Leuze.Core.Application.UI/_Imports.razor

@@ -7 +7 @@
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.JSInterop
 @using Leuze.Core.Application.UI.Shared
-@using Leuze.Core.Application.UI.Components.Login
-@using BlazorStyled 
+@using BlazorStyled
+@using Microsoft.AspNetCore.Authentication
+@using Microsoft.AspNetCore.Identity
+@using Leuze.Core.Application.Identity 
+@using Leuze.Core.Application.UI.Components.Login

src/Core/Application/Leuze.Core.Application/Configuration/Actions.cs

@@ -4 +4 @@
 using FluentValidation;
 using Leuze.Core.Application.Behaviors;
 using MediatR;
+using Microsoft.Identity.Web;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
@@ -11 +12 @@
 using Microsoft.Extensions.Hosting;
 using System;
 using System.Linq;
+using Microsoft.AspNetCore.Authentication.OpenIdConnect;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc.Authorization;
+using Microsoft.Identity.Web.UI;
 
 namespace Leuze.Core.Application.Configuration
 {
@@ -74 +79 @@
         /// <param name="serviceProvider"></param>
         public void Execute(IServiceCollection services, IServiceProvider serviceProvider)
         {
+            var configuration = serviceProvider.GetRequiredService<IConfiguration>();
             services.AddAutoMapper(ExtensionManager.Assemblies);
             services.AddValidatorsFromAssemblies(ExtensionManager.Assemblies);
             services.AddMediatR(ExtensionManager.Assemblies.ToArray());
@@ -85 +91 @@
             appSettingsSection.Bind(appSettings);
             services.Configure<AppSettings>(appSettingsSection);
 
-            services.AddBlazorStyled();
+            services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
+                .AddMicrosoftIdentityWebApp(configuration.GetSection("AzureAd"));
+            services.AddControllersWithViews()
+                .AddMicrosoftIdentityUI();
+
+            services.AddAuthorization();
             services.AddRazorPages();
-            services.AddServerSideBlazor();
+            services.AddServerSideBlazor()
+                .AddMicrosoftIdentityConsentHandler();
+            services.AddBlazorStyled();
         }
     }
 }

src/Core/Application/Leuze.Core.Application/Leuze.Core.Application.csproj

@@ -35 +35 @@
     <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="9.5.2" />
     <PackageReference Include="MediatR" Version="9.0.0" />
     <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="5.0.5" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="1.8.2" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="1.8.2" />
   </ItemGroup>
 
   <ItemGroup>

src/Presentation/Leuze.App/Leuze.App.csproj

@@ -17 +17 @@
     <DocumentationFile>..\..\..\docs\Leuze.App.xml</DocumentationFile>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Content Remove="wwwroot\Resources\Icons\microsoft-logo.svg" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="wwwroot\Resources\Icons\microsoft-logo.svg" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.4">
       <PrivateAssets>all</PrivateAssets>

src/Presentation/Leuze.App/appsettings.Development.json

@@ -3 +3 @@
     "Path": "..\\Leuze.Modules\\net5.0",
     "IncludeSubPaths": false
   },
+  "AzureAd": {
+    "Instance": "https://login.microsoftonline.com/",
+    "Domain": "silentindustries.onmicrosoft.com",
+    "TenantId": "8320026e-f0c8-4609-ac9e-52b0e2bb6029",
+    "ClientId": "7be51083-d17e-4916-984e-8567b8137365",
+    "CallbackPath": "/signin-oidc"
+  },
   "AppSettings": {
     "DatabaseConnection": {
       "ConnectionString": "Server=localhost;Database=Leuze_Local;User Id=sa;Password=LeuzeDB01;",

src/Presentation/Leuze.App/appsettings.json

@@ -3 +3 @@
     "Path": "..\\Leuze.Modules\\net5.0",
     "IncludeSubPaths": false
   },
+  "AzureAd": {
+    "Instance": "https://login.microsoftonline.com/",
+    "Domain": "silentindustries.onmicrosoft.com",
+    "TenantId": "8320026e-f0c8-4609-ac9e-52b0e2bb6029",
+    "ClientId": "7be51083-d17e-4916-984e-8567b8137365",
+    "CallbackPath": "/signin-oidc"
+  },
   "AppSettings": {
     "DatabaseConnection": {
       "ConnectionString": "Server=localhost;Database=Leuze_Local;User Id=sa;Password=LeuzeDB01;",