Merge pull request #375 from fretje/apiconventions

Fix FSHApiConventions
fullstackhero · Jan 16, 2022 · b7c2183 · b7c2183
2 parents 169a58c + 253226f
commit b7c2183
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 14 deletions.
diff --git a/src/Host/Controllers/Catalog/BrandsController.cs b/src/Host/Controllers/Catalog/BrandsController.cs
@@ -45,7 +45,7 @@ public Task<string> GenerateRandomAsync(GenerateRandomBrandRequest request)
     }
 
     [HttpDelete("delete-random")]
-    [ApiConventionMethod(typeof(FSHApiConventions), nameof(FSHApiConventions.Delete))]
+    [ApiConventionMethod(typeof(FSHApiConventions), nameof(FSHApiConventions.Search))]
     public Task<string> DeleteRandomAsync()
     {
         return Mediator.Send(new DeleteRandomBrandRequest());

diff --git a/src/Host/Controllers/FSHApiConvention.cs b/src/Host/Controllers/FSHApiConvention.cs
@@ -37,6 +37,20 @@ public static void Get()
     {
     }
 
+    [ProducesResponseType(200)]
+    [ProducesResponseType(400, Type = typeof(HttpValidationProblemDetails))]
+    [ProducesDefaultResponseType(typeof(ErrorResult))]
+    [ApiConventionNameMatch(ApiConventionNameMatchBehavior.Prefix)]
+    public static void Get(
+        [ApiConventionNameMatch(ApiConventionNameMatchBehavior.Any)]
+        [ApiConventionTypeMatch(ApiConventionTypeMatchBehavior.Any)]
+        object id,
+        [ApiConventionNameMatch(ApiConventionNameMatchBehavior.Any)]
+        [ApiConventionTypeMatch(ApiConventionTypeMatchBehavior.Any)]
+        object cancellationtoken)
+    {
+    }
+
     [ProducesResponseType(200)]
     [ProducesResponseType(400, Type = typeof(HttpValidationProblemDetails))]
     [ProducesDefaultResponseType(typeof(ErrorResult))]
@@ -48,6 +62,20 @@ public static void Get()
     {
     }
 
+    [ProducesResponseType(200)]
+    [ProducesResponseType(400, Type = typeof(HttpValidationProblemDetails))]
+    [ProducesDefaultResponseType(typeof(ErrorResult))]
+    [ApiConventionNameMatch(ApiConventionNameMatchBehavior.Prefix)]
+    public static void Post(
+        [ApiConventionNameMatch(ApiConventionNameMatchBehavior.Any)]
+        [ApiConventionTypeMatch(ApiConventionTypeMatchBehavior.Any)]
+        object request,
+        [ApiConventionNameMatch(ApiConventionNameMatchBehavior.Any)]
+        [ApiConventionTypeMatch(ApiConventionTypeMatchBehavior.Any)]
+        object cancellationToken)
+    {
+    }
+
     [ProducesResponseType(200)]
     [ProducesResponseType(400, Type = typeof(HttpValidationProblemDetails))]
     [ProducesDefaultResponseType(typeof(ErrorResult))]
@@ -95,6 +123,23 @@ public static void Get()
     {
     }
 
+    [ProducesResponseType(200)]
+    [ProducesResponseType(400, Type = typeof(HttpValidationProblemDetails))]
+    [ProducesDefaultResponseType(typeof(ErrorResult))]
+    [ApiConventionNameMatch(ApiConventionNameMatchBehavior.Prefix)]
+    public static void Update(
+        [ApiConventionNameMatch(ApiConventionNameMatchBehavior.Any)]
+        [ApiConventionTypeMatch(ApiConventionTypeMatchBehavior.Any)]
+        object request,
+        [ApiConventionNameMatch(ApiConventionNameMatchBehavior.Any)]
+        [ApiConventionTypeMatch(ApiConventionTypeMatchBehavior.Any)]
+        object id,
+        [ApiConventionNameMatch(ApiConventionNameMatchBehavior.Any)]
+        [ApiConventionTypeMatch(ApiConventionTypeMatchBehavior.Any)]
+        object cancellationToken)
+    {
+    }
+
     [ProducesResponseType(200)]
     [ProducesResponseType(400, Type = typeof(HttpValidationProblemDetails))]
     [ProducesDefaultResponseType(typeof(ErrorResult))]
@@ -109,6 +154,23 @@ public static void Get()
     {
     }
 
+    [ProducesResponseType(200)]
+    [ProducesResponseType(400, Type = typeof(HttpValidationProblemDetails))]
+    [ProducesDefaultResponseType(typeof(ErrorResult))]
+    [ApiConventionNameMatch(ApiConventionNameMatchBehavior.Prefix)]
+    public static void Put(
+        [ApiConventionNameMatch(ApiConventionNameMatchBehavior.Any)]
+        [ApiConventionTypeMatch(ApiConventionTypeMatchBehavior.Any)]
+        object request,
+        [ApiConventionNameMatch(ApiConventionNameMatchBehavior.Any)]
+        [ApiConventionTypeMatch(ApiConventionTypeMatchBehavior.Any)]
+        object id,
+        [ApiConventionNameMatch(ApiConventionNameMatchBehavior.Any)]
+        [ApiConventionTypeMatch(ApiConventionTypeMatchBehavior.Any)]
+        object cancellationToken)
+    {
+    }
+
     [ProducesResponseType(200)]
     [ProducesResponseType(400, Type = typeof(HttpValidationProblemDetails))]
     [ProducesDefaultResponseType(typeof(ErrorResult))]
@@ -120,6 +182,20 @@ public static void Get()
     {
     }
 
+    [ProducesResponseType(200)]
+    [ProducesResponseType(400, Type = typeof(HttpValidationProblemDetails))]
+    [ProducesDefaultResponseType(typeof(ErrorResult))]
+    [ApiConventionNameMatch(ApiConventionNameMatchBehavior.Prefix)]
+    public static void Delete(
+        [ApiConventionNameMatch(ApiConventionNameMatchBehavior.Any)]
+        [ApiConventionTypeMatch(ApiConventionTypeMatchBehavior.Any)]
+        object id,
+        [ApiConventionNameMatch(ApiConventionNameMatchBehavior.Any)]
+        [ApiConventionTypeMatch(ApiConventionTypeMatchBehavior.Any)]
+        object cancellationToken)
+    {
+    }
+
     [ProducesResponseType(200)]
     [ProducesResponseType(400, Type = typeof(HttpValidationProblemDetails))]
     [ProducesDefaultResponseType(typeof(ErrorResult))]

diff --git a/src/Host/Controllers/Identity/IdentityController.cs b/src/Host/Controllers/Identity/IdentityController.cs
@@ -43,14 +43,14 @@ public Task<string> ConfirmPhoneNumberAsync([FromQuery] string userId, [FromQuer
     [HttpPost("forgot-password")]
     [AllowAnonymous]
     [TenantIdHeader]
-    [ApiConventionMethod(typeof(FSHApiConventions), nameof(FSHApiConventions.Post))]
+    [ApiConventionMethod(typeof(FSHApiConventions), nameof(FSHApiConventions.Register))]
     public Task<string> ForgotPasswordAsync(ForgotPasswordRequest request)
     {
         return _identityService.ForgotPasswordAsync(request, OriginFromRequest);
     }
 
     [HttpPost("reset-password")]
-    [ApiConventionMethod(typeof(FSHApiConventions), nameof(FSHApiConventions.Post))]
+    [ApiConventionMethod(typeof(FSHApiConventions), nameof(FSHApiConventions.Register))]
     public Task<string> ResetPasswordAsync(ResetPasswordRequest request)
     {
         return _identityService.ResetPasswordAsync(request);
@@ -69,7 +69,7 @@ public Task<UserDetailsDto> GetProfileDetailsAsync(CancellationToken cancellatio
     }
 
     [HttpPut("change-password")]
-    [ApiConventionMethod(typeof(FSHApiConventions), nameof(FSHApiConventions.Put))]
+    [ApiConventionMethod(typeof(FSHApiConventions), nameof(FSHApiConventions.Register))]
     public Task ChangePasswordAsync(ChangePasswordRequest model)
     {
         return _identityService.ChangePasswordAsync(model, _currentUser.GetUserId().ToString());

diff --git a/src/Host/Controllers/Identity/UsersController.cs b/src/Host/Controllers/Identity/UsersController.cs
@@ -38,15 +38,15 @@ public Task<List<PermissionDto>> GetPermissionsAsync(string id, CancellationToke
     }
 
     [HttpPost("{id}/roles")]
-    [ApiConventionMethod(typeof(FSHApiConventions), nameof(FSHApiConventions.Post))]
+    [ApiConventionMethod(typeof(FSHApiConventions), nameof(FSHApiConventions.Register))]
     public Task<string> AssignRolesAsync(string id, UserRolesRequest request, CancellationToken cancellationToken)
     {
         return _userService.AssignRolesAsync(id, request, cancellationToken);
     }
 
     [HttpPost("toggle-status")]
     [MustHavePermission(FSHPermissions.Users.Edit)]
-    [ApiConventionMethod(typeof(FSHApiConventions), nameof(FSHApiConventions.Post))]
+    [ApiConventionMethod(typeof(FSHApiConventions), nameof(FSHApiConventions.Register))]
     public Task ToggleUserStatusAsync(ToggleUserStatusRequest request, CancellationToken cancellationToken)
     {
         return _userService.ToggleUserStatusAsync(request, cancellationToken);

diff --git a/src/Host/Controllers/Multitenancy/TenantsController.cs b/src/Host/Controllers/Multitenancy/TenantsController.cs
@@ -31,7 +31,7 @@ public Task<string> CreateAsync(CreateTenantRequest request)
     [HttpPost("upgrade")]
     [MustHavePermission(FSHRootPermissions.Tenants.UpgradeSubscription)]
     [OpenApiOperation("Upgrade Subscription of Tenant.", "")]
-    [ApiConventionMethod(typeof(FSHApiConventions), nameof(FSHApiConventions.Post))]
+    [ApiConventionMethod(typeof(FSHApiConventions), nameof(FSHApiConventions.Register))]
     public Task<string> UpgradeSubscriptionAsync(UpgradeSubscriptionRequest request)
     {
         return Mediator.Send(request);
@@ -40,7 +40,7 @@ public Task<string> UpgradeSubscriptionAsync(UpgradeSubscriptionRequest request)
     [HttpPost("{tenantId}/deactivate")]
     [MustHavePermission(FSHRootPermissions.Tenants.Update)]
     [OpenApiOperation("Deactivate Tenant.", "")]
-    [ApiConventionMethod(typeof(FSHApiConventions), nameof(FSHApiConventions.Post))]
+    [ApiConventionMethod(typeof(FSHApiConventions), nameof(FSHApiConventions.Register))]
     public Task<string> DeactivateTenantAsync(string tenantId)
     {
         return Mediator.Send(new DeactivateTenantRequest(tenantId));
@@ -49,7 +49,7 @@ public Task<string> DeactivateTenantAsync(string tenantId)
     [HttpPost("{tenantId}/activate")]
     [MustHavePermission(FSHRootPermissions.Tenants.Update)]
     [OpenApiOperation("Activate Tenant.", "")]
-    [ApiConventionMethod(typeof(FSHApiConventions), nameof(FSHApiConventions.Post))]
+    [ApiConventionMethod(typeof(FSHApiConventions), nameof(FSHApiConventions.Register))]
     public Task<string> ActivateTenantAsync(string tenantId)
     {
         return Mediator.Send(new ActivateTenantRequest(tenantId));

diff --git a/src/Infrastructure/Identity/TokenService.cs b/src/Infrastructure/Identity/TokenService.cs
@@ -40,6 +40,11 @@ public class TokenService : ITokenService
 
     public async Task<TokenResponse> GetTokenAsync(TokenRequest request, string ipAddress, CancellationToken cancellationToken)
     {
+        if (string.IsNullOrWhiteSpace(_currentTenant?.Id))
+        {
+            throw new UnauthorizedException(_localizer["tenant.invalid"]);
+        }
+
         var user = await _userManager.FindByEmailAsync(request.Email.Trim().Normalize());
         if (user is null)
         {
@@ -56,11 +61,6 @@ public async Task<TokenResponse> GetTokenAsync(TokenRequest request, string ipAd
             throw new UnauthorizedException(_localizer["identity.emailnotconfirmed"]);
         }
 
-        if (string.IsNullOrWhiteSpace(_currentTenant?.Id))
-        {
-            throw new UnauthorizedException(_localizer["tenant.invalid"]);
-        }
-
         if (_currentTenant.Id != MultitenancyConstants.Root.Id)
         {
             if (!_currentTenant.IsActive)