feat: add thirdPartyUser supports update claimData

masastack · May 8, 2024 · d0dbcc1 · d0dbcc1
1 parent 38b9895
commit d0dbcc1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/...ervices/Masa.Auth.Service.Admin/Application/Subjects/Commands/AddThirdPartyUserCommand.cs b/...ervices/Masa.Auth.Service.Admin/Application/Subjects/Commands/AddThirdPartyUserCommand.cs
@@ -3,7 +3,7 @@
 
 namespace Masa.Auth.Service.Admin.Application.Subjects.Commands;
 
-public record AddThirdPartyUserCommand(AddThirdPartyUserDto ThirdPartyUser, bool WhenExisReturn = false) : Command
+public record AddThirdPartyUserCommand(AddThirdPartyUserDto ThirdPartyUser, bool WhenExisReturn = false, bool WhenExisUpdateClaimData = false) : Command
 {
     public UserModel Result { get; set; } = new();
 }
diff --git a/...Masa.Auth.Service.Admin/Application/Subjects/Commands/AddThirdPartyUserExternalCommand.cs b/...Masa.Auth.Service.Admin/Application/Subjects/Commands/AddThirdPartyUserExternalCommand.cs
@@ -3,7 +3,7 @@
 
 namespace Masa.Auth.Service.Admin.Application.Subjects.Commands;
 
-public record AddThirdPartyUserExternalCommand(AddThirdPartyUserModel ThirdPartyUser, bool WhenExisReturn = false) : Command
+public record AddThirdPartyUserExternalCommand(AddThirdPartyUserModel ThirdPartyUser, bool WhenExisReturn = false, bool WhenExisUpdateClaimData = false) : Command
 {
     public UserModel Result { get; set; } = new();
 }
diff --git a/src/Services/Masa.Auth.Service.Admin/Application/Subjects/ThirdPartyCommandHandler.cs b/src/Services/Masa.Auth.Service.Admin/Application/Subjects/ThirdPartyCommandHandler.cs
@@ -99,11 +99,21 @@ public async Task AddThirdPartyUserAsync(AddThirdPartyUserCommand command)
         var thirdPartyUserDto = command.ThirdPartyUser;
         var (thirdPartyUser, exception) = await _thirdPartyUserDomainService.VerifyRepeatAsync(thirdPartyUserDto.ThirdPartyIdpId, thirdPartyUserDto.ThridPartyIdentity);
 
-        if (command.WhenExisReturn && thirdPartyUser != null)
+        if (thirdPartyUser != null)
         {
-            command.Result = thirdPartyUser.User.Adapt<UserModel>();
-            return;
+            if (command.WhenExisUpdateClaimData)
+            {
+                thirdPartyUser.UpdateClaimData(thirdPartyUserDto.ClaimData);
+                await _thirdPartyUserRepository.UpdateAsync(thirdPartyUser);
+            }
+
+            if (command.WhenExisReturn)
+            {
+                command.Result = thirdPartyUser.User.Adapt<UserModel>();
+                return;
+            }
         }
+
         if (exception is not null)
         {
             throw exception;
@@ -183,7 +193,7 @@ public async Task AddThirdPartyUserExternalAsync(AddThirdPartyUserExternalComman
             addThirdPartyUserDto.IsLdap = true;
         }
 
-        var addThirdPartyUserCommand = new AddThirdPartyUserCommand(addThirdPartyUserDto, command.WhenExisReturn);
+        var addThirdPartyUserCommand = new AddThirdPartyUserCommand(addThirdPartyUserDto, command.WhenExisReturn, command.WhenExisUpdateClaimData);
         await _eventBus.PublishAsync(addThirdPartyUserCommand);
         command.Result = addThirdPartyUserCommand.Result;
     }

diff --git a/src/Services/Masa.Auth.Service.Admin/Services/ThirdPartyUserService.cs b/src/Services/Masa.Auth.Service.Admin/Services/ThirdPartyUserService.cs
@@ -56,9 +56,10 @@ private async Task<UserModel> UpsertThirdPartyUserExternalAsync(IEventBus eventB
     private async Task<UserModel> AddThirdPartyUserAsync(
         IEventBus eventBus,
         [FromQuery] bool whenExistReturn,
+        [FromQuery] bool whenExisUpdateClaimData,
         AddThirdPartyUserModel model)
     {
-        var query = new AddThirdPartyUserExternalCommand(model, whenExistReturn);
+        var query = new AddThirdPartyUserExternalCommand(model, whenExistReturn, whenExisUpdateClaimData);
         await eventBus.PublishAsync(query);
         return query.Result;
     }