Add CreateAsync to UserClient

ubisoft · Mar 6, 2024 · 939b7bf · 939b7bf
1 parent 5e3be20
commit 939b7bf
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 3 deletions.
diff --git a/NGitLab.Mock/Clients/UserClient.cs b/NGitLab.Mock/Clients/UserClient.cs
@@ -64,6 +64,23 @@ public Models.User Create(UserUpsert user)
         }
     }
 
+    public async Task<Models.User> CreateAsync(UserUpsert user, CancellationToken cancellationToken = default)
+    {
+        using (Context.BeginOperationScope())
+        {
+            var u = new User(user.Username)
+            {
+                Name = user.Name,
+                Email = user.Email,
+            };
+
+            Server.Users.Add(u);
+
+            await Task.Yield();
+            return u.ToClientUser();
+        }
+    }
+
     public UserToken CreateToken(UserTokenCreate tokenRequest)
     {
         throw new NotSupportedException();

diff --git a/NGitLab.Tests/UsersTests.cs b/NGitLab.Tests/UsersTests.cs
@@ -52,6 +52,19 @@ public async Task CreateUpdateDelete()
         await GitLabTestContext.RetryUntilAsync(() => users.Get(addedUser.Username).ToList(), users => !users.Any(), TimeSpan.FromMinutes(2));
     }
 
+    [Test]
+    [NGitLabRetry]
+    public async Task CreateAsync()
+    {
+        using var context = await GitLabTestContext.CreateAsync();
+        var users = context.AdminClient.Users;
+
+        var addedUser = await CreateNewUserAsync(context);
+        Assert.That(addedUser.Bio, Is.EqualTo("bio"));
+
+        await GitLabTestContext.RetryUntilAsync(() => users.Get(addedUser.Username).ToList(), users => users.Any(), TimeSpan.FromMinutes(2));
+    }
+
     [Test]
     [NGitLabRetry]
     public async Task GetUserByEmailDoesNotWorkOnNonAdminClient()
@@ -182,10 +195,10 @@ public async Task GetLastActivityDates_UsingNonAdminCredentials_ThrowsForbidden(
         Assert.That(exception.StatusCode, Is.EqualTo(HttpStatusCode.Forbidden));
     }
 
-    private static User CreateNewUser(GitLabTestContext context)
+    private static UserUpsert CreateNewUserUpsert(GitLabTestContext context)
     {
         var randomNumber = context.GetRandomNumber().ToString(CultureInfo.InvariantCulture);
-        return context.AdminClient.Users.Create(new UserUpsert
+        return new UserUpsert
         {
             Email = $"test{randomNumber}@test.pl",
             Bio = "bio",
@@ -201,7 +214,17 @@ private static User CreateNewUser(GitLabTestContext context)
             Twitter = "twitter",
             Username = $"ngitlabtestuser{randomNumber}",
             WebsiteURL = "https://www.example.com",
-        });
+        };
+    }
+
+    private static User CreateNewUser(GitLabTestContext context)
+    {
+        return context.AdminClient.Users.Create(CreateNewUserUpsert(context));
+    }
+
+    private static Task<User> CreateNewUserAsync(GitLabTestContext context)
+    {
+        return context.AdminClient.Users.CreateAsync(CreateNewUserUpsert(context));
     }
 
     // Comes from https://github.com/meziantou/Meziantou.GitLabClient/blob/main/test/Meziantou.GitLabClient.Tests/Internals/RsaSshKey.cs

diff --git a/NGitLab/IUserClient.cs b/NGitLab/IUserClient.cs
@@ -18,6 +18,8 @@ public interface IUserClient
 
     User Create(UserUpsert user);
 
+    Task<User> CreateAsync(UserUpsert user, CancellationToken cancellationToken = default);
+
     User Update(int id, UserUpsert user);
 
     /// <summary>

diff --git a/NGitLab/Impl/UserClient.cs b/NGitLab/Impl/UserClient.cs
@@ -56,6 +56,8 @@ public IEnumerable<User> Get(UserQuery query)
 
     public User Create(UserUpsert user) => _api.Post().With(user).To<User>(User.Url);
 
+    public Task<User> CreateAsync(UserUpsert user, CancellationToken cancellationToken = default) => _api.Post().With(user).ToAsync<User>(User.Url, cancellationToken);
+
     public UserToken CreateToken(UserTokenCreate tokenRequest) => _api.Post().With(tokenRequest).To<UserToken>(User.Url + "/" + tokenRequest.UserId.ToStringInvariant() + "/impersonation_tokens");
 
     public User Update(int id, UserUpsert user) => _api.Put().With(user).To<User>(User.Url + "/" + id.ToStringInvariant());

diff --git a/NGitLab/PublicAPI.Unshipped.txt b/NGitLab/PublicAPI.Unshipped.txt
@@ -896,6 +896,7 @@ NGitLab.Impl.UserClient
 NGitLab.Impl.UserClient.Activate(int userId) -> void
 NGitLab.Impl.UserClient.All.get -> System.Collections.Generic.IEnumerable<NGitLab.Models.User>
 NGitLab.Impl.UserClient.Create(NGitLab.Models.UserUpsert user) -> NGitLab.Models.User
+NGitLab.Impl.UserClient.CreateAsync(NGitLab.Models.UserUpsert user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<NGitLab.Models.User>
 NGitLab.Impl.UserClient.CreateToken(NGitLab.Models.UserTokenCreate tokenRequest) -> NGitLab.Models.UserToken
 NGitLab.Impl.UserClient.Current.get -> NGitLab.Models.Session
 NGitLab.Impl.UserClient.CurrentUserSShKeys.get -> NGitLab.ISshKeyClient
@@ -1105,6 +1106,7 @@ NGitLab.IUserClient
 NGitLab.IUserClient.Activate(int id) -> void
 NGitLab.IUserClient.All.get -> System.Collections.Generic.IEnumerable<NGitLab.Models.User>
 NGitLab.IUserClient.Create(NGitLab.Models.UserUpsert user) -> NGitLab.Models.User
+NGitLab.IUserClient.CreateAsync(NGitLab.Models.UserUpsert user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<NGitLab.Models.User>
 NGitLab.IUserClient.CreateToken(NGitLab.Models.UserTokenCreate tokenRequest) -> NGitLab.Models.UserToken
 NGitLab.IUserClient.Current.get -> NGitLab.Models.Session
 NGitLab.IUserClient.CurrentUserSShKeys.get -> NGitLab.ISshKeyClient