From 59620d571ea7b5dbf6e0696f399d82e4e41eb4c8 Mon Sep 17 00:00:00 2001
From: wuweilai <824255785@qq.com>
Date: Wed, 13 Jul 2022 18:37:38 +0800
Subject: [PATCH] feat(auth sdk):add UpsertUser

---
 .../Service/UserService.cs                        |  6 ++++++
 src/BuildingBlocks/MASA.BuildingBlocks            |  2 +-
 .../UserServiceTest.cs                            | 15 +++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/BasicAbility/Masa.Contrib.BasicAbility.Auth/Service/UserService.cs b/src/BasicAbility/Masa.Contrib.BasicAbility.Auth/Service/UserService.cs
index ebf7fafdf..9196d9111 100644
--- a/src/BasicAbility/Masa.Contrib.BasicAbility.Auth/Service/UserService.cs
+++ b/src/BasicAbility/Masa.Contrib.BasicAbility.Auth/Service/UserService.cs
@@ -20,6 +20,12 @@ public UserService(ICallerProvider callerProvider, IUserContext userContext)
         return await _callerProvider.PostAsync<AddUserModel, UserModel>(requestUri, user);
     }
 
+    public async Task<UserModel?> UpsertAsync(UpsertUserModel user)
+    {
+        var requestUri = $"api/user/upsertExternal";
+        return await _callerProvider.PostAsync<UpsertUserModel, UserModel>(requestUri, user);
+    }
+
     public async Task<List<StaffModel>> GetListByDepartmentAsync(Guid departmentId)
     {
         var requestUri = $"api/staff/getListByDepartment";
diff --git a/src/BuildingBlocks/MASA.BuildingBlocks b/src/BuildingBlocks/MASA.BuildingBlocks
index b7253ca71..937cd065e 160000
--- a/src/BuildingBlocks/MASA.BuildingBlocks
+++ b/src/BuildingBlocks/MASA.BuildingBlocks
@@ -1 +1 @@
-Subproject commit b7253ca712ccbd5230d46184699e62e902d0fbd5
+Subproject commit 937cd065e5af130650847c2cd0954f721409ba73
diff --git a/test/Masa.Contrib.BasicAbility.Auth.Tests/UserServiceTest.cs b/test/Masa.Contrib.BasicAbility.Auth.Tests/UserServiceTest.cs
index 09d146416..ac52eb8f2 100644
--- a/test/Masa.Contrib.BasicAbility.Auth.Tests/UserServiceTest.cs
+++ b/test/Masa.Contrib.BasicAbility.Auth.Tests/UserServiceTest.cs
@@ -21,6 +21,21 @@ public async Task TestAddAsync()
         Assert.IsTrue(result is not null);
     }
 
+    [TestMethod]
+    public async Task UpsertAsync()
+    {
+        var upsertUser = new UpsertUserModel();
+        var user = new UserModel();
+        var requestUri = $"api/user/upsertExternal";
+        var callerProvider = new Mock<ICallerProvider>();
+        callerProvider.Setup(provider => provider.PostAsync<UpsertUserModel, UserModel>(requestUri, upsertUser, default)).ReturnsAsync(user).Verifiable();
+        var userContext = new Mock<IUserContext>();
+        var userService = new UserService(callerProvider.Object, userContext.Object);
+        var result = await userService.UpsertAsync(upsertUser);
+        callerProvider.Verify(provider => provider.PostAsync<UpsertUserModel, UserModel>(requestUri, upsertUser, default), Times.Once);
+        Assert.IsTrue(result is not null);
+    }
+
     [TestMethod]
     public async Task TestGetListByDepartmentAsync()
     {