chore: npm audit fix (spaceninjaserver#579)

lonewolf0708 · Dec 19, 2024 · 259bfa1 · 259bfa1
1 parent 0dd9839
commit 259bfa1
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 35 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/controllers/api/inventoryController.ts b/src/controllers/api/inventoryController.ts
@@ -6,7 +6,7 @@ import { config } from "@/src/services/configService";
 import allDialogue from "@/static/fixed_responses/allDialogue.json";
 import allMissions from "@/static/fixed_responses/allMissions.json";
 import { ILoadoutDatabase } from "@/src/types/saveLoadoutTypes";
-import { IInventoryDatabase, IShipInventory, equipmentKeys } from "@/src/types/inventoryTypes/inventoryTypes";
+import { IShipInventory, equipmentKeys } from "@/src/types/inventoryTypes/inventoryTypes";
 import { IPolarity, ArtifactPolarity } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import { ExportCustoms, ExportFlavour, ExportKeys, ExportResources } from "warframe-public-export-plus";
 
@@ -30,7 +30,7 @@ const inventoryController: RequestHandler = async (request, response) => {
     }
 
     //TODO: make a function that converts from database representation to client
-    const inventoryJSON: IInventoryDatabase = inventory.toJSON();
+    const inventoryJSON = inventory.toJSON();
 
     const inventoryResponse = toInventoryResponse(inventoryJSON);
 

diff --git a/src/helpers/inventoryHelpers.ts b/src/helpers/inventoryHelpers.ts
@@ -1,9 +1,9 @@
 import { IOid } from "@/src/types/commonTypes";
-import { IInventoryDatabase, IInventoryResponse } from "@/src/types/inventoryTypes/inventoryTypes";
+import { IInventoryResponse } from "@/src/types/inventoryTypes/inventoryTypes";
 import { Types } from "mongoose";
 
 //TODO: this needs to be addressed: a schema's toJSON is responsible for changing Oid and Date to their corresponding Response versions __id to "ItemId":{"$oid":"6450f720bc562ebf030222d4"}, and a Date to "date":{"$date":{"$numberLong":"unix timestamp"})
-export const toInventoryResponse = (inventoryDatabase: IInventoryDatabase): IInventoryResponse => {
+export const toInventoryResponse = (inventoryDatabase: { accountOwnerId: Types.ObjectId }): IInventoryResponse => {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { accountOwnerId, ...inventoryResponse } = inventoryDatabase;
     return inventoryResponse as unknown as IInventoryResponse;

diff --git a/src/services/inventoryService.ts b/src/services/inventoryService.ts
@@ -369,7 +369,7 @@ export const addPowerSuit = async (powersuitName: string, accountId: string): Pr
     const inventory = await getInventory(accountId);
     const suitIndex = inventory.Suits.push({ ItemType: powersuitName, Configs: [], UpgradeVer: 101, XP: 0 });
     const changedInventory = await inventory.save();
-    return changedInventory.Suits[suitIndex - 1].toJSON();
+    return changedInventory.Suits[suitIndex - 1].toJSON() as object as IEquipmentClient;
 };
 
 export const addMechSuit = async (mechsuitName: string, accountId: string) => {
@@ -527,7 +527,7 @@ export const addEquipment = async (
     });
 
     const changedInventory = await inventory.save();
-    return changedInventory[category][index - 1].toJSON();
+    return changedInventory[category][index - 1].toJSON() as object as IEquipmentClient;
 };
 
 export const addCustomization = async (customizatonName: string, accountId: string): Promise<IFlavourItem> => {
@@ -541,7 +541,7 @@ export const addSkin = async (typeName: string, accountId: string): Promise<IWea
     const inventory = await getInventory(accountId);
     const index = inventory.WeaponSkins.push({ ItemType: typeName }) - 1;
     const changedInventory = await inventory.save();
-    return changedInventory.WeaponSkins[index].toJSON();
+    return changedInventory.WeaponSkins[index].toJSON() as object as IWeaponSkinClient;
 };
 
 const addGearExpByCategory = (

diff --git a/src/types/shipTypes.ts b/src/types/shipTypes.ts
@@ -1,12 +1,13 @@
 import { Schema, Types } from "mongoose";
 import { IOid } from "@/src/types/commonTypes";
 import { IColor } from "@/src/types/inventoryTypes/commonInventoryTypes";
+import { ILoadoutClient } from "./saveLoadoutTypes";
 
 export interface IGetShipResponse {
     ShipOwnerId: string;
     Ship: IShip;
     Apartment: IApartment;
-    LoadOutInventory: { LoadOutPresets: Types.ObjectId };
+    LoadOutInventory: { LoadOutPresets: ILoadoutClient };
 }
 
 export interface IShipAttachments {