Skip to content

Commit 0058871

Browse files
hhvrchhvrc
committed
Replace AuthenticatedUser with DB User
1 parent b85c8b6 commit 0058871

35 files changed

+138
-158
lines changed

‎API/Controller/Account/Authenticated/ChangePassword.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ public sealed partial class AuthenticatedAccountController
1818
[ProducesResponseType(StatusCodes.Status200OK)]
1919
public async Task<IActionResult> ChangePassword(ChangePasswordRequest data)
2020
{
21-
if (!PasswordHashingUtils.VerifyPassword(data.OldPassword, CurrentUser.DbUser.PasswordHash).Verified)
21+
if (!PasswordHashingUtils.VerifyPassword(data.OldPassword, CurrentUser.PasswordHash).Verified)
2222
{
2323
return Problem(AccountError.PasswordChangeInvalidPassword);
2424
}
2525

26-
var result = await _accountService.ChangePassword(CurrentUser.DbUser.Id, data.NewPassword);
26+
var result = await _accountService.ChangePassword(CurrentUser.Id, data.NewPassword);
2727

2828
return result.Match(success => Ok(),
2929
notFound => throw new Exception("Unexpected result, apparently our current user does not exist..."));

‎API/Controller/Account/Authenticated/ChangeUsername.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ public sealed partial class AuthenticatedAccountController
2323
[ProducesResponseType<OpenShockProblem>(StatusCodes.Status403Forbidden, MediaTypeNames.Application.ProblemJson)] // UsernameRecentlyChanged
2424
public async Task<IActionResult> ChangeUsername(ChangeUsernameRequest data)
2525
{
26-
var result = await _accountService.ChangeUsername(CurrentUser.DbUser.Id, data.Username,
27-
CurrentUser.DbUser.Rank.IsAllowed(RankType.Staff));
26+
var result = await _accountService.ChangeUsername(CurrentUser.Id, data.Username,
27+
CurrentUser.Rank.IsAllowed(RankType.Staff));
2828

2929
return result.Match<IActionResult>(
3030
success => Ok(),

‎API/Controller/Devices/DeviceOtaController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public async Task<IActionResult> GetOtaUpdateHistory([FromRoute] Guid deviceId,
3232
{
3333
// Check if user owns device or has a share
3434
var deviceExistsAndYouHaveAccess = await _db.Devices.AnyAsync(x =>
35-
x.Id == deviceId && x.Owner == CurrentUser.DbUser.Id);
35+
x.Id == deviceId && x.Owner == CurrentUser.Id);
3636
if (!deviceExistsAndYouHaveAccess) return Problem(DeviceError.DeviceNotFound);
3737

3838
return RespondSuccessLegacy(await otaService.GetUpdates(deviceId));

‎API/Controller/Devices/DevicesController.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public sealed partial class DevicesController
2727
[MapToApiVersion("1")]
2828
public async Task<IActionResult> ListDevices()
2929
{
30-
var devices = await _db.Devices.Where(x => x.Owner == CurrentUser.DbUser.Id)
30+
var devices = await _db.Devices.Where(x => x.Owner == CurrentUser.Id)
3131
.Select(x => new Models.Response.ResponseDevice
3232
{
3333
Id = x.Id,
@@ -52,7 +52,7 @@ public async Task<IActionResult> GetDeviceById([FromRoute] Guid deviceId)
5252
var hasAuthPerms = IsAllowed(PermissionType.Devices_Auth);
5353

5454

55-
var device = await _db.Devices.Where(x => x.Owner == CurrentUser.DbUser.Id && x.Id == deviceId)
55+
var device = await _db.Devices.Where(x => x.Owner == CurrentUser.Id && x.Id == deviceId)
5656
.Select(x => new Models.Response.ResponseDeviceWithToken
5757
{
5858
Id = x.Id,
@@ -80,14 +80,14 @@ public async Task<IActionResult> GetDeviceById([FromRoute] Guid deviceId)
8080
[MapToApiVersion("1")]
8181
public async Task<IActionResult> EditDevice([FromRoute] Guid deviceId, [FromBody] HubEditRequest body, [FromServices] IDeviceUpdateService updateService)
8282
{
83-
var device = await _db.Devices.Where(x => x.Owner == CurrentUser.DbUser.Id && x.Id == deviceId)
83+
var device = await _db.Devices.Where(x => x.Owner == CurrentUser.Id && x.Id == deviceId)
8484
.FirstOrDefaultAsync();
8585
if (device == null) return Problem(DeviceError.DeviceNotFound);
8686

8787
device.Name = body.Name;
8888
await _db.SaveChangesAsync();
8989

90-
await updateService.UpdateDeviceForAllShared(CurrentUser.DbUser.Id, device.Id, DeviceUpdateType.Updated);
90+
await updateService.UpdateDeviceForAllShared(CurrentUser.Id, device.Id, DeviceUpdateType.Updated);
9191

9292
return Ok();
9393
}
@@ -106,7 +106,7 @@ public async Task<IActionResult> EditDevice([FromRoute] Guid deviceId, [FromBody
106106
[MapToApiVersion("1")]
107107
public async Task<IActionResult> RegenerateDeviceToken([FromRoute] Guid deviceId)
108108
{
109-
var device = await _db.Devices.Where(x => x.Owner == CurrentUser.DbUser.Id && x.Id == deviceId)
109+
var device = await _db.Devices.Where(x => x.Owner == CurrentUser.Id && x.Id == deviceId)
110110
.FirstOrDefaultAsync();
111111
if (device == null) return Problem(DeviceError.DeviceNotFound);
112112

@@ -135,7 +135,7 @@ public async Task<IActionResult> RemoveDevice([FromRoute] Guid deviceId, [FromSe
135135
var affected = await _db.Devices.Where(x => x.Id == deviceId).WhereIsUserOrAdmin(x => x.OwnerNavigation, CurrentUser).ExecuteDeleteAsync();
136136
if (affected <= 0) return Problem(DeviceError.DeviceNotFound);
137137

138-
await updateService.UpdateDeviceForAllShared(CurrentUser.DbUser.Id, deviceId, DeviceUpdateType.Deleted);
138+
await updateService.UpdateDeviceForAllShared(CurrentUser.Id, deviceId, DeviceUpdateType.Deleted);
139139

140140
return Ok();
141141
}
@@ -168,14 +168,14 @@ public async Task<Guid> CreateDeviceV2([FromBody] HubCreateRequest data, [FromSe
168168
var device = new Common.OpenShockDb.Device
169169
{
170170
Id = Guid.NewGuid(),
171-
Owner = CurrentUser.DbUser.Id,
171+
Owner = CurrentUser.Id,
172172
Name = data.Name,
173173
Token = CryptoUtils.RandomString(256)
174174
};
175175
_db.Devices.Add(device);
176176
await _db.SaveChangesAsync();
177177

178-
await updateService.UpdateDevice(CurrentUser.DbUser.Id, device.Id, DeviceUpdateType.Created);
178+
await updateService.UpdateDevice(CurrentUser.Id, device.Id, DeviceUpdateType.Created);
179179

180180
Response.StatusCode = (int)HttpStatusCode.Created;
181181
return device.Id;
@@ -196,7 +196,7 @@ public async Task<IActionResult> GetPairCode([FromRoute] Guid deviceId)
196196
{
197197
var devicePairs = _redis.RedisCollection<DevicePair>();
198198

199-
var deviceExists = await _db.Devices.AnyAsync(x => x.Id == deviceId && x.Owner == CurrentUser.DbUser.Id);
199+
var deviceExists = await _db.Devices.AnyAsync(x => x.Id == deviceId && x.Owner == CurrentUser.Id);
200200
if (!deviceExists) Problem(DeviceError.DeviceNotFound);
201201
// replace with unlink?
202202
var existing = await devicePairs.FindByIdAsync(deviceId.ToString());
@@ -232,8 +232,8 @@ public async Task<IActionResult> GetLiveControlGatewayInfo([FromRoute] Guid devi
232232
{
233233
// Check if user owns device or has a share
234234
var deviceExistsAndYouHaveAccess = await _db.Devices.AnyAsync(x =>
235-
x.Id == deviceId && (x.Owner == CurrentUser.DbUser.Id || x.Shockers.Any(y => y.ShockerShares.Any(
236-
z => z.SharedWith == CurrentUser.DbUser.Id))));
235+
x.Id == deviceId && (x.Owner == CurrentUser.Id || x.Shockers.Any(y => y.ShockerShares.Any(
236+
z => z.SharedWith == CurrentUser.Id))));
237237
if (!deviceExistsAndYouHaveAccess) return Problem(DeviceError.DeviceNotFound);
238238

239239
// Check if device is online

‎API/Controller/Devices/ShockersController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public sealed partial class DevicesController
2424
[MapToApiVersion("1")]
2525
public async Task<IActionResult> GetShockers([FromRoute] Guid deviceId)
2626
{
27-
var deviceExists = await _db.Devices.AnyAsync(x => x.Owner == CurrentUser.DbUser.Id && x.Id == deviceId);
27+
var deviceExists = await _db.Devices.AnyAsync(x => x.Owner == CurrentUser.Id && x.Id == deviceId);
2828
if (!deviceExists) return Problem(DeviceError.DeviceNotFound);
2929
var shockers = await _db.Shockers.Where(x => x.Device == deviceId).Select(x => new ShockerResponse
3030
{

‎API/Controller/Sessions/ListSessions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public sealed partial class SessionsController
1111
[ProducesResponseType<IEnumerable<LoginSessionResponse>>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]
1212
public async Task<IEnumerable<LoginSessionResponse>> ListSessions()
1313
{
14-
var sessions = await _sessionService.ListSessionsByUserId(CurrentUser.DbUser.Id);
14+
var sessions = await _sessionService.ListSessionsByUserId(CurrentUser.Id);
1515

1616
return sessions.Select(LoginSessionResponse.MapFrom);
1717
}

‎API/Controller/Shares/LinkShareCode.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ [FromServices] IDeviceUpdateService deviceUpdateService
3737
Share = x, x.Shocker.DeviceNavigation.Owner, x.Shocker.Device
3838
}).FirstOrDefaultAsync();
3939
if (shareCode == null) return Problem(ShareCodeError.ShareCodeNotFound);
40-
if (shareCode.Owner == CurrentUser.DbUser.Id) return Problem(ShareCodeError.CantLinkOwnShareCode);
41-
if (await _db.ShockerShares.AnyAsync(x => x.ShockerId == shareCodeId && x.SharedWith == CurrentUser.DbUser.Id))
40+
if (shareCode.Owner == CurrentUser.Id) return Problem(ShareCodeError.CantLinkOwnShareCode);
41+
if (await _db.ShockerShares.AnyAsync(x => x.ShockerId == shareCodeId && x.SharedWith == CurrentUser.Id))
4242
return Problem(ShareCodeError.ShockerAlreadyLinked);
4343

4444
_db.ShockerShares.Add(new ShockerShare
4545
{
46-
SharedWith = CurrentUser.DbUser.Id,
46+
SharedWith = CurrentUser.Id,
4747
ShockerId = shareCode.Share.ShockerId,
4848
PermSound = shareCode.Share.PermSound,
4949
PermVibrate = shareCode.Share.PermVibrate,
@@ -56,7 +56,7 @@ [FromServices] IDeviceUpdateService deviceUpdateService
5656

5757
if (await _db.SaveChangesAsync() <= 1) throw new Exception("Error while linking share code to your account");
5858

59-
await deviceUpdateService.UpdateDevice(shareCode.Owner, shareCode.Device, DeviceUpdateType.ShockerUpdated, CurrentUser.DbUser.Id);
59+
await deviceUpdateService.UpdateDevice(shareCode.Owner, shareCode.Device, DeviceUpdateType.ShockerUpdated, CurrentUser.Id);
6060

6161
return RespondSuccessLegacySimple("Successfully linked share code");
6262
}

‎API/Controller/Shares/Links/AddShocker.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ public sealed partial class ShareLinksController
2525
[ProducesResponseType<OpenShockProblem>(StatusCodes.Status409Conflict, MediaTypeNames.Application.ProblemJson)] // ShockerAlreadyInShareLink
2626
public async Task<IActionResult> AddShocker([FromRoute] Guid shareLinkId, [FromRoute] Guid shockerId)
2727
{
28-
var exists = await _db.ShockerSharesLinks.AnyAsync(x => x.OwnerId == CurrentUser.DbUser.Id && x.Id == shareLinkId);
28+
var exists = await _db.ShockerSharesLinks.AnyAsync(x => x.OwnerId == CurrentUser.Id && x.Id == shareLinkId);
2929
if (!exists) return Problem(ShareLinkError.ShareLinkNotFound);
3030

3131
var ownShocker =
32-
await _db.Shockers.AnyAsync(x => x.Id == shockerId && x.DeviceNavigation.Owner == CurrentUser.DbUser.Id);
32+
await _db.Shockers.AnyAsync(x => x.Id == shockerId && x.DeviceNavigation.Owner == CurrentUser.Id);
3333
if (!ownShocker) return Problem(ShockerError.ShockerNotFound);
3434

3535
if (await _db.ShockerSharesLinksShockers.AnyAsync(x => x.ShareLinkId == shareLinkId && x.ShockerId == shockerId))

‎API/Controller/Shares/Links/CreateShareLink.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public async Task<IActionResult> CreateShareLink([FromBody] ShareLinkCreate body
2020
var entity = new ShockerSharesLink
2121
{
2222
Id = Guid.NewGuid(),
23-
Owner = CurrentUser.DbUser,
23+
Owner = CurrentUser,
2424
ExpiresOn = body.ExpiresOn == null ? null : DateTime.SpecifyKind(body.ExpiresOn.Value, DateTimeKind.Utc),
2525
Name = body.Name
2626
};

‎API/Controller/Shares/Links/EditShockerShareLink.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public sealed partial class ShareLinksController
2626
[ProducesResponseType<OpenShockProblem>(StatusCodes.Status404NotFound, MediaTypeNames.Application.ProblemJson)] // ShareLinkNotFound, ShockerNotInShareLink
2727
public async Task<IActionResult> EditShocker([FromRoute] Guid shareLinkId, [FromRoute] Guid shockerId, [FromBody] ShareLinkEditShocker body)
2828
{
29-
var exists = await _db.ShockerSharesLinks.AnyAsync(x => x.OwnerId == CurrentUser.DbUser.Id && x.Id == shareLinkId);
29+
var exists = await _db.ShockerSharesLinks.AnyAsync(x => x.OwnerId == CurrentUser.Id && x.Id == shareLinkId);
3030
if (!exists) return Problem(ShareLinkError.ShareLinkNotFound);
3131

3232
var shocker =

0 commit comments

Comments
 (0)