Skip to content

Commit

Permalink
Fix signup
Browse files Browse the repository at this point in the history
  • Loading branch information
LucHeart committed Feb 6, 2025
1 parent faace9e commit 7b7caf9
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion API/API.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<AssemblyName>OpenShock.API</AssemblyName>
<RootNamespace>OpenShock.API</RootNamespace>
<AssemblyVersion>3.10.2</AssemblyVersion>
<AssemblyVersion>3.10.3</AssemblyVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Company>OpenShock</Company>
<Product>API</Product>
Expand Down
12 changes: 7 additions & 5 deletions API/Services/Account/AccountService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using OpenShock.API.Services.Email;
using OpenShock.API.Services.Email.Mailjet.Mail;
using OpenShock.Common.Constants;
using OpenShock.Common.Models;
using OpenShock.Common.OpenShockDb;
using OpenShock.Common.Services.Session;
using OpenShock.Common.Utils;
Expand Down Expand Up @@ -64,7 +65,8 @@ private async Task<OneOf<Success<User>, AccountWithEmailOrUsernameExists>> Creat
Name = username,
Email = email.ToLowerInvariant(),
PasswordHash = PasswordHashingUtils.HashPassword(password),
EmailActivated = emailActivated
EmailActivated = emailActivated,
Roles = []
};
_db.Users.Add(user);

Expand Down Expand Up @@ -201,21 +203,21 @@ public async Task<OneOf<Success, UsernameTaken, UsernameError>> CheckUsernameAva
}

/// <inheritdoc />
public async Task<OneOf<Success, Error<OneOf<UsernameTaken, UsernameError, RecentlyChanged>>, NotFound>>
public async Task<OneOf<Success, OneOf.Types.Error<OneOf<UsernameTaken, UsernameError, RecentlyChanged>>, NotFound>>
ChangeUsername(Guid userId,
string username, bool ignoreLimit = false)
{
var cooldownSubtracted = DateTime.UtcNow.Subtract(Duration.NameChangeCooldown);
if (!ignoreLimit && await _db.UsersNameChanges.Where(x => x.UserId == userId && x.CreatedOn >= cooldownSubtracted).AnyAsync())
{
return new Error<OneOf<UsernameTaken, UsernameError, RecentlyChanged>>(new RecentlyChanged());
return new OneOf.Types.Error<OneOf<UsernameTaken, UsernameError, RecentlyChanged>>(new RecentlyChanged());
}

var availability = await CheckUsernameAvailability(username);
if (availability.IsT1)
return new Error<OneOf<UsernameTaken, UsernameError, RecentlyChanged>>(availability.AsT1);
return new OneOf.Types.Error<OneOf<UsernameTaken, UsernameError, RecentlyChanged>>(availability.AsT1);
if (availability.IsT2)
return new Error<OneOf<UsernameTaken, UsernameError, RecentlyChanged>>(availability.AsT2);
return new OneOf.Types.Error<OneOf<UsernameTaken, UsernameError, RecentlyChanged>>(availability.AsT2);

await using var transaction = await _db.Database.BeginTransactionAsync();

Expand Down
2 changes: 1 addition & 1 deletion Cron/Cron.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<AssemblyName>OpenShock.Cron</AssemblyName>
<RootNamespace>OpenShock.Cron</RootNamespace>
<Company>OpenShock</Company>
<AssemblyVersion>3.10.2</AssemblyVersion>
<AssemblyVersion>3.10.3</AssemblyVersion>
<UserSecretsId>a2109c1e-fb11-44d7-8127-346ef60cb9a5</UserSecretsId>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion LiveControlGateway/LiveControlGateway.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<AssemblyName>OpenShock.LiveControlGateway</AssemblyName>
<RootNamespace>OpenShock.LiveControlGateway</RootNamespace>
<Company>OpenShock</Company>
<AssemblyVersion>3.10.2</AssemblyVersion>
<AssemblyVersion>3.10.3</AssemblyVersion>
<Product>LiveControlGateway</Product>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<UserSecretsId>a2109c1e-fb11-44d7-8127-346ef60cb9a5</UserSecretsId>
Expand Down

0 comments on commit 7b7caf9

Please sign in to comment.