diff --git a/F4SDM42WebApi/F4SDM42WebApiController.cs b/F4SDM42WebApi/F4SDM42WebApiController.cs index ebdf597..1d830fd 100644 --- a/F4SDM42WebApi/F4SDM42WebApiController.cs +++ b/F4SDM42WebApi/F4SDM42WebApiController.cs @@ -94,25 +94,25 @@ namespace C4IT.F4SD return GetRequiredService(); } - [Route("getDirectLinkCreateTicket/{sid}/{assetname}"), HttpGet] - public async Task getDirectLinkCreateTicket(string sid = "", string assetname = "") + [Route("getDirectLinkCreateTicket"), HttpGet] + public async Task 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 getDirectLinkF4SD(Guid eoid, string type) + [Route("getDirectLinkF4SD"), HttpGet] + public async Task 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> 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 getTicketDetails(Guid objectId) + public async Task getTicketDetails([FromUri] Guid objectId) { var tickets = await _f4stHelperService.getTicketDetails(new List() { objectId }); if (tickets?.Count > 0) @@ -138,18 +138,18 @@ namespace C4IT.F4SD } [Route("getTicketHistory"), HttpGet] - public async Task> getTicketHistory(Guid objectId) + public async Task> getTicketHistory([FromUri] Guid objectId) { return await _f4stHelperService.GetJournalEntries(objectId) ?? new List(); } [Route("getTicketOverviewCounts"), HttpGet] public async Task 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> 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 getPickup(string name, EntityEnumerationVisibilityMode mode = EntityEnumerationVisibilityMode.None, Int32 group = -1) + public async Task 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 getRoleMemberships(string sid = "", string upn = "", Guid? id = null) + public async Task 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 setDebugMode(string debug = "0") + public async Task 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 { diff --git a/PackageTemplate/install/0002_WebServiceOperation/02-01-0060 PLSLWebServiceOperationType.dat b/PackageTemplate/install/0002_WebServiceOperation/02-01-0060 PLSLWebServiceOperationType.dat index a196c76..6fd6da7 100644 --- a/PackageTemplate/install/0002_WebServiceOperation/02-01-0060 PLSLWebServiceOperationType.dat +++ b/PackageTemplate/install/0002_WebServiceOperation/02-01-0060 PLSLWebServiceOperationType.dat @@ -139,7 +139,7 @@ b3193051-6fe6-cdd2-7d76-08da9bbec2b6 {"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"}} getDirectLinkCreateTicket(sid, assetname) - getDirectLinkCreateTicket/{sid}/{assetname} + getDirectLinkCreateTicket 7660e907-769c-e711-a182-f079595b3ec7 dcd66369-4933-ed11-1b9c-e3e293f5401c diff --git a/PackageTemplate/install/0002_WebServiceOperation/02-01-0070 PLSLWebServiceOperationType.dat b/PackageTemplate/install/0002_WebServiceOperation/02-01-0070 PLSLWebServiceOperationType.dat index 6a3ab48..6344807 100644 --- a/PackageTemplate/install/0002_WebServiceOperation/02-01-0070 PLSLWebServiceOperationType.dat +++ b/PackageTemplate/install/0002_WebServiceOperation/02-01-0070 PLSLWebServiceOperationType.dat @@ -139,7 +139,7 @@ 04d0755f-27dd-c4ac-2785-08dac1666661 {"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"}} getDirectLinkF4SD(eoid, type) - getDirectLinkF4SD/{eoid}/{type} + getDirectLinkF4SD 7660e907-769c-e711-a182-f079595b3ec7 dcd66369-4933-ed11-1b9c-e3e293f5401c diff --git a/PackageTemplate/install/0002_WebServiceOperation/02-01-0110 PLSLWebServiceOperationType.dat b/PackageTemplate/install/0002_WebServiceOperation/02-01-0110 PLSLWebServiceOperationType.dat index 77035e1..bbcbb28 100644 --- a/PackageTemplate/install/0002_WebServiceOperation/02-01-0110 PLSLWebServiceOperationType.dat +++ b/PackageTemplate/install/0002_WebServiceOperation/02-01-0110 PLSLWebServiceOperationType.dat @@ -139,7 +139,7 @@ 163e04c2-8b5c-c0e6-0535-08da9bbec2df {"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"}} getTicketList(sid, hours, queueoption, queues) - getTicketList/{sid}/{hours}/{queueoption}/{queues} + getTicketList 7660e907-769c-e711-a182-f079595b3ec7 dcd66369-4933-ed11-1b9c-e3e293f5401c diff --git a/PackageTemplate/install/0002_WebServiceOperation/getpickup.dat b/PackageTemplate/install/0002_WebServiceOperation/getpickup.dat index 3bf6fbd..ae00c93 100644 --- a/PackageTemplate/install/0002_WebServiceOperation/getpickup.dat +++ b/PackageTemplate/install/0002_WebServiceOperation/getpickup.dat @@ -139,7 +139,7 @@ ef14b892-628c-c1c1-801f-08db99ad32e9 {"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"}} getPickup(name, mode, group) - getPickup/{name} + getPickup 7660e907-769c-e711-a182-f079595b3ec7 dcd66369-4933-ed11-1b9c-e3e293f5401c