From c03933743010068dcd43975efdcb631084d0ac54 Mon Sep 17 00:00:00 2001
From: Robert Paciorek <robert@opcode.eu.org>
Date: Thu, 31 Aug 2023 22:16:39 +0000
Subject: [PATCH] use VikingSession for DT items API

---
 src/Controllers/Common/ContentController.cs | 30 +++++++--------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/Controllers/Common/ContentController.cs b/src/Controllers/Common/ContentController.cs
index d3572aa..b281e12 100644
--- a/src/Controllers/Common/ContentController.cs
+++ b/src/Controllers/Common/ContentController.cs
@@ -816,10 +816,8 @@ public class ContentController : Controller {
     [HttpPost]
     [Produces("application/xml")]
     [Route("V2/ContentWebService.asmx/RerollUserItem")]
-    public IActionResult RerollUserItem([FromForm] string apiToken, [FromForm] string request) {
-        Viking? viking = ctx.Sessions.FirstOrDefault(e => e.ApiToken == apiToken)?.Viking;
-        if (viking is null || viking.Inventory is null) return Unauthorized();
-
+    [VikingSession]
+    public IActionResult RerollUserItem(Viking viking, [FromForm] string request) {
         RollUserItemRequest req = XmlUtil.DeserializeXml<RollUserItemRequest>(request);
 
         // get item
@@ -907,10 +905,8 @@ public class ContentController : Controller {
     [HttpPost]
     [Produces("application/xml")]
     [Route("V2/ContentWebService.asmx/FuseItems")]
-    public IActionResult FuseItems([FromForm] string apiToken, [FromForm] string fuseItemsRequest) {
-        Viking? viking = ctx.Sessions.FirstOrDefault(e => e.ApiToken == apiToken)?.Viking;
-        if (viking is null || viking.Inventory is null) return Unauthorized();
-
+    [VikingSession]
+    public IActionResult FuseItems(Viking viking, [FromForm] string fuseItemsRequest) {
         FuseItemsRequest req = XmlUtil.DeserializeXml<FuseItemsRequest>(fuseItemsRequest);
 
         ItemData blueprintItem;
@@ -961,10 +957,8 @@ public class ContentController : Controller {
     [HttpPost]
     [Produces("application/xml")]
     [Route("V2/ContentWebService.asmx/SellItems")]
-    public IActionResult SellItems([FromForm] string apiToken, [FromForm] string sellItemsRequest) {
-        Viking? viking = ctx.Sessions.FirstOrDefault(e => e.ApiToken == apiToken)?.Viking;
-        if (viking is null || viking.Inventory is null) return Unauthorized();
-
+    [VikingSession]
+    public IActionResult SellItems(Viking viking, [FromForm] string sellItemsRequest) {
         int price = 0;
         SellItemsRequest req = XmlUtil.DeserializeXml<SellItemsRequest>(sellItemsRequest);
         foreach (var invItemID in req.UserInventoryCommonIDs) {
@@ -1014,10 +1008,8 @@ public class ContentController : Controller {
     [HttpPost]
     [Produces("application/xml")]
     [Route("V2/ContentWebService.asmx/AddBattleItems")]
-    public IActionResult AddBattleItems([FromForm] string apiToken, [FromForm] string request) {
-        Viking? viking = ctx.Sessions.FirstOrDefault(e => e.ApiToken == apiToken)?.Viking;
-        if (viking is null || viking.Inventory is null) return Unauthorized();
-
+    [VikingSession]
+    public IActionResult AddBattleItems(Viking viking, [FromForm] string request) {
         AddBattleItemsRequest req = XmlUtil.DeserializeXml<AddBattleItemsRequest>(request);
         
         var resItemList = new List<InventoryItemStatsMap>();
@@ -1039,10 +1031,8 @@ public class ContentController : Controller {
     [HttpPost]
     [Produces("application/xml")]
     [Route("V2/ContentWebService.asmx/ApplyRewards")]
-    public IActionResult ApplyRewards([FromForm] string apiToken, [FromForm] string request) {
-        Viking? viking = ctx.Sessions.FirstOrDefault(e => e.ApiToken == apiToken)?.Viking;
-        if (viking is null || viking.Inventory is null) return Unauthorized();
-        
+    [VikingSession]
+    public IActionResult ApplyRewards(Viking viking, [FromForm] string request) {
         ApplyRewardsRequest req = XmlUtil.DeserializeXml<ApplyRewardsRequest>(request);
         
         List<AchievementReward> achievementRewards = new List<AchievementReward>();