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

fix: bind legacy web api parameters from uri

Browse Source
This commit is contained in:
Meik
2026-07-02 22:43:14 +02:00
parent 9521693e27
commit a3a929e229
5 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
F4SDM42WebApi/F4SDM42WebApiController.cs
View File

@@ -94,25 +94,25 @@ namespace C4IT.F4SD
return GetRequiredService<IJournalService>();
}
[Route("getDirectLinkCreateTicket/{sid}/{assetname}"), HttpGet]
public async Task<F4SDHelperService.DirectLink> getDirectLinkCreateTicket(string sid = "", string assetname = "")
[Route("getDirectLinkCreateTicket"), HttpGet]
public async Task<F4SDHelperService.DirectLink> getDirectLinkCreateTicket([FromUri] string sid = "", [FromUri] string assetname = "")
{
await Task.Delay(0);
return await _f4stHelperService.getDirectLinkCreateTicket(sid, assetname)
?? new F4SDHelperService.DirectLink();
}
[Route("getDirectLinkF4SD/{eoid}/{type}"), HttpGet]
public async Task<string> getDirectLinkF4SD(Guid eoid, string type)
[Route("getDirectLinkF4SD"), HttpGet]
public async Task<string> getDirectLinkF4SD([FromUri] Guid eoid, [FromUri] string type)
{
return await _f4stHelperService.getDirectLinkF4SD(eoid, type) ?? string.Empty;
}
[Route("getTicketList/{sid}/{hours}/{queueoption}/{queues}"), HttpGet]
[Route("getTicketList"), HttpGet]
public async Task<List<cF4SDTicketSummary>> getTicketList(
string sid,
int hours,
int queueoption = 0,
string queues = ""
[FromUri] string sid,
[FromUri] int hours,
[FromUri] int queueoption = 0,
[FromUri] string queues = ""
)
{
var decodedPairs = ParseQueues(queues);
@@ -128,7 +128,7 @@ namespace C4IT.F4SD
[Route("getTicketDetails"), HttpGet]
public async Task<cF4SDTicket> getTicketDetails(Guid objectId)
public async Task<cF4SDTicket> getTicketDetails([FromUri] Guid objectId)
{
var tickets = await _f4stHelperService.getTicketDetails(new List<Guid>() { objectId });
if (tickets?.Count > 0)
@@ -138,18 +138,18 @@ namespace C4IT.F4SD
}
[Route("getTicketHistory"), HttpGet]
public async Task<List<cTicketJournalItem>> getTicketHistory(Guid objectId)
public async Task<List<cTicketJournalItem>> getTicketHistory([FromUri] Guid objectId)
{
return await _f4stHelperService.GetJournalEntries(objectId) ?? new List<cTicketJournalItem>();
}
[Route("getTicketOverviewCounts"), HttpGet]
public async Task<F4SDHelperService.TicketOverviewCountsResult> getTicketOverviewCounts(
string sid,
string scope = "personal",
string keys = "",
int queueoption = 0,
string queues = ""
[FromUri] string sid,
[FromUri] string scope = "personal",
[FromUri] string keys = "",
[FromUri] int queueoption = 0,
[FromUri] string queues = ""
)
{
var parsedKeys = (keys ?? string.Empty)
@@ -189,12 +189,12 @@ namespace C4IT.F4SD
[Route("getTicketOverviewRelations"), HttpGet]
public async Task<List<F4SDHelperService.TicketOverviewRelationDto>> getTicketOverviewRelations(
string sid,
string scope = "personal",
string key = "",
int count = 0,
int queueoption = 0,
string queues = ""
[FromUri] string sid,
[FromUri] string scope = "personal",
[FromUri] string key = "",
[FromUri] int count = 0,
[FromUri] int queueoption = 0,
[FromUri] string queues = ""
)
{
var decodedQueues = ParseQueues(queues);
@@ -211,9 +211,9 @@ namespace C4IT.F4SD
};
}
*/
[Route("getPickup/{name}"), HttpGet]
[Route("getPickup"), HttpGet]
//[CacheOutput(UseETAG = true)]
public async Task<EntityEnumeration> getPickup(string name, EntityEnumerationVisibilityMode mode = EntityEnumerationVisibilityMode.None, Int32 group = -1)
public async Task<EntityEnumeration> getPickup([FromUri] string name, [FromUri] EntityEnumerationVisibilityMode mode = EntityEnumerationVisibilityMode.None, [FromUri] Int32 group = -1)
{
await Task.Delay(0);
EntityEnumeration enumerationTemp = GetEnumeration(name, mode);
@@ -251,7 +251,7 @@ namespace C4IT.F4SD
}
[HttpGet]
[Route("getRoleMemberships")]
public async Task<object> getRoleMemberships(string sid = "", string upn = "", Guid? id = null)
public async Task<object> getRoleMemberships([FromUri] string sid = "", [FromUri] string upn = "", [FromUri] Guid? id = null)
{
var filter = "";
@@ -408,7 +408,7 @@ namespace C4IT.F4SD
}
[Route("loglevel"), HttpGet]
public async Task<string> setDebugMode(string debug = "0")
public async Task<string> setDebugMode([FromUri] string debug = "0")
{
var CM = MethodBase.GetCurrentMethod();
LogMethodBegin(CM);
@@ -430,7 +430,7 @@ namespace C4IT.F4SD
}
[Route("log"), HttpGet]
public IHttpActionResult getLog(string download = "0", int count = 50, string filter = "")
public IHttpActionResult getLog([FromUri] string download = "0", [FromUri] int count = 50, [FromUri] string filter = "")
{
try
{

2
PackageTemplate/install/0002_WebServiceOperation/02-01-0060 PLSLWebServiceOperationType.dat
View File

@@ -139,7 +139,7 @@
<ID>b3193051-6fe6-cdd2-7d76-08da9bbec2b6</ID>
<RequestContract>{"UsedTypes":{"RequestContract":{"Descriptor":{"sid":{"Type":"StringType"},"assetname":{"Type":"StringType"}}}},"ContractDescriptor":{"ReferenceTo":null,"ReferenceFilter":null,"Required":false,"Obsolete":false,"MaxLength":0,"ResourceKey":null,"Documentation":null,"Title":null,"Paths":null,"Type":"RequestContract"}}</RequestContract>
<Name>getDirectLinkCreateTicket(sid, assetname)</Name>
<RouteTemplate>getDirectLinkCreateTicket/{sid}/{assetname}</RouteTemplate>
<RouteTemplate>getDirectLinkCreateTicket</RouteTemplate>
<Documentation />
<TypeID>7660e907-769c-e711-a182-f079595b3ec7</TypeID>
<Service>dcd66369-4933-ed11-1b9c-e3e293f5401c</Service>

2
PackageTemplate/install/0002_WebServiceOperation/02-01-0070 PLSLWebServiceOperationType.dat
View File

@@ -139,7 +139,7 @@
<ID>04d0755f-27dd-c4ac-2785-08dac1666661</ID>
<RequestContract>{"UsedTypes":{"RequestContract":{"Descriptor":{"eoid":{"Type":"StringType"},"type":{"Type":"StringType"}}}},"ContractDescriptor":{"ReferenceTo":null,"ReferenceFilter":null,"Required":false,"Obsolete":false,"MaxLength":0,"ResourceKey":null,"Documentation":null,"Title":null,"Paths":null,"Type":"RequestContract"}}</RequestContract>
<Name>getDirectLinkF4SD(eoid, type)</Name>
<RouteTemplate>getDirectLinkF4SD/{eoid}/{type}</RouteTemplate>
<RouteTemplate>getDirectLinkF4SD</RouteTemplate>
<Documentation />
<TypeID>7660e907-769c-e711-a182-f079595b3ec7</TypeID>
<Service>dcd66369-4933-ed11-1b9c-e3e293f5401c</Service>

2
PackageTemplate/install/0002_WebServiceOperation/02-01-0110 PLSLWebServiceOperationType.dat
View File

@@ -139,7 +139,7 @@
<ID>163e04c2-8b5c-c0e6-0535-08da9bbec2df</ID>
<RequestContract>{"UsedTypes":{"RequestContract":{"Descriptor":{"sid":{"Type":"StringType"},"hours":{"Type":"StringType"},"queueoption":{"Type":"StringType"},"queues":{"Type":"StringType"}}}},"ContractDescriptor":{"ReferenceTo":null,"ReferenceFilter":null,"Required":false,"Obsolete":false,"MaxLength":0,"ResourceKey":null,"Documentation":null,"Title":null,"Paths":null,"Type":"RequestContract"}}</RequestContract>
<Name>getTicketList(sid, hours, queueoption, queues)</Name>
<RouteTemplate>getTicketList/{sid}/{hours}/{queueoption}/{queues}</RouteTemplate>
<RouteTemplate>getTicketList</RouteTemplate>
<Documentation />
<TypeID>7660e907-769c-e711-a182-f079595b3ec7</TypeID>
<Service>dcd66369-4933-ed11-1b9c-e3e293f5401c</Service>

2
PackageTemplate/install/0002_WebServiceOperation/getpickup.dat
View File

@@ -139,7 +139,7 @@
<ID>ef14b892-628c-c1c1-801f-08db99ad32e9</ID>
<RequestContract>{"UsedTypes":{"RequestContract":{"Descriptor":{"name":{"Type":"StringType"},"mode":{"Type":"StringType"},"group":{"Type":"StringType"}}}},"ContractDescriptor":{"ReferenceTo":null,"ReferenceFilter":null,"Required":false,"Obsolete":false,"MaxLength":0,"ResourceKey":null,"Documentation":null,"Title":null,"Paths":null,"Type":"RequestContract"}}</RequestContract>
<Name>getPickup(name, mode, group)</Name>
<RouteTemplate>getPickup/{name}</RouteTemplate>
<RouteTemplate>getPickup</RouteTemplate>
<Documentation />
<TypeID>7660e907-769c-e711-a182-f079595b3ec7</TypeID>
<Service>dcd66369-4933-ed11-1b9c-e3e293f5401c</Service>