refactor(AuthController): Die Nullbarkeit in TryGet Methoden wurde entfernt.

- `~/login` zu `login` und `~/{consumerRoute}/login` zu `{consumerRoute}/login` geändert.

src/DigitalData.Auth.API/Controllers/AuthController.cs

@@ -1,18 +1,15 @@
 using DigitalData.Auth.API.Config;
 using DigitalData.Core.Abstractions.Security;
-using DigitalData.UserManager.Domain.Entities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using System.Security.Claims;
-using System.IdentityModel.Tokens.Jwt;
 using DigitalData.UserManager.Application.DTOs.Auth;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.User;
 using DigitalData.Core.Abstractions.Application;
-using System.Net;
 using DigitalData.Auth.API.Dto;
 using DigitalData.Auth.API.Services.Contracts;
+using DigitalData.Auth.API.Entities;
 
 namespace DigitalData.Auth.API.Controllers
 {
@@ -50,22 +47,17 @@ namespace DigitalData.Auth.API.Controllers
 
         private async Task<IActionResult> CreateTokenAsync(LogInDto login, string consumerRoute, bool cookie = true)
         {
-            bool isValid = _dirSearchService.ValidateCredentials(login.Username, login.Password);
+            bool isValid = await _dirSearchService.ValidateCredentialsAsync(login.Username, login.Password);
 
             if (!isValid)
                 return Unauthorized();
 
             //find the user
             var uRes = await _userService.ReadByUsernameAsync(login.Username);
-            if (!uRes.IsSuccess || uRes.Data is null)
+            if (uRes.IsFailed || !_apiParams.Consumers.TryGetByRoute(consumerRoute, out var consumer))
-            {
-                return Unauthorized();
-            }
-
-            if (!_apiParams.Consumers.TryGetByRoute(consumerRoute, out var consumer))
                 return Unauthorized();
 
-            if (!_cryptoFactory.TokenDescriptors.TryGet(_apiParams.Issuer, consumer.Audience, out var descriptor) || descriptor is null)
+            if (!_cryptoFactory.TokenDescriptors.TryGet(_apiParams.Issuer, consumer.Audience, out var descriptor))
                 return StatusCode(StatusCodes.Status500InternalServerError);
 
             var token = _userSignatureHandler.WriteToken(uRes.Data, descriptor);
@@ -87,10 +79,10 @@ namespace DigitalData.Auth.API.Controllers
             if (api is null || api.Password != login.Password)
                 return Unauthorized();
     
-            if (!_cryptoFactory.TokenDescriptors.TryGet(_apiParams.Issuer, _apiParams.DefaultConsumer.Audience, out var descriptor) || descriptor is null)
+            if (!_cryptoFactory.TokenDescriptors.TryGet(_apiParams.Issuer, _apiParams.DefaultConsumer.Audience, out var descriptor))
                 return StatusCode(StatusCodes.Status500InternalServerError);
 
-            var token = _apiSignatureHandler!.WriteToken(api, descriptor);
+            var token = _apiSignatureHandler.WriteToken(api, descriptor);
 
             //set cookie
             if (cookie)
@@ -103,7 +95,7 @@ namespace DigitalData.Auth.API.Controllers
         }
 
         //TODO: Add role depends on group name
-        [HttpPost("~/{consumerRoute}/login")]
+        [HttpPost("{consumerRoute}/login")]
         [AllowAnonymous]
         public async Task<IActionResult> Login([FromForm] LogInDto login, [FromRoute] string consumerRoute)
         {
@@ -118,7 +110,7 @@ namespace DigitalData.Auth.API.Controllers
             }
         }
 
-        [HttpPost("~/login")]
+        [HttpPost("login")]
         [AllowAnonymous]
         public async Task<IActionResult> Login([FromForm] ConsumerApiLogin login)
         {
@@ -162,7 +154,7 @@ namespace DigitalData.Auth.API.Controllers
             }
         }
 
-        [HttpPost()]
+        [HttpPost]
         public async Task<IActionResult> CreateTokenViaBody([FromBody] ConsumerApiLogin login, [FromQuery] bool cookie = false)
         {
             try

src/DigitalData.Auth.API/DigitalData.Auth.API.csproj

@@ -10,14 +10,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.1.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.2.0" />
+    <PackageReference Include="DigitalData.Core.Application" Version="3.2.0" />
     <PackageReference Include="DigitalData.Core.Security" Version="1.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.12" />
     <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.3.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
-    <PackageReference Include="UserManager.Application" Version="3.1.0" />
+    <PackageReference Include="UserManager.Application" Version="3.1.2" />
-    <PackageReference Include="UserManager.Domain" Version="3.0.0" />
+    <PackageReference Include="UserManager.Domain" Version="3.0.1" />
-    <PackageReference Include="UserManager.Infrastructure" Version="3.0.0" />
+    <PackageReference Include="UserManager.Infrastructure" Version="3.0.1" />
   </ItemGroup>
 
 </Project>

src/DigitalData.Auth.API/Entities/ConsumerApi.cs

@@ -1,4 +1,4 @@
-namespace DigitalData.Auth.API.Dto
+namespace DigitalData.Auth.API.Entities
 {
     public record ConsumerApi(string Name, string Password);
 }

src/DigitalData.Auth.API/Program.cs

@@ -1,11 +1,12 @@
 using DigitalData.Auth.API.Config;
-using DigitalData.Auth.API.Dto;
+using DigitalData.Auth.API.Entities;
 using DigitalData.Auth.API.Services;
 using DigitalData.Core.Abstractions.Security;
 using DigitalData.Core.Application;
 using DigitalData.Core.Security;
 using DigitalData.UserManager.Application;
 using DigitalData.UserManager.Application.DTOs.User;
+using DigitalData.UserManager.Application.Services;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.IdentityModel.JsonWebTokens;
 using Microsoft.IdentityModel.Tokens;
@@ -14,7 +15,7 @@ using System.Security.Claims;
 
 var builder = WebApplication.CreateBuilder(args);
 
-builder.Configuration.AddJsonFile("consumer-api.json", true, true);
+builder.Configuration.AddJsonFile("consumers-api.json", true, true);
 
 var config = builder.Configuration;
 
@@ -38,9 +39,7 @@ builder.Services.AddJwtSignatureHandler<UserReadDto>(user => new Dictionary<stri
     { JwtRegisteredClaimNames.FamilyName, user.Name ?? string.Empty },
     { JwtRegisteredClaimNames.Iat, DateTimeOffset.UtcNow.ToUnixTimeSeconds() }
 });
-builder.Services.AddLocalization();
+builder.Services.AddDirectorySearchService(config.GetSection("DirectorySearchOptions"));
-builder.Services.Configure<DirectorySearchOptions>(config.GetSection("DirectorySearchOptions"));
-builder.Services.AddDirectorySearchService();
 
 var cnn_str = builder.Configuration.GetConnectionString("Default") ?? throw new InvalidOperationException("Default connection string is not found.");
 

src/DigitalData.Auth.API/Services/ConfiguredConsumerApiService.cs

@@ -1,4 +1,4 @@
-using DigitalData.Auth.API.Dto;
+using DigitalData.Auth.API.Entities;
 using DigitalData.Auth.API.Services.Contracts;
 using Microsoft.Extensions.Options;
 

src/DigitalData.Auth.API/Services/Contracts/IConsumerApiService.cs

@@ -1,4 +1,4 @@
-using DigitalData.Auth.API.Dto;
+using DigitalData.Auth.API.Entities;
 
 namespace DigitalData.Auth.API.Services.Contracts
 {

src/DigitalData.Auth.API/Services/DIExtensions.cs

@@ -1,4 +1,4 @@
-using DigitalData.Auth.API.Dto;
+using DigitalData.Auth.API.Entities;
 using DigitalData.Auth.API.Services.Contracts;
 using Microsoft.Extensions.Options;
 
@@ -8,7 +8,7 @@ namespace DigitalData.Auth.API.Services
     {
         public static IServiceCollection AddConsumerApiServiceFromConfiguration(this IServiceCollection services, IConfiguration configuration, string key = "ConsumerAPIs")
         {
-            var consumerApis = configuration.GetSection("ConsumerAPIs").Get<IEnumerable<ConsumerApi>>() ?? throw new InvalidOperationException($"No Consumer list found in {key} in configuration.");
+            var consumerApis = configuration.GetSection(key).Get<IEnumerable<ConsumerApi>>() ?? throw new InvalidOperationException($"No Consumer list found in {key} in configuration.");
             services.AddSingleton(Options.Create(consumerApis));
             services.AddSingleton<IConsumerApiService, ConfiguredConsumerApiService>();
             return services;

src/DigitalData.Auth.API/appsettings.json

@@ -50,15 +50,5 @@
         "Lifetime": "02:00:00"
       }
     ]
-  },
+  }
-  "ConsumerAPIs": [
-    {
-      "Name": "WorkFlow.API",
-      "Password": "t3B|aiJ'i-snLzNRj3B{9=&:lM5P@'iL"
-    },
-    {
-      "Name": "DigitalData.UserManager.API",
-      "Password": "a098Hvu1-y29ep{KPQO]#>8TK+fk{O`_d"
-    }
-  ]
 }

src/DigitalData.Auth.API/consumers-api.json

@@ -2,7 +2,7 @@
   "ConsumerAPIs": [
     {
       "Name": "WorkFlow.API",
-      "Password": "t3B|aiJ'i-snLzNRj3B{9=&:lM5P@'i<EFBFBD>L"
+      "Password": "t3B|aiJ'i-snLzNRj3B{9=&:lM5P@'iL"
     },
     {
       "Name": "DigitalData.UserManager.API",