standardize this stuff.
This commit is contained in:
@@ -95,14 +95,21 @@ namespace CarCareTracker.Controllers
|
||||
[Route("/api/whoami")]
|
||||
public IActionResult WhoAmI()
|
||||
{
|
||||
var result = new ApiUser
|
||||
var result = new UserExportModel
|
||||
{
|
||||
Username = User.FindFirstValue(ClaimTypes.Name),
|
||||
EmailAddress = User.FindFirstValue(ClaimTypes.Email),
|
||||
IsAdmin = User.IsInRole(nameof(UserData.IsAdmin)),
|
||||
IsRoot = User.IsInRole(nameof(UserData.IsRootUser))
|
||||
EmailAddress = User.IsInRole(nameof(UserData.IsRootUser)) ? _config.GetUserConfig(User).DefaultReminderEmail : User.FindFirstValue(ClaimTypes.Email),
|
||||
IsAdmin = User.IsInRole(nameof(UserData.IsAdmin)).ToString(),
|
||||
IsRoot = User.IsInRole(nameof(UserData.IsRootUser)).ToString()
|
||||
};
|
||||
return Json(result);
|
||||
if (_config.GetInvariantApi() || Request.Headers.ContainsKey("culture-invariant"))
|
||||
{
|
||||
return Json(result, StaticHelper.GetInvariantOption());
|
||||
}
|
||||
else
|
||||
{
|
||||
return Json(result);
|
||||
}
|
||||
}
|
||||
[HttpGet]
|
||||
[Route("/api/vehicles")]
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
namespace CarCareTracker.Models
|
||||
{
|
||||
public class ApiUser
|
||||
{
|
||||
public string Username { get; set; }
|
||||
public string EmailAddress { get; set; }
|
||||
public bool IsAdmin { get; set; }
|
||||
public bool IsRoot { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -142,4 +142,13 @@ namespace CarCareTracker.Models
|
||||
public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
|
||||
public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
|
||||
}
|
||||
public class UserExportModel
|
||||
{
|
||||
public string Username { get; set; }
|
||||
public string EmailAddress { get; set; }
|
||||
[JsonConverter(typeof(FromBoolOptional))]
|
||||
public string IsAdmin { get; set; }
|
||||
[JsonConverter(typeof(FromBoolOptional))]
|
||||
public string IsRoot { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -173,6 +173,20 @@
|
||||
Id - Id of Odometer Record
|
||||
</div>
|
||||
</div>
|
||||
<div class="row api-method">
|
||||
<div class="col-1">
|
||||
<span class="badge bg-success">GET</span>
|
||||
</div>
|
||||
<div class="col-5 copyable">
|
||||
<code>/api/vehicle/planrecords</code>
|
||||
</div>
|
||||
<div class="col-3">
|
||||
Returns a list of plan records for the vehicle
|
||||
</div>
|
||||
<div class="col-3">
|
||||
vehicleId - Id of Vehicle
|
||||
</div>
|
||||
</div>
|
||||
<div class="row api-method">
|
||||
<div class="col-1">
|
||||
<span class="badge bg-success">GET</span>
|
||||
|
||||
Reference in New Issue
Block a user