Skip to content

Commit 7b7caf9

Browse files
committed
Fix signup
1 parent faace9e commit 7b7caf9

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

API/API.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ImplicitUsings>enable</ImplicitUsings>
77
<AssemblyName>OpenShock.API</AssemblyName>
88
<RootNamespace>OpenShock.API</RootNamespace>
9-
<AssemblyVersion>3.10.2</AssemblyVersion>
9+
<AssemblyVersion>3.10.3</AssemblyVersion>
1010
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1111
<Company>OpenShock</Company>
1212
<Product>API</Product>

API/Services/Account/AccountService.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using OpenShock.API.Services.Email;
66
using OpenShock.API.Services.Email.Mailjet.Mail;
77
using OpenShock.Common.Constants;
8+
using OpenShock.Common.Models;
89
using OpenShock.Common.OpenShockDb;
910
using OpenShock.Common.Services.Session;
1011
using OpenShock.Common.Utils;
@@ -64,7 +65,8 @@ private async Task<OneOf<Success<User>, AccountWithEmailOrUsernameExists>> Creat
6465
Name = username,
6566
Email = email.ToLowerInvariant(),
6667
PasswordHash = PasswordHashingUtils.HashPassword(password),
67-
EmailActivated = emailActivated
68+
EmailActivated = emailActivated,
69+
Roles = []
6870
};
6971
_db.Users.Add(user);
7072

@@ -201,21 +203,21 @@ public async Task<OneOf<Success, UsernameTaken, UsernameError>> CheckUsernameAva
201203
}
202204

203205
/// <inheritdoc />
204-
public async Task<OneOf<Success, Error<OneOf<UsernameTaken, UsernameError, RecentlyChanged>>, NotFound>>
206+
public async Task<OneOf<Success, OneOf.Types.Error<OneOf<UsernameTaken, UsernameError, RecentlyChanged>>, NotFound>>
205207
ChangeUsername(Guid userId,
206208
string username, bool ignoreLimit = false)
207209
{
208210
var cooldownSubtracted = DateTime.UtcNow.Subtract(Duration.NameChangeCooldown);
209211
if (!ignoreLimit && await _db.UsersNameChanges.Where(x => x.UserId == userId && x.CreatedOn >= cooldownSubtracted).AnyAsync())
210212
{
211-
return new Error<OneOf<UsernameTaken, UsernameError, RecentlyChanged>>(new RecentlyChanged());
213+
return new OneOf.Types.Error<OneOf<UsernameTaken, UsernameError, RecentlyChanged>>(new RecentlyChanged());
212214
}
213215

214216
var availability = await CheckUsernameAvailability(username);
215217
if (availability.IsT1)
216-
return new Error<OneOf<UsernameTaken, UsernameError, RecentlyChanged>>(availability.AsT1);
218+
return new OneOf.Types.Error<OneOf<UsernameTaken, UsernameError, RecentlyChanged>>(availability.AsT1);
217219
if (availability.IsT2)
218-
return new Error<OneOf<UsernameTaken, UsernameError, RecentlyChanged>>(availability.AsT2);
220+
return new OneOf.Types.Error<OneOf<UsernameTaken, UsernameError, RecentlyChanged>>(availability.AsT2);
219221

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

Cron/Cron.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<AssemblyName>OpenShock.Cron</AssemblyName>
88
<RootNamespace>OpenShock.Cron</RootNamespace>
99
<Company>OpenShock</Company>
10-
<AssemblyVersion>3.10.2</AssemblyVersion>
10+
<AssemblyVersion>3.10.3</AssemblyVersion>
1111
<UserSecretsId>a2109c1e-fb11-44d7-8127-346ef60cb9a5</UserSecretsId>
1212
</PropertyGroup>
1313

LiveControlGateway/LiveControlGateway.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<AssemblyName>OpenShock.LiveControlGateway</AssemblyName>
88
<RootNamespace>OpenShock.LiveControlGateway</RootNamespace>
99
<Company>OpenShock</Company>
10-
<AssemblyVersion>3.10.2</AssemblyVersion>
10+
<AssemblyVersion>3.10.3</AssemblyVersion>
1111
<Product>LiveControlGateway</Product>
1212
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1313
<UserSecretsId>a2109c1e-fb11-44d7-8127-346ef60cb9a5</UserSecretsId>

0 commit comments

Comments
 (0)