diff --git a/F4SDM42WebApi/F4SD - M42WebApi.csproj b/F4SDM42WebApi/F4SD - M42WebApi.csproj index 61434e1..77eb36b 100644 --- a/F4SDM42WebApi/F4SD - M42WebApi.csproj +++ b/F4SDM42WebApi/F4SD - M42WebApi.csproj @@ -13,7 +13,7 @@ false 6673a25d-33d6-4072-91d9-abed4be1a966 C4ITF4SD*.* - 1.4.0.10 + 1.4.0.11 true diff --git a/F4SDM42WebApi/F4SDM42WebApiController.cs b/F4SDM42WebApi/F4SDM42WebApiController.cs index ede0285..4d0e11b 100644 --- a/F4SDM42WebApi/F4SDM42WebApiController.cs +++ b/F4SDM42WebApi/F4SDM42WebApiController.cs @@ -293,12 +293,12 @@ namespace C4IT.F4SD */ [Route("getPickup/{name}"), HttpGet] //[CacheOutput(UseETAG = true)] - public async Task getPickup(string name, [FromUri] EntityEnumerationVisibilityMode mode = EntityEnumerationVisibilityMode.None, [FromUri] Int32 group = -1) + public async Task getPickup(string name, [FromUri] EntityEnumerationVisibilityMode mode = EntityEnumerationVisibilityMode.None, [FromUri] Int32 group = -1) { await Task.Delay(0); var pickupName = ResolvePickupName(name); if (string.IsNullOrWhiteSpace(pickupName)) - return HttpResponseExtensions.CreateResponse(Request, HttpStatusCode.BadRequest, "Pickup name is required."); + throw new ArgumentException("Pickup name is required.", nameof(name)); EntityEnumeration enumerationTemp = GetEnumeration(pickupName, mode); var vals = enumerationTemp.Values; @@ -320,22 +320,22 @@ namespace C4IT.F4SD Values = vals.ToArray() }; //CacheOutputAttribute.RegisterResponseEtag($"enum_{enumeration.Name}_{(int)mode}", $"{enumeration.Name}_{(int)mode}", cultureInvariant: false, userInvariant: true, val); - return HttpResponseExtensions.CreateResponse(Request, HttpStatusCode.OK, enumeration); + return enumeration; } [Route("getMyRoleMemberships"), HttpGet] - public async Task getMyRoleMemberships() + public async Task getMyRoleMemberships() { var userId = GetCurrentUserId(); if (userId == Guid.Empty) - return HttpResponseExtensions.CreateResponse(Request, HttpStatusCode.Unauthorized, "Cannot determine the interactive Matrix42 user."); + throw new UnauthorizedAccessException("Cannot determine the interactive Matrix42 user."); var filter = AsqlHelper.BuildInCondition("ID", new Guid[] { userId }); - return HttpResponseExtensions.CreateResponse(Request, HttpStatusCode.OK, await _f4stHelperService.UserPermissionsInfo(filter)); + return await _f4stHelperService.UserPermissionsInfo(filter); } [Route("getRoleMemberships"), HttpGet] - public async Task getRoleMemberships([FromUri] GetRoleMembershipsRequest req) + public async Task getRoleMemberships([FromUri] GetRoleMembershipsRequest req) { var filter = ""; @@ -354,7 +354,7 @@ namespace C4IT.F4SD if (!string.IsNullOrEmpty(filter)) { - return HttpResponseExtensions.CreateResponse(Request, HttpStatusCode.OK, await _f4stHelperService.UserPermissionsInfo(filter)); + return await _f4stHelperService.UserPermissionsInfo(filter); } else { @@ -363,10 +363,10 @@ namespace C4IT.F4SD } [Route("getRoleMemberships/{userId}"), HttpGet] - public async Task getRoleMembershipForUser(Guid userId) + public async Task getRoleMembershipForUser(Guid userId) { var filter = AsqlHelper.BuildInCondition("ID", new Guid[] { userId }); - return HttpResponseExtensions.CreateResponse(Request, HttpStatusCode.OK, await _f4stHelperService.UserPermissionsInfo(filter)); + return await _f4stHelperService.UserPermissionsInfo(filter); } [Obsolete] @@ -543,9 +543,8 @@ namespace C4IT.F4SD } [Route("isAlive"), HttpGet] - public IHttpActionResult isAlive() + public void isAlive() { - return new StatusCodeResult(HttpStatusCode.NoContent); } [Route("loglevel"), HttpGet]