Errors output is extended for the registration request (#23)

VirtoCommerce · Aug 25, 2022 · aa5718a · aa5718a
1 parent 3026f41
commit aa5718a
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 16 deletions.
diff --git a/src/VirtoCommerce.ProfileExperienceApiModule.Data/Commands/RegisterRequestCommandHandler.cs b/src/VirtoCommerce.ProfileExperienceApiModule.Data/Commands/RegisterRequestCommandHandler.cs
@@ -6,6 +6,7 @@
 using AutoMapper;
 using FluentValidation.Results;
 using MediatR;
+using Microsoft.AspNetCore.Identity;
 using VirtoCommerce.CustomerModule.Core;
 using VirtoCommerce.CustomerModule.Core.Model;
 using VirtoCommerce.CustomerModule.Core.Services;
@@ -23,6 +24,7 @@
 using VirtoCommerce.ProfileExperienceApiModule.Data.Validators;
 using VirtoCommerce.NotificationsModule.Core.Types;
 using VirtoCommerce.NotificationsModule.Core.Model;
+using VirtoCommerce.Platform.Security;
 using VirtoCommerce.ProfileExperienceApiModule.Data.Models.RegisterOrganization;
 
 namespace VirtoCommerce.ProfileExperienceApiModule.Data.Commands
@@ -107,7 +109,7 @@ private async Task<RegisterOrganizationResult> ProcessRequestAsync(RegisterReque
             {
                 var errors = validationResults
                     .SelectMany(x => x.Errors)
-                    .Select(x => $"{x.ErrorCode}: {x.ErrorMessage}".TrimEnd(' ', ':'))
+                    .Select(x => new RegistrationError{Code = x.ErrorCode, Description = x.ErrorMessage})
                     .ToList();
 
                 SetErrorResult(result, errors, tokenSource);
@@ -120,7 +122,7 @@ private async Task<RegisterOrganizationResult> ProcessRequestAsync(RegisterReque
 
             if (store == null)
             {
-                SetErrorResult(result, $"Store {request.StoreId} has not been found", tokenSource);
+                SetErrorResult(result, "Store not found",$"Store {request.StoreId} has not been found", tokenSource);
                 return result;
             }
 
@@ -129,7 +131,7 @@ private async Task<RegisterOrganizationResult> ProcessRequestAsync(RegisterReque
                 var maintainerRole = await _accountService.FindRoleById(MaintainerRoleId);
                 if (maintainerRole == null)
                 {
-                    SetErrorResult(result, $"Organization maintainer role with id {MaintainerRoleId} not found", tokenSource);
+                    SetErrorResult(result, "Role not found",$"Organization maintainer role with id {MaintainerRoleId} not found", tokenSource);
                     return result;
                 }
 
@@ -167,14 +169,7 @@ private async Task<RegisterOrganizationResult> ProcessRequestAsync(RegisterReque
             account.CreatedBy = Creator;
 
             var identityResult = await _accountService.CreateAccountAsync(account);
-            result.AccountCreationResult = new AccountCreationResult
-            {
-                Succeeded = identityResult.Succeeded,
-                Errors = identityResult.Errors
-                    .Select(x => $"{x.Code}: {x.Description}".TrimEnd(' ', ':'))
-                    .ToList(),
-                AccountName = account.UserName
-            };
+            result.AccountCreationResult = GetAccountCreationResult(identityResult, account);
 
             if (!result.AccountCreationResult.Succeeded)
             {
@@ -186,6 +181,21 @@ private async Task<RegisterOrganizationResult> ProcessRequestAsync(RegisterReque
             return result;
         }
 
+        private static AccountCreationResult GetAccountCreationResult(IdentityResult identityResult, ApplicationUser account)
+        {
+            return new AccountCreationResult
+            {
+                Succeeded = identityResult.Succeeded,
+                AccountName = account.UserName,
+                Errors = identityResult.Errors.Select(x => new RegistrationError
+                {
+                    Code = x.Code,
+                    Description = x.Description,
+                    Parameter = x is CustomIdentityError error ? error.ErrorParameter.ToString() : null
+                }).ToList()
+            };
+        }
+
         private static void FillContactFields(Contact contact)
         {
             contact.FullName = contact.FirstName + " " + contact.LastName;
@@ -214,12 +224,12 @@ private Task SetDynamicPropertiesAsync(IList<DynamicPropertyValue> dynamicProper
             return Task.CompletedTask;
         }
 
-        private static void SetErrorResult(RegisterOrganizationResult result, string errorMessage, CancellationTokenSource source)
+        private static void SetErrorResult(RegisterOrganizationResult result, string errorCode, string errorMessage, CancellationTokenSource source)
         {
-            SetErrorResult(result, new List<string> { errorMessage }, source);
+            SetErrorResult(result, new List<RegistrationError>{new() {Code = errorCode, Description = errorMessage}}, source);
         }
 
-        private static void SetErrorResult(RegisterOrganizationResult result, List<string> errors, CancellationTokenSource source)
+        private static void SetErrorResult(RegisterOrganizationResult result, List<RegistrationError> errors, CancellationTokenSource source)
         {
             result.AccountCreationResult = new AccountCreationResult
             {

diff --git a/...erce.ProfileExperienceApiModule.Data/Models/RegisterOrganization/AccountCreationResult.cs b/...erce.ProfileExperienceApiModule.Data/Models/RegisterOrganization/AccountCreationResult.cs
@@ -5,7 +5,7 @@ namespace VirtoCommerce.ProfileExperienceApiModule.Data.Models.RegisterOrganizat
     public class AccountCreationResult
     {
         public string AccountName { get; set; }
-        public List<string> Errors { get; set; }
+        public List<RegistrationError> Errors { get; set; }
         public bool Succeeded { get; set; }
     }
 }
diff --git a/...Commerce.ProfileExperienceApiModule.Data/Models/RegisterOrganization/RegistrationError.cs b/...Commerce.ProfileExperienceApiModule.Data/Models/RegisterOrganization/RegistrationError.cs
@@ -0,0 +1,9 @@
+namespace VirtoCommerce.ProfileExperienceApiModule.Data.Models.RegisterOrganization
+{
+    public class RegistrationError
+    {
+        public string Code { get; set; }
+        public string Description { get; set; }
+        public string Parameter { get; set; }
+    }
+}
diff --git a/...erce.ProfileExperienceApiModule.Data/Schemas/RegisterCompany/AccountCreationResultType.cs b/...erce.ProfileExperienceApiModule.Data/Schemas/RegisterCompany/AccountCreationResultType.cs
@@ -8,7 +8,7 @@ public class AccountCreationResultType: ObjectGraphType<AccountCreationResult>
         public AccountCreationResultType()
         {
             Field(x => x.Succeeded);
-            Field<ListGraphType<StringGraphType>>("errors", "The errors that occurred during the operation.", resolve: context => context.Source.Errors);
+            Field<ListGraphType<RegistrationErrorType>>("errors", "The errors that occurred during the operation.", resolve: context => context.Source.Errors);
         }
     }
 }
diff --git a/...Commerce.ProfileExperienceApiModule.Data/Schemas/RegisterCompany/RegistrationErrorType.cs b/...Commerce.ProfileExperienceApiModule.Data/Schemas/RegisterCompany/RegistrationErrorType.cs
@@ -0,0 +1,15 @@
+using GraphQL.Types;
+using VirtoCommerce.ProfileExperienceApiModule.Data.Models.RegisterOrganization;
+
+namespace VirtoCommerce.ProfileExperienceApiModule.Data.Schemas.RegisterCompany
+{
+    public class RegistrationErrorType : ObjectGraphType<RegistrationError>
+    {
+        public RegistrationErrorType()
+        {
+            Field(x => x.Code, true);
+            Field(x => x.Description, true);
+            Field(x => x.Parameter, true);
+        }
+    }
+}