Merge remote-tracking branch 'origin/master' into integration/dummy-project

packages/medusa/src/api/routes/admin/auth/create-session.js

@@ -26,5 +26,5 @@ export default async (req, res) => {
     expiresIn: "24h",
   })
 
-  res.json(result.user)
+  res.json({ user: result.user })
 }

packages/medusa/src/api/routes/admin/discounts/add-region.js

@@ -8,7 +8,7 @@ export default async (req, res) => {
     await discountService.addRegion(discount_id, region_id)
 
     const data = discountService.retrieve(discount_id)
-    res.status(200).json(data)
+    res.status(200).json({ discount: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/discounts/add-valid-variant.js

@@ -8,7 +8,7 @@ export default async (req, res) => {
     await discountService.addValidVariant(discount_id, variant_id)
 
     const data = discountService.retrieve(discount_id)
-    res.status(200).json(data)
+    res.status(200).json({ discount: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/discounts/create-discount.js

@@ -32,7 +32,7 @@ export default async (req, res) => {
     const discountService = req.scope.resolve("discountService")
     const data = await discountService.create(value)
 
-    res.status(200).json(data)
+    res.status(200).json({ discount: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/discounts/get-discount.js

@@ -4,7 +4,7 @@ export default async (req, res) => {
     const discountService = req.scope.resolve("discountService")
     const data = await discountService.retrieve(discount_id)
 
-    res.status(200).json(data)
+    res.status(200).json({ discount: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/discounts/list-discounts.js

@@ -3,7 +3,7 @@ export default async (req, res) => {
     const discountService = req.scope.resolve("discountService")
     const data = await discountService.list()
 
-    res.status(200).json(data)
+    res.status(200).json({ discounts: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/discounts/remove-region.js

@@ -7,7 +7,7 @@ export default async (req, res) => {
     await discountService.removeRegion(discount_id, region_id)
 
     const data = discountService.retrieve(discount_id)
-    res.status(200).json(data)
+    res.status(200).json({ discounts: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/discounts/remove-valid-variant.js

@@ -7,7 +7,7 @@ export default async (req, res) => {
     await discountService.removeValidVariant(discount_id, variant_id)
 
     const data = discountService.retrieve(discount_id)
-    res.status(200).json(data)
+    res.status(200).json({ discounts: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/discounts/update-discount.js

@@ -21,7 +21,6 @@ export default async (req, res) => {
     regions: Validator.array()
       .items(Validator.string())
       .optional(),
-    metadata: Validator.object().optional(),
   })
 
   const { value, error } = schema.validate(req.body)
@@ -36,7 +35,7 @@ export default async (req, res) => {
 
     const data = await discountService.retrieve(discount_id)
 
-    res.status(200).json(data)
+    res.status(200).json({ discounts: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/orders/__tests__/archive-order.js

@@ -33,8 +33,8 @@ describe("POST /admin/orders/:id/archive", () => {
 
     it("returns order with status = archived", () => {
       expect(subject.status).toEqual(200)
-      expect(subject.body._id).toEqual(IdMap.getId("processed-order"))
+      expect(subject.body.order._id).toEqual(IdMap.getId("processed-order"))
-      expect(subject.body.status).toEqual("archived")
+      expect(subject.body.order.status).toEqual("archived")
     })
   })
 })

packages/medusa/src/api/routes/admin/orders/__tests__/cancel-order.js

@@ -33,8 +33,8 @@ describe("POST /admin/orders/:id/cancel", () => {
 
     it("returns order with status = cancelled", () => {
       expect(subject.status).toEqual(200)
-      expect(subject.body._id).toEqual(IdMap.getId("test-order"))
+      expect(subject.body.order._id).toEqual(IdMap.getId("test-order"))
-      expect(subject.body.status).toEqual("cancelled")
+      expect(subject.body.order.status).toEqual("cancelled")
     })
   })
 })

packages/medusa/src/api/routes/admin/orders/__tests__/capture-payment.js

@@ -33,8 +33,8 @@ describe("POST /admin/orders/:id/capture", () => {
 
     it("returns order with payment_status = captured", () => {
       expect(subject.status).toEqual(200)
-      expect(subject.body._id).toEqual(IdMap.getId("test-order"))
+      expect(subject.body.order._id).toEqual(IdMap.getId("test-order"))
-      expect(subject.body.payment_status).toEqual("captured")
+      expect(subject.body.order.payment_status).toEqual("captured")
     })
   })
 })

packages/medusa/src/api/routes/admin/orders/__tests__/create-fulfillment.js

@@ -33,8 +33,8 @@ describe("POST /admin/orders/:id/fulfillment", () => {
 
     it("returns order with fulfillment_status = fulfilled", () => {
       expect(subject.status).toEqual(200)
-      expect(subject.body._id).toEqual(IdMap.getId("test-order"))
+      expect(subject.body.order._id).toEqual(IdMap.getId("test-order"))
-      expect(subject.body.fulfillment_status).toEqual("fulfilled")
+      expect(subject.body.order.fulfillment_status).toEqual("fulfilled")
     })
   })
 })

packages/medusa/src/api/routes/admin/orders/__tests__/get-order.js

@@ -33,7 +33,7 @@ describe("GET /admin/orders", () => {
 
     it("returns order", () => {
       expect(subject.status).toEqual(200)
-      expect(subject.body._id).toEqual(IdMap.getId("test-order"))
+      expect(subject.body.order._id).toEqual(IdMap.getId("test-order"))
     })
   })
 })

packages/medusa/src/api/routes/admin/orders/archive-order.js

@@ -4,7 +4,7 @@ export default async (req, res) => {
   try {
     const orderService = req.scope.resolve("orderService")
     const order = await orderService.archive(id)
-    res.json(order)
+    res.json({ order })
   } catch (error) {
     throw error
   }

packages/medusa/src/api/routes/admin/orders/cancel-order.js

@@ -4,7 +4,7 @@ export default async (req, res) => {
   try {
     const orderService = req.scope.resolve("orderService")
     const order = await orderService.cancel(id)
-    res.json(order)
+    res.json({ order })
   } catch (error) {
     throw error
   }

packages/medusa/src/api/routes/admin/orders/capture-payment.js

@@ -4,7 +4,7 @@ export default async (req, res) => {
   try {
     const orderService = req.scope.resolve("orderService")
     const order = await orderService.capturePayment(id)
-    res.json(order)
+    res.json({ order })
   } catch (error) {
     throw error
   }

packages/medusa/src/api/routes/admin/orders/create-fulfillment.js

@@ -4,7 +4,7 @@ export default async (req, res) => {
   try {
     const orderService = req.scope.resolve("orderService")
     const order = await orderService.createFulfillment(id)
-    res.json(order)
+    res.json({ order })
   } catch (error) {
     throw error
   }

packages/medusa/src/api/routes/admin/orders/create-order.js

@@ -39,7 +39,7 @@ export default async (req, res) => {
     const orderService = req.scope.resolve("orderService")
     const order = await orderService.create(value)
 
-    res.status(200).json(order)
+    res.status(200).json({ order })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/orders/get-order.js

@@ -5,7 +5,7 @@ export default async (req, res) => {
     const orderService = req.scope.resolve("orderService")
     const order = await orderService.retrieve(id)
 
-    res.json(order)
+    res.json({ order })
   } catch (error) {
     throw error
   }

packages/medusa/src/api/routes/admin/orders/index.js

@@ -6,6 +6,7 @@ const route = Router()
 export default app => {
   app.use("/orders", route)
 
+  route.get("/", middlewares.wrap(require("./list-orders").default))
   route.get("/:id", middlewares.wrap(require("./get-order").default))
 
   route.post("/", middlewares.wrap(require("./create-order").default))

packages/medusa/src/api/routes/admin/orders/list-orders.js

@@ -0,0 +1,12 @@
+export default async (req, res) => {
+  const selector = {}
+
+  try {
+    const orderService = req.scope.resolve("orderService")
+    const orders = await orderService.list(selector)
+
+    res.json({ orders })
+  } catch (error) {
+    throw error
+  }
+}

packages/medusa/src/api/routes/admin/orders/return-order.js

@@ -16,7 +16,7 @@ export default async (req, res) => {
     const orderService = req.scope.resolve("orderService")
     const order = await orderService.return(id, value.items)
 
-    res.status(200).json(order)
+    res.status(200).json({ order })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/orders/update-order.js

@@ -33,7 +33,7 @@ export default async (req, res) => {
     const orderService = req.scope.resolve("orderService")
     const order = await orderService.update(id, value)
 
-    res.status(200).json(order)
+    res.status(200).json({ order })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/regions/add-country.js

@@ -16,7 +16,7 @@ export default async (req, res) => {
     await regionService.addCountry(region_id, value.country_code)
 
     const data = await regionService.retrieve(region_id)
-    res.status(200).json(data)
+    res.status(200).json({ region: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/regions/add-fulfillment-provider.js

@@ -16,7 +16,7 @@ export default async (req, res) => {
     await regionService.addFulfillmentProvider(region_id, value.provider_id)
 
     const data = await regionService.retrieve(region_id)
-    res.status(200).json(data)
+    res.status(200).json({ region: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/regions/add-payment-provider.js

@@ -16,7 +16,7 @@ export default async (req, res) => {
     await regionService.addPaymentProvider(region_id, value.provider_id)
 
     const data = await regionService.retrieve(region_id)
-    res.status(200).json(data)
+    res.status(200).json({ region: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/regions/create-region.js

@@ -18,7 +18,7 @@ export default async (req, res) => {
   try {
     const regionService = req.scope.resolve("regionService")
     const data = await regionService.create(value)
-    res.status(200).json(data)
+    res.status(200).json({ region: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/regions/get-region.js

@@ -6,7 +6,7 @@ export default async (req, res) => {
     const regionService = req.scope.resolve("regionService")
     const data = await regionService.retrieve(region_id)
 
-    res.status(200).json(data)
+    res.status(200).json({ region: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/regions/list-regions.js

@@ -5,7 +5,7 @@ export default async (req, res) => {
     const regionService = req.scope.resolve("regionService")
     const data = await regionService.list({})
 
-    res.status(200).json(data)
+    res.status(200).json({ regions: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/regions/remove-country.js

@@ -4,9 +4,9 @@ export default async (req, res) => {
   const { region_id, country_code } = req.params
   try {
     const regionService = req.scope.resolve("regionService")
-    await regionService.removeCountry(region_id, country_code)
+    const data = await regionService.removeCountry(region_id, country_code)
 
-    res.sendStatus(200)
+    res.json({ region: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/regions/remove-fulfillment-provider.js

@@ -4,9 +4,12 @@ export default async (req, res) => {
   const { region_id, provider_id } = req.params
   try {
     const regionService = req.scope.resolve("regionService")
-    await regionService.removeFulfillmentProvider(region_id, provider_id)
+    const data = await regionService.removeFulfillmentProvider(
+      region_id,
+      provider_id
+    )
 
-    res.sendStatus(200)
+    res.json({ region: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/regions/remove-payment-provider.js

@@ -4,9 +4,12 @@ export default async (req, res) => {
   const { region_id, provider_id } = req.params
   try {
     const regionService = req.scope.resolve("regionService")
-    await regionService.removePaymentProvider(region_id, provider_id)
+    const data = await regionService.removePaymentProvider(
+      region_id,
+      provider_id
+    )
 
-    res.sendStatus(200)
+    res.json({ region: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/regions/update-region.js

@@ -19,7 +19,7 @@ export default async (req, res) => {
   try {
     const regionService = req.scope.resolve("regionService")
     const data = await regionService.update(region_id, value)
-    res.status(200).json(data)
+    res.status(200).json({ region: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/shipping-options/create-shipping-option.js

@@ -29,7 +29,7 @@ export default async (req, res) => {
     const optionService = req.scope.resolve("shippingOptionService")
     const data = await optionService.create(value)
 
-    res.status(200).json(data)
+    res.status(200).json({ shipping_option: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/shipping-options/delete-shipping-option.js

@@ -1,13 +1,17 @@
 import { MedusaError, Validator } from "medusa-core-utils"
 
 export default async (req, res) => {
-  const { option_id} = req.params
+  const { option_id } = req.params
   try {
     const optionService = req.scope.resolve("shippingOptionService")
 
     await optionService.delete(option_id)
 
-    res.sendStatus(200)
+    res.json({
+      id: option_id,
+      object: "shipping-option",
+      deleted: true,
+    })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/shipping-options/get-shipping-option.js

@@ -4,7 +4,7 @@ export default async (req, res) => {
     const optionService = req.scope.resolve("shippingOptionService")
     const data = await optionService.retrieve(option_id)
 
-    res.status(200).json(data)
+    res.status(200).json({ shipping_option: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/shipping-options/list-shipping-options.js

@@ -4,7 +4,7 @@ export default async (req, res) => {
     const optionService = req.scope.resolve("shippingOptionService")
     const data = await optionService.list()
 
-    res.status(200).json(data)
+    res.status(200).json({ shipping_options: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/shipping-options/update-shipping-option.js

@@ -27,12 +27,8 @@ export default async (req, res) => {
 
   try {
     const optionService = req.scope.resolve("shippingOptionService")
-
+    const data = await optionService.update(option_id, value)
-    await optionService.update(option_id, value)
+    res.status(200).json({ shipping_option: data })
-
-    const data = await optionService.retrieve(option_id)
-
-    res.status(200).json(data)
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/shipping-profiles/__tests__/add-product.js

@@ -29,10 +29,6 @@ describe("POST /admin/shipping-profiles/:profile_id/products", () => {
     })
 
     it("calls service retrieve", () => {
-      expect(ShippingProfileServiceMock.retrieve).toHaveBeenCalledTimes(1)
-      expect(ShippingProfileServiceMock.retrieve).toHaveBeenCalledWith(
-        IdMap.getId("validId")
-      )
       expect(ShippingProfileServiceMock.addProduct).toHaveBeenCalledTimes(1)
       expect(ShippingProfileServiceMock.addProduct).toHaveBeenCalledWith(
         IdMap.getId("validId"),

packages/medusa/src/api/routes/admin/shipping-profiles/__tests__/add-shipping-option.js

@@ -29,10 +29,6 @@ describe("POST /admin/shipping-profiles/:profile_id/products", () => {
     })
 
     it("calls service retrieve", () => {
-      expect(ShippingProfileServiceMock.retrieve).toHaveBeenCalledTimes(1)
-      expect(ShippingProfileServiceMock.retrieve).toHaveBeenCalledWith(
-        IdMap.getId("validId")
-      )
       expect(
         ShippingProfileServiceMock.addShippingOption
       ).toHaveBeenCalledTimes(1)

packages/medusa/src/api/routes/admin/shipping-profiles/add-product.js

@@ -13,11 +13,8 @@ export default async (req, res) => {
 
   try {
     const profileService = req.scope.resolve("shippingProfileService")
-
+    const data = await profileService.addProduct(profile_id, value.product_id)
-    await profileService.addProduct(profile_id, value.product_id)
+    res.status(200).json({ shipping_profile: data })
-
-    const data = profileService.retrieve(profile_id)
-    res.status(200).json(data)
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/shipping-profiles/add-shipping-option.js

@@ -13,11 +13,11 @@ export default async (req, res) => {
 
   try {
     const profileService = req.scope.resolve("shippingProfileService")
-
+    const data = await profileService.addShippingOption(
-    await profileService.addShippingOption(profile_id, value.option_id)
+      profile_id,
-
+      value.option_id
-    const data = profileService.retrieve(profile_id)
+    )
-    res.status(200).json(data)
+    res.status(200).json({ shipping_profile: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/shipping-profiles/create-shipping-profile.js

@@ -14,7 +14,7 @@ export default async (req, res) => {
     const profileService = req.scope.resolve("shippingProfileService")
     const data = await profileService.create(value)
 
-    res.status(200).json(data)
+    res.status(200).json({ shipping_profile: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/shipping-profiles/get-shipping-profile.js

@@ -5,7 +5,7 @@ export default async (req, res) => {
 
     const data = await profileService.retrieve(profile_id)
 
-    res.status(200).json(data)
+    res.status(200).json({ shipping_profile: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/shipping-profiles/list-shipping-profiles.js

@@ -4,7 +4,7 @@ export default async (req, res) => {
 
     const data = await profileService.list()
 
-    res.status(200).json(data)
+    res.status(200).json({ shipping_profiles: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/shipping-profiles/remove-product.js

@@ -7,7 +7,7 @@ export default async (req, res) => {
     await profileService.removeProduct(profile_id, product_id)
 
     const data = profileService.retrieve(profile_id)
-    res.status(200).json(data)
+    res.status(200).json({ shipping_profile: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/shipping-profiles/remove-shipping-option.js

@@ -7,7 +7,7 @@ export default async (req, res) => {
     await profileService.removeShippingOption(profile_id, option_id)
 
     const data = profileService.retrieve(profile_id)
-    res.status(200).json(data)
+    res.status(200).json({ shipping_profile: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/shipping-profiles/update-shipping-profile.js

@@ -20,7 +20,7 @@ export default async (req, res) => {
     await profileService.update(profile_id, value)
 
     const data = await profileService.retrieve(profile_id)
-    res.status(200).json(data)
+    res.status(200).json({ shipping_profile: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/users/__tests__/create-user.js

@@ -39,7 +39,7 @@ describe("POST /admin/users", () => {
     })
 
     it("returns the user", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("test-user"))
+      expect(subject.body.user._id).toEqual(IdMap.getId("test-user"))
     })
   })
 

packages/medusa/src/api/routes/admin/users/__tests__/get-user.js

@@ -36,7 +36,7 @@ describe("GET /admin/users/:id", () => {
     })
 
     it("returns the user", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("test-user"))
+      expect(subject.body.user._id).toEqual(IdMap.getId("test-user"))
     })
   })
 })

packages/medusa/src/api/routes/admin/users/__tests__/reset-password.js

@@ -42,7 +42,7 @@ describe("POST /admin/users/reset-password", () => {
     })
 
     it("returns updated user", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("vandijk"))
+      expect(subject.body.user._id).toEqual(IdMap.getId("vandijk"))
     })
     it("returns 200", () => {
       expect(subject.status).toEqual(200)

packages/medusa/src/api/routes/admin/users/__tests__/set-password.js

@@ -36,7 +36,7 @@ describe("POST /admin/users/:id/set-password", () => {
     })
 
     it("returns the user", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("test-user"))
+      expect(subject.body.user._id).toEqual(IdMap.getId("test-user"))
     })
 
     it("returns 200", () => {

packages/medusa/src/api/routes/admin/users/create-user.js

@@ -21,7 +21,7 @@ export default async (req, res) => {
 
     const user = await userService.create(data, value.password)
 
-    res.status(200).json(user)
+    res.status(200).json({ user })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/users/get-user.js

@@ -5,7 +5,7 @@ export default async (req, res) => {
     const userService = req.scope.resolve("userService")
 
     const user = await userService.retrieve(user_id)
-    res.json(user)
+    res.json({ user })
   } catch (error) {
     throw error
   }

packages/medusa/src/api/routes/admin/users/list-users.js

@@ -3,7 +3,7 @@ export default async (req, res) => {
     const userService = req.scope.resolve("userService")
     const users = await userService.list({})
 
-    res.status(200).json(users)
+    res.status(200).json({ users })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/admin/users/reset-password-token.js

@@ -16,6 +16,7 @@ export default async (req, res) => {
     const userService = req.scope.resolve("userService")
     const user = await userService.retrieveByEmail(value.email)
 
+    // Should call a email service provider that sends the token to the user
     await userService.generateResetPasswordToken(user._id)
 
     res.sendStatus(204)

packages/medusa/src/api/routes/admin/users/reset-password.js

@@ -25,11 +25,9 @@ export default async (req, res) => {
       return
     }
 
-    await userService.setPassword(user._id, value.password)
+    const data = await userService.setPassword(user._id, value.password)
 
-    const updatedUser = await userService.retrieve(user._id)
+    res.status(200).json({ user: data })
-
-    res.status(200).json(updatedUser)
   } catch (error) {
     throw error
   }

packages/medusa/src/api/routes/admin/users/set-password.js

@@ -13,11 +13,8 @@ export default async (req, res) => {
 
   try {
     const userService = req.scope.resolve("userService")
-    await userService.setPassword(user_id, value.password)
+    const data = await userService.setPassword(user_id, value.password)
-
+    res.json({ user: data })
-    const newUser = await userService.retrieve(user_id)
-
-    res.json(newUser)
   } catch (error) {
     throw error
   }

packages/medusa/src/api/routes/admin/users/update-user.js

@@ -14,13 +14,9 @@ export default async (req, res) => {
 
   try {
     const userService = req.scope.resolve("userService")
-
+    const data = await userService.update(user_id, value)
-    await userService.update(user_id, value)
+    res.status(200).json({ user: data })
-    const user = await userService.retrieve(user_id)
-
-    res.status(200).json(user)
   } catch (err) {
-    console.log(err)
     throw err
   }
 }

packages/medusa/src/api/routes/store/auth/create-session.js

@@ -33,5 +33,5 @@ export default async (req, res) => {
     }
   )
 
-  res.json(result.customer)
+  res.json({ customer: result.customer })
 }

packages/medusa/src/api/routes/store/auth/index.js

@@ -0,0 +1,10 @@
+import { Router } from "express"
+import middlewares from "../../../middlewares"
+
+const route = Router()
+
+export default app => {
+  app.use("/auth", route)
+  route.post("/", middlewares.wrap(require("./create-session").default))
+  return app
+}

packages/medusa/src/api/routes/store/carts/__tests__/add-shipping-method.js

@@ -37,8 +37,8 @@ describe("POST /store/carts/:id/shipping-methods", () => {
     })
 
     it("returns the cart", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("fr-cart"))
+      expect(subject.body.cart._id).toEqual(IdMap.getId("fr-cart"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 
@@ -81,8 +81,8 @@ describe("POST /store/carts/:id/shipping-methods", () => {
     })
 
     it("returns the cart", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("fr-cart"))
+      expect(subject.body.cart._id).toEqual(IdMap.getId("fr-cart"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 })

packages/medusa/src/api/routes/store/carts/__tests__/create-cart.js

@@ -31,8 +31,8 @@ describe("POST /store/carts", () => {
     })
 
     it("returns the cart", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("regionCart"))
+      expect(subject.body.cart._id).toEqual(IdMap.getId("regionCart"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 
@@ -117,8 +117,8 @@ describe("POST /store/carts", () => {
     })
 
     it("returns cart", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("regionCart"))
+      expect(subject.body.cart._id).toEqual(IdMap.getId("regionCart"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 

packages/medusa/src/api/routes/store/carts/__tests__/create-line-item.js

@@ -42,8 +42,8 @@ describe("POST /store/carts/:id", () => {
     })
 
     it("returns the cart", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("emptyCart"))
+      expect(subject.body.cart._id).toEqual(IdMap.getId("emptyCart"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 

packages/medusa/src/api/routes/store/carts/__tests__/create-payment-sessions.js

@@ -26,8 +26,8 @@ describe("POST /store/carts/:id/payment-sessions", () => {
     })
 
     it("returns the cart", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("emptyCart"))
+      expect(subject.body.cart._id).toEqual(IdMap.getId("emptyCart"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 })

packages/medusa/src/api/routes/store/carts/__tests__/create-shipping-options.js

@@ -26,8 +26,8 @@ describe("POST /store/carts/:id/shipping-options", () => {
     })
 
     it("returns the cart", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("emptyCart"))
+      expect(subject.body.cart._id).toEqual(IdMap.getId("emptyCart"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 })

packages/medusa/src/api/routes/store/carts/__tests__/get-cart.js

@@ -22,8 +22,8 @@ describe("GET /store/carts", () => {
     })
 
     it("returns products", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("emptyCart"))
+      expect(subject.body.cart._id).toEqual(IdMap.getId("emptyCart"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 

packages/medusa/src/api/routes/store/carts/__tests__/update-cart.js

@@ -85,8 +85,8 @@ describe("POST /store/carts/:id", () => {
     })
 
     it("returns cart", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("emptyCart"))
+      expect(subject.body.cart._id).toEqual(IdMap.getId("emptyCart"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 

packages/medusa/src/api/routes/store/carts/__tests__/update-line-item.js

@@ -44,8 +44,8 @@ describe("POST /store/carts/:id/line-items/:line_id", () => {
     })
 
     it("returns the cart", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("emptyCart"))
+      expect(subject.body.cart._id).toEqual(IdMap.getId("emptyCart"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 

packages/medusa/src/api/routes/store/carts/__tests__/update-payment-method.js

@@ -46,8 +46,8 @@ describe("POST /store/carts/:id/payment-method", () => {
     })
 
     it("returns the cart", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("cartWithPaySessions"))
+      expect(subject.body.cart._id).toEqual(IdMap.getId("cartWithPaySessions"))
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.cart.decorated).toEqual(true)
     })
   })
 

packages/medusa/src/api/routes/store/carts/add-shipping-method.js

@@ -24,7 +24,7 @@ export default async (req, res) => {
     let cart = await cartService.retrieve(id)
     cart = await cartService.decorate(cart)
 
-    res.status(200).json(cart)
+    res.status(200).json({ cart })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/store/carts/create-cart.js

@@ -36,7 +36,7 @@ export default async (req, res) => {
 
     cart = await cartService.retrieve(cart._id)
     cart = await cartService.decorate(cart)
-    res.status(200).json(cart)
+    res.status(200).json({ cart })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/store/carts/create-line-item.js

@@ -28,7 +28,7 @@ export default async (req, res) => {
     cart = await cartService.retrieve(cart._id)
     cart = await cartService.decorate(cart)
 
-    res.status(200).json(cart)
+    res.status(200).json({ cart })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/store/carts/create-payment-sessions.js

@@ -11,7 +11,7 @@ export default async (req, res) => {
     let cart = await cartService.retrieve(id)
     cart = await cartService.decorate(cart)
 
-    res.status(200).json(cart)
+    res.status(200).json({ cart })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/store/carts/create-shipping-options.js

@@ -10,7 +10,7 @@ export default async (req, res) => {
     // return the updated cart
     let cart = await cartService.retrieve(id)
     cart = await cartService.decorate(cart)
-    res.status(200).json(cart)
+    res.status(200).json({ cart })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/store/carts/get-cart.js

@@ -1,12 +1,10 @@
 export default async (req, res) => {
   const { id } = req.params
-
   try {
     const cartService = req.scope.resolve("cartService")
     let cart = await cartService.retrieve(id)
     cart = await cartService.decorate(cart)
-
+    res.json({ cart })
-    res.json(cart)
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/store/carts/update-cart.js

@@ -52,8 +52,8 @@ export default async (req, res) => {
     }
 
     let newCart = await cartService.retrieve(id)
-    newCart = await cartService.decorate(newCart)
+    const data = await cartService.decorate(newCart)
-    res.json(newCart)
+    res.json({ cart: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/store/carts/update-line-item.js

@@ -29,7 +29,7 @@ export default async (req, res) => {
     cart = await cartService.retrieve(cart._id)
     cart = await cartService.decorate(cart)
 
-    res.status(200).json(cart)
+    res.status(200).json({ cart })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/store/carts/update-payment-method.js

@@ -24,7 +24,7 @@ export default async (req, res) => {
     let cart = await cartService.retrieve(id)
     cart = await cartService.decorate(cart)
 
-    res.status(200).json(cart)
+    res.status(200).json({ cart })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/store/customers/__tests__/create-customer.js

@@ -30,8 +30,8 @@ describe("POST /store/customers", () => {
     })
 
     it("returns customer decorated", () => {
-      expect(subject.body.email).toEqual("lebron@james.com")
+      expect(subject.body.customer.email).toEqual("lebron@james.com")
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.customer.decorated).toEqual(true)
     })
   })
 

packages/medusa/src/api/routes/store/customers/__tests__/reset-password.js

@@ -31,8 +31,8 @@ describe("POST /store/customers/password-reset", () => {
     })
 
     it("returns customer decorated", () => {
-      expect(subject.body.email).toEqual("lebron@james.com")
+      expect(subject.body.customer.email).toEqual("lebron@james.com")
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.customer.decorated).toEqual(true)
     })
   })
 

packages/medusa/src/api/routes/store/customers/__tests__/update-customer.js

@@ -39,8 +39,8 @@ describe("POST /store/customers/:id", () => {
     })
 
     it("returns product decorated", () => {
-      expect(subject.body.first_name).toEqual("LeBron")
+      expect(subject.body.customer.first_name).toEqual("LeBron")
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.customer.decorated).toEqual(true)
     })
   })
 

packages/medusa/src/api/routes/store/customers/__tests__/update-password.js

@@ -37,8 +37,8 @@ describe("POST /store/customers/:id/password", () => {
     })
 
     it("returns product decorated", () => {
-      expect(subject.body.first_name).toEqual("LeBron")
+      expect(subject.body.customer.first_name).toEqual("LeBron")
-      expect(subject.body.decorated).toEqual(true)
+      expect(subject.body.customer.decorated).toEqual(true)
     })
   })
 

packages/medusa/src/api/routes/store/customers/create-customer.js

@@ -17,9 +17,8 @@ export default async (req, res) => {
   try {
     const customerService = req.scope.resolve("customerService")
     const customer = await customerService.create(value)
-
     const data = await customerService.decorate(customer)
-    res.status(201).json(data)
+    res.status(201).json({ customer: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/store/customers/reset-password-token.js

@@ -16,6 +16,7 @@ export default async (req, res) => {
     const customerService = req.scope.resolve("customerService")
     const customer = await customerService.retrieveByEmail(value.email)
 
+    // Will generate a token and send it to the customer via an email privder
     await customerService.generateResetPasswordToken(customer._id)
 
     res.sendStatus(204)

packages/medusa/src/api/routes/store/customers/reset-password.js

@@ -28,7 +28,7 @@ export default async (req, res) => {
 
     const updated = await customerService.retrieve(customer._id)
     const data = await customerService.decorate(customer)
-    res.status(200).json(data)
+    res.status(200).json({ customer: data })
   } catch (error) {
     throw error
   }

packages/medusa/src/api/routes/store/customers/update-customer.js

@@ -20,7 +20,7 @@ export default async (req, res) => {
 
     const customer = await customerService.retrieve(id)
     const data = await customerService.decorate(customer)
-    res.status(200).json(data)
+    res.status(200).json({ customer: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/store/customers/update-password.js

@@ -19,7 +19,7 @@ export default async (req, res) => {
 
     const customer = await customerService.retrieve(id)
     const data = await customerService.decorate(customer)
-    res.status(200).json(data)
+    res.status(200).json({ customer: data })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/store/orders/__tests__/get-order.js

@@ -25,7 +25,7 @@ describe("GET /store/orders", () => {
     })
 
     it("returns order", () => {
-      expect(subject.body._id).toEqual(IdMap.getId("test-order"))
+      expect(subject.body.order._id).toEqual(IdMap.getId("test-order"))
     })
   })
 })

packages/medusa/src/api/routes/store/orders/create-order.js

@@ -32,7 +32,7 @@ export default async (req, res) => {
       "metadata",
     ])
 
-    res.status(200).json(order)
+    res.status(200).json({ order })
   } catch (err) {
     throw err
   }

packages/medusa/src/api/routes/store/orders/get-order.js

@@ -20,7 +20,7 @@ export default async (req, res) => {
       "metadata",
     ])
 
-    res.json(order)
+    res.json({ order })
   } catch (error) {
     throw error
   }

packages/medusa/src/api/routes/store/products/__tests__/list-products.js

@@ -20,8 +20,8 @@ describe("GET /store/products", () => {
     })
 
     it("returns products", () => {
-      expect(subject.body[0]._id).toEqual(IdMap.getId("product1"))
+      expect(subject.body.products[0]._id).toEqual(IdMap.getId("product1"))
-      expect(subject.body[1]._id).toEqual(IdMap.getId("product2"))
+      expect(subject.body.products[1]._id).toEqual(IdMap.getId("product2"))
     })
   })
 })

packages/medusa/src/api/routes/store/products/get-product.js

@@ -28,5 +28,5 @@ export default async (req, res) => {
     ["variants"]
   )
 
-  res.json(product)
+  res.json({ product })
 }

packages/medusa/src/api/routes/store/products/list-products.js

@@ -24,6 +24,5 @@ export default async (req, res) => {
       )
     )
   )
-
+  res.json({ products: data })
-  res.json(data)
 }

packages/medusa/src/api/routes/store/shipping-options/__tests__/get-shipping-options.js

@@ -40,7 +40,9 @@ describe("GET /store/shipping-options", () => {
     })
 
     it("returns the cart", () => {
-      expect(subject.body[0]._id).toEqual(IdMap.getId("cartShippingOption"))
+      expect(subject.body.shipping_options[0]._id).toEqual(
+        IdMap.getId("cartShippingOption")
+      )
     })
   })
 })

packages/medusa/src/api/routes/store/shipping-options/index.js

@@ -6,7 +6,7 @@ const route = Router()
 export default app => {
   app.use("/shipping-options", route)
 
-  route.get("/", middlewares.wrap(require("./get-shipping-options").default))
+  route.get("/", middlewares.wrap(require("./list-shipping-options").default))
 
   return app
 }

packages/medusa/src/api/routes/store/shipping-options/list-shipping-options.js

@@ -17,7 +17,7 @@ export default async (req, res) => {
     const cart = await cartService.retrieve(value.cart_id)
     const options = await shippingProfileService.fetchCartOptions(cart)
 
-    res.status(200).json(options)
+    res.status(200).json({ shipping_options: options })
   } catch (err) {
     throw err
   }

packages/medusa/src/services/__mocks__/user.js

@@ -58,7 +58,17 @@ export const UserServiceMock = {
     return Promise.resolve(undefined)
   }),
   setPassword: jest.fn().mockImplementation(userId => {
-    return Promise.resolve()
+    if (userId === IdMap.getId("test-user")) {
+      return Promise.resolve(users.testUser)
+    }
+    if (userId === IdMap.getId("vandijk")) {
+      return Promise.resolve(users.vanDijk)
+    }
+    // used for jwt token tests
+    if (userId === "test-user-id") {
+      return Promise.resolve(users.jwtUser)
+    }
+    return Promise.resolve(undefined)
   }),
   decorate: jest.fn().mockImplementation((user, fields) => {
     user.decorated = true