Skip to content

Commit

Permalink
Merge pull request #245 from PinguApps/192-create-user-with-sha-password
Browse files Browse the repository at this point in the history
Implemented create user with sha password
  • Loading branch information
pingu2k4 authored Oct 8, 2024
2 parents 5391924 + 9bc5ce6 commit 35c2adb
Show file tree
Hide file tree
Showing 5 changed files with 110 additions and 13 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,9 @@ string emailAddressOrErrorMessage = userResponse.Result.Match(
```

## ⌛ Progress
![Server & Client - 65 / 291](https://img.shields.io/badge/Server_&_Client-65%20%2F%20291-red?style=for-the-badge)
![Server & Client - 66 / 291](https://img.shields.io/badge/Server_&_Client-66%20%2F%20291-red?style=for-the-badge)

![Server - 21 / 201](https://img.shields.io/badge/Server-21%20%2F%20201-red?style=for-the-badge)
![Server - 22 / 201](https://img.shields.io/badge/Server-22%20%2F%20201-red?style=for-the-badge)

![Client - 44 / 90](https://img.shields.io/badge/Client-44%20%2F%2090-gold?style=for-the-badge)

Expand Down Expand Up @@ -207,7 +207,7 @@ string emailAddressOrErrorMessage = userResponse.Result.Match(
| [Create Phone Verification (Confirmation)](https://appwrite.io/docs/references/1.6.x/client-rest/account#updatePhoneVerification) ||| |

### Users
![Account - 10 / 41](https://img.shields.io/badge/Users-10%20%2F%2041-red?style=for-the-badge)
![Account - 11 / 41](https://img.shields.io/badge/Users-11%20%2F%2041-red?style=for-the-badge)

| Endpoint | Client | Server |
|:-:|:-:|:-:|
Expand All @@ -221,7 +221,7 @@ string emailAddressOrErrorMessage = userResponse.Result.Match(
| [Create User with PHPass Password](https://appwrite.io/docs/references/1.6.x/server-rest/users#createPHPassUser) |||
| [Create User with Scrypt Password](https://appwrite.io/docs/references/1.6.x/server-rest/users#createScryptUser) |||
| [Create User with Scrypt Modified Password](https://appwrite.io/docs/references/1.6.x/server-rest/users#createScryptModifiedUser) |||
| [Create User with SHA Password](https://appwrite.io/docs/references/1.6.x/server-rest/users#createSHAUser) || |
| [Create User with SHA Password](https://appwrite.io/docs/references/1.6.x/server-rest/users#createSHAUser) || |
| [Get User](https://appwrite.io/docs/references/1.6.x/server-rest/users#get) |||
| [Delete User](https://appwrite.io/docs/references/1.6.x/server-rest/users#delete) |||
| [Update Email](https://appwrite.io/docs/references/1.6.x/server-rest/users#updateEmail) |||
Expand Down
10 changes: 4 additions & 6 deletions src/PinguApps.Appwrite.Playground/App.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,14 @@ public App(Client.IAppwriteClient client, Server.Clients.IAppwriteClient server,

public async Task Run(string[] args)
{
var request = new CreateUserWithScryptModifiedPasswordRequest()
var request = new CreateUserWithShaPasswordRequest()
{
Email = "[email protected]",
Password = "dbb97714c09bad417bb51288abd2c049c557e5e617839a7bc8c615492db859b57624366de72f04b9d4c3e6452a497a67a36f1afcc481d6d69f6da9e5f03598d7",
PasswordSalt = "MySuperSalt",
PasswordSaltSeparator = ";",
PasswordSignerKey = "MySuperSignerKey"
Password = "89e01536ac207279409d4de1e5253e01f4a1769e696db0d6062ca9b8f56767c8",
PasswordVersion = "sha256"
};

var response = await _server.Users.CreateUserWithScryptModifiedPassword(request);
var response = await _server.Users.CreateUserWithShaPassword(request);

Console.WriteLine(response.Result.Match(
result => result.ToString(),
Expand Down
8 changes: 7 additions & 1 deletion src/PinguApps.Appwrite.Server/Clients/IUsersClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,13 @@ public interface IUsersClient
/// <param name="request">The request content</param>
/// <returns>The user</returns>
Task<AppwriteResult<User>> CreateUserWithScryptModifiedPassword(CreateUserWithScryptModifiedPasswordRequest request);
[Obsolete("This method hasn't yet been implemented.", true)]

/// <summary>
/// Create a new user. Password provided must be hashed with the <see href="https://en.wikipedia.org/wiki/Secure_Hash_Algorithm">SHA</see> algorithm. Use <see cref="CreateUser(CreateUserRequest)"/> to create users with a plain text password.
/// <para><see href="https://appwrite.io/docs/references/1.6.x/server-rest/users#createScryptUser">Appwrite Docs</see></para>
/// </summary>
/// <param name="request">The request content</param>
/// <returns>The user</returns>
Task<AppwriteResult<User>> CreateUserWithShaPassword(CreateUserWithShaPasswordRequest request);
[Obsolete("This method hasn't yet been implemented.", true)]
Task<AppwriteResult> DeleteUser(DeleteUserRequest request);
Expand Down
17 changes: 15 additions & 2 deletions src/PinguApps.Appwrite.Server/Clients/UsersClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,22 @@ public async Task<AppwriteResult<User>> CreateUserWithScryptModifiedPassword(Cre
}
}

[ExcludeFromCodeCoverage]
/// <inheritdoc/>
public Task<AppwriteResult<User>> CreateUserWithShaPassword(CreateUserWithShaPasswordRequest request) => throw new NotImplementedException();
public async Task<AppwriteResult<User>> CreateUserWithShaPassword(CreateUserWithShaPasswordRequest request)
{
try
{
request.Validate(true);

var result = await _usersApi.CreateUserWithShaPassword(request);

return result.GetApiResponse();
}
catch (Exception e)
{
return e.GetExceptionResponse<User>();
}
}

[ExcludeFromCodeCoverage]
/// <inheritdoc/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
using System.Net;
using PinguApps.Appwrite.Shared.Requests.Users;
using PinguApps.Appwrite.Shared.Tests;
using RichardSzalay.MockHttp;

namespace PinguApps.Appwrite.Server.Tests.Clients.Users;
public partial class UsersClientTests
{
[Fact]
public async Task CreateUserWithShaPassword_ShouldReturnSuccess_WhenApiCallSucceeds()
{
// Arrange
var request = new CreateUserWithShaPasswordRequest
{
Email = "[email protected]",
Password = "password123",
PasswordVersion = "sha256"
};

_mockHttp.Expect(HttpMethod.Post, $"{Constants.Endpoint}/users/sha")
.WithJsonContent(request)
.ExpectedHeaders()
.Respond(Constants.AppJson, Constants.UserResponse);

// Act
var result = await _appwriteClient.Users.CreateUserWithShaPassword(request);

// Assert
Assert.True(result.Success);
}

[Fact]
public async Task CreateUserWithShaPassword_ShouldHandleException_WhenApiCallFails()
{
// Arrange
var request = new CreateUserWithShaPasswordRequest
{
Email = "[email protected]",
Password = "password123",
PasswordVersion = "sha256"
};

_mockHttp.Expect(HttpMethod.Post, $"{Constants.Endpoint}/users/sha")
.WithJsonContent(request)
.ExpectedHeaders()
.Respond(HttpStatusCode.BadRequest, Constants.AppJson, Constants.AppwriteError);

// Act
var result = await _appwriteClient.Users.CreateUserWithShaPassword(request);

// Assert
Assert.True(result.IsError);
Assert.True(result.IsAppwriteError);
}

[Fact]
public async Task CreateUserWithShaPassword_ShouldReturnErrorResponse_WhenExceptionOccurs()
{
// Arrange
var request = new CreateUserWithShaPasswordRequest
{
Email = "[email protected]",
Password = "password123",
PasswordVersion = "sha256"
};

_mockHttp.Expect(HttpMethod.Post, $"{Constants.Endpoint}/users/sha")
.WithJsonContent(request)
.ExpectedHeaders()
.Throw(new HttpRequestException("An error occurred"));

// Act
var result = await _appwriteClient.Users.CreateUserWithShaPassword(request);

// Assert
Assert.False(result.Success);
Assert.True(result.IsInternalError);
Assert.Equal("An error occurred", result.Result.AsT2.Message);
}
}

0 comments on commit 35c2adb

Please sign in to comment.