|
|
@@ -1,4 +1,3 @@
|
|
|
-using System.Security.Claims;
|
|
|
using LiteDB;
|
|
|
using Microsoft.AspNetCore.Authorization;
|
|
|
using Microsoft.AspNetCore.Mvc;
|
|
|
@@ -35,7 +34,7 @@ public class TracksController : ControllerBase
|
|
|
{
|
|
|
if (owner == "me")
|
|
|
{
|
|
|
- owner = User.FindFirst(ClaimTypes.NameIdentifier)?.Value ?? "<unknown>";
|
|
|
+ owner = ApiUser.Current.UserId;
|
|
|
}
|
|
|
query.ForOwner(owner);
|
|
|
}
|
|
|
@@ -63,8 +62,7 @@ public class TracksController : ControllerBase
|
|
|
try
|
|
|
{
|
|
|
var gpxSummary = _gpxParser.ExtractSummary(_fileStorage.OpenFileRead(fileName));
|
|
|
- var userId = User.FindFirst(ClaimTypes.NameIdentifier)?.Value ?? "<unknown>";
|
|
|
- var user = _queryFactory.GetUserQuery().Get(userId);
|
|
|
+ var user = _queryFactory.GetUserQuery().Get(ApiUser.Current.UserId);
|
|
|
var track = _queryFactory.CreateTrackCommand().Create(user, fileName, gpxSummary);
|
|
|
return Ok(track);
|
|
|
}
|
|
|
@@ -90,8 +88,7 @@ public class TracksController : ControllerBase
|
|
|
{
|
|
|
throw new ArgumentException("Object ID in URL does not match track ID");
|
|
|
}
|
|
|
- var userId = User.FindFirst(ClaimTypes.NameIdentifier)?.Value ?? "<unknown>";
|
|
|
- var result = _queryFactory.UpdateTrackCommand().Update(userId, track);
|
|
|
+ var result = _queryFactory.UpdateTrackCommand().Update(ApiUser.Current.UserId, track);
|
|
|
|
|
|
return Ok(result);
|
|
|
}
|
|
|
@@ -99,8 +96,7 @@ public class TracksController : ControllerBase
|
|
|
[HttpDelete("{id}")]
|
|
|
public ActionResult DeleteTrack(string id)
|
|
|
{
|
|
|
- var userId = User.FindFirst(ClaimTypes.NameIdentifier)?.Value ?? "<unknown>";
|
|
|
- var fileName = _queryFactory.DeleteTrackCommand().Delete(userId, new ObjectId(id));
|
|
|
+ var fileName = _queryFactory.DeleteTrackCommand().Delete(ApiUser.Current.UserId, new ObjectId(id));
|
|
|
_fileStorage.DeleteFile(fileName);
|
|
|
|
|
|
return Ok();
|