|
5 | 5 | using OpenShock.API.Services.Email; |
6 | 6 | using OpenShock.API.Services.Email.Mailjet.Mail; |
7 | 7 | using OpenShock.Common.Constants; |
| 8 | +using OpenShock.Common.Models; |
8 | 9 | using OpenShock.Common.OpenShockDb; |
9 | 10 | using OpenShock.Common.Services.Session; |
10 | 11 | using OpenShock.Common.Utils; |
@@ -64,7 +65,8 @@ private async Task<OneOf<Success<User>, AccountWithEmailOrUsernameExists>> Creat |
64 | 65 | Name = username, |
65 | 66 | Email = email.ToLowerInvariant(), |
66 | 67 | PasswordHash = PasswordHashingUtils.HashPassword(password), |
67 | | - EmailActivated = emailActivated |
| 68 | + EmailActivated = emailActivated, |
| 69 | + Roles = [] |
68 | 70 | }; |
69 | 71 | _db.Users.Add(user); |
70 | 72 |
|
@@ -201,21 +203,21 @@ public async Task<OneOf<Success, UsernameTaken, UsernameError>> CheckUsernameAva |
201 | 203 | } |
202 | 204 |
|
203 | 205 | /// <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>> |
205 | 207 | ChangeUsername(Guid userId, |
206 | 208 | string username, bool ignoreLimit = false) |
207 | 209 | { |
208 | 210 | var cooldownSubtracted = DateTime.UtcNow.Subtract(Duration.NameChangeCooldown); |
209 | 211 | if (!ignoreLimit && await _db.UsersNameChanges.Where(x => x.UserId == userId && x.CreatedOn >= cooldownSubtracted).AnyAsync()) |
210 | 212 | { |
211 | | - return new Error<OneOf<UsernameTaken, UsernameError, RecentlyChanged>>(new RecentlyChanged()); |
| 213 | + return new OneOf.Types.Error<OneOf<UsernameTaken, UsernameError, RecentlyChanged>>(new RecentlyChanged()); |
212 | 214 | } |
213 | 215 |
|
214 | 216 | var availability = await CheckUsernameAvailability(username); |
215 | 217 | 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); |
217 | 219 | 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); |
219 | 221 |
|
220 | 222 | await using var transaction = await _db.Database.BeginTransactionAsync(); |
221 | 223 |
|
|
0 commit comments