Meik/C4IT-F4SD-M42WebApi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: return native web api payloads

Browse Source
This commit is contained in:
Meik
2026-06-26 22:04:21 +02:00
parent be1e8533b4
commit e98113c2e2
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
F4SDM42WebApi/F4SD - M42WebApi.csproj
View File

@@ -13,7 +13,7 @@
<EnableDefaultCompileItems>false</EnableDefaultCompileItems> <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<M42ExtensionId>6673a25d-33d6-4072-91d9-abed4be1a966</M42ExtensionId> <M42ExtensionId>6673a25d-33d6-4072-91d9-abed4be1a966</M42ExtensionId>
<M42AssemblyPattern>C4ITF4SD*.*</M42AssemblyPattern> <M42AssemblyPattern>C4ITF4SD*.*</M42AssemblyPattern>
<M42PackageVersion>1.4.0.10</M42PackageVersion> <M42PackageVersion>1.4.0.11</M42PackageVersion>
<M42BuildPackage>true</M42BuildPackage> <M42BuildPackage>true</M42BuildPackage>
</PropertyGroup> </PropertyGroup>

23
F4SDM42WebApi/F4SDM42WebApiController.cs
View File

@@ -293,12 +293,12 @@ namespace C4IT.F4SD
*/ */
[Route("getPickup/{name}"), HttpGet] [Route("getPickup/{name}"), HttpGet]
//[CacheOutput(UseETAG = true)] //[CacheOutput(UseETAG = true)]
public async Task<HttpResponseMessage> getPickup(string name, [FromUri] EntityEnumerationVisibilityMode mode = EntityEnumerationVisibilityMode.None, [FromUri] Int32 group = -1) public async Task<EntityEnumeration> getPickup(string name, [FromUri] EntityEnumerationVisibilityMode mode = EntityEnumerationVisibilityMode.None, [FromUri] Int32 group = -1)
{ {
await Task.Delay(0); await Task.Delay(0);
var pickupName = ResolvePickupName(name); var pickupName = ResolvePickupName(name);
if (string.IsNullOrWhiteSpace(pickupName)) 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); EntityEnumeration enumerationTemp = GetEnumeration(pickupName, mode);
var vals = enumerationTemp.Values; var vals = enumerationTemp.Values;
@@ -320,22 +320,22 @@ namespace C4IT.F4SD
Values = vals.ToArray() Values = vals.ToArray()
}; };
//CacheOutputAttribute.RegisterResponseEtag($"enum_{enumeration.Name}_{(int)mode}", $"{enumeration.Name}_{(int)mode}", cultureInvariant: false, userInvariant: true, val); //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] [Route("getMyRoleMemberships"), HttpGet]
public async Task<HttpResponseMessage> getMyRoleMemberships() public async Task<object> getMyRoleMemberships()
{ {
var userId = GetCurrentUserId(); var userId = GetCurrentUserId();
if (userId == Guid.Empty) 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 }); 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] [Route("getRoleMemberships"), HttpGet]
public async Task<HttpResponseMessage> getRoleMemberships([FromUri] GetRoleMembershipsRequest req) public async Task<object> getRoleMemberships([FromUri] GetRoleMembershipsRequest req)
{ {
var filter = ""; var filter = "";
@@ -354,7 +354,7 @@ namespace C4IT.F4SD
if (!string.IsNullOrEmpty(filter)) if (!string.IsNullOrEmpty(filter))
{ {
return HttpResponseExtensions.CreateResponse(Request, HttpStatusCode.OK, await _f4stHelperService.UserPermissionsInfo(filter)); return await _f4stHelperService.UserPermissionsInfo(filter);
} }
else else
{ {
@@ -363,10 +363,10 @@ namespace C4IT.F4SD
} }
[Route("getRoleMemberships/{userId}"), HttpGet] [Route("getRoleMemberships/{userId}"), HttpGet]
public async Task<HttpResponseMessage> getRoleMembershipForUser(Guid userId) public async Task<object> getRoleMembershipForUser(Guid userId)
{ {
var filter = AsqlHelper.BuildInCondition("ID", new 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] [Obsolete]
@@ -543,9 +543,8 @@ namespace C4IT.F4SD
} }
[Route("isAlive"), HttpGet] [Route("isAlive"), HttpGet]
public IHttpActionResult isAlive() public void isAlive()
{ {
return new StatusCodeResult(HttpStatusCode.NoContent);
} }
[Route("loglevel"), HttpGet] [Route("loglevel"), HttpGet]