merge develop and resolve conflicts

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

@@ -0,0 +1,17 @@
+import _ from "lodash"
+
+/**
+ * @oas [get] /auth
+ * operationId: "DeleteAuth"
+ * summary: "Delete Session"
+ * description: "Deletes the current session for the logged in user."
+ * tags:
+ *   - Auth
+ * responses:
+ *  "200":
+ *    description: OK
+ */
+export default async (req, res) => {
+  req.session.destroy()
+  res.status(200).end()
+}

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

@@ -13,5 +13,11 @@ export default app => {
   )
   route.post("/", middlewares.wrap(require("./create-session").default))
 
+  route.delete(
+    "/",
+    middlewares.authenticate(),
+    middlewares.wrap(require("./delete-session").default)
+  )
+
   return app
 }

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

@@ -1,4 +1,5 @@
 import { MedusaError, Validator } from "medusa-core-utils"
+import { defaultRelations } from "."
 
 /**
  * @oas [post] /discounts
@@ -96,11 +97,10 @@ export default async (req, res) => {
     const discountService = req.scope.resolve("discountService")
 
     const created = await discountService.create(value)
-    const discount = await discountService.retrieve(created.id, [
-      "rule",
-      "rule.valid_for",
-      "regions",
-    ])
+    const discount = await discountService.retrieve(
+      created.id,
+      defaultRelations
+    )
 
     res.status(200).json({ discount })
   } catch (err) {

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

@@ -57,6 +57,7 @@ export const defaultCartRelations = [
   "payment_sessions",
   "shipping_methods.shipping_option",
   "discounts",
+  "discounts.rule",
 ]
 
 export const defaultCartFields = [

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

@@ -43,7 +43,14 @@ export default async (req, res) => {
         .withTransaction(manager)
         .retrieve(draftOrder.cart_id, {
           select: ["total"],
-          relations: ["discounts", "shipping_methods", "region", "items"],
+          relations: [
+            "discounts",
+            "discounts.rule",
+            "discounts.rule.valid_for",
+            "shipping_methods",
+            "region",
+            "items",
+          ],
         })
 
       await paymentProviderService

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

@@ -7,6 +7,8 @@ const defaultRelations = [
   "billing_address",
   "shipping_address",
   "discounts",
+  "discounts.rule",
+  "discounts.rule.valid_for",
   "shipping_methods",
   "payments",
   "fulfillments",

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

@@ -202,7 +202,12 @@ export default async (req, res) => {
               const order = await orderService
                 .withTransaction(manager)
                 .retrieve(id, {
-                  relations: ["items", "discounts"],
+                  relations: [
+                    "items",
+                    "cart",
+                    "cart.discounts",
+                    "cart.discounts.rule",
+                  ],
                 })
 
               await claimService.withTransaction(manager).create({

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

@@ -221,6 +221,8 @@ export const defaultRelations = [
   "billing_address",
   "shipping_address",
   "discounts",
+  "discounts.rule",
+  "discounts.rule.valid_for",
   "shipping_methods",
   "payments",
   "fulfillments",
@@ -316,6 +318,8 @@ export const allowedRelations = [
   "billing_address",
   "shipping_address",
   "discounts",
+  "discounts.rule",
+  "discounts.rule.valid_for",
   "shipping_methods",
   "payments",
   "fulfillments",

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

@@ -46,7 +46,11 @@ export default app => {
   )
 
   route.get("/:id", middlewares.wrap(require("./get-product").default))
-  route.get("/", middlewares.wrap(require("./list-products").default))
+  route.get(
+    "/",
+    middlewares.normalizeQuery(),
+    middlewares.wrap(require("./list-products").default)
+  )
 
   return app
 }
@@ -121,3 +125,18 @@ export const allowedRelations = [
   "type",
   "collection",
 ]
+
+export const filterableFields = [
+  "id",
+  "status",
+  "collection_id",
+  "tags",
+  "title",
+  "description",
+  "handle",
+  "is_giftcard",
+  "type",
+  "created_at",
+  "updated_at",
+  "deleted_at",
+]

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

@@ -1,6 +1,6 @@
 import _ from "lodash"
 import { MedusaError, Validator } from "medusa-core-utils"
-import { defaultFields, defaultRelations } from "./"
+import { defaultFields, defaultRelations, filterableFields } from "./"
 
 /**
  * @oas [get] /products
@@ -31,6 +31,17 @@ import { defaultFields, defaultRelations } from "./"
  *                 $ref: "#/components/schemas/product"
  */
 export default async (req, res) => {
+  const schema = Validator.productFilter()
+
+  const { value, error } = schema.validate(req.query)
+
+  if (error) {
+    throw new MedusaError(
+      MedusaError.Types.INVALID_DATA,
+      JSON.stringify(error.details)
+    )
+  }
+
   try {
     const productService = req.scope.resolve("productService")
 
@@ -53,21 +64,16 @@ export default async (req, res) => {
       expandFields = req.query.expand.split(",")
     }
 
-    if ("is_giftcard" in req.query) {
-      selector.is_giftcard = req.query.is_giftcard === "true"
+    for (const k of filterableFields) {
+      if (k in value) {
+        selector[k] = value[k]
+      }
     }
 
-    if ("status" in req.query) {
-      const schema = Validator.array()
-        .items(
-          Validator.string().valid("proposed", "draft", "published", "rejected")
-        )
-        .single()
-
-      const { value, error } = schema.validate(req.query.status)
-
-      if (value && !error) {
-        selector.status = value
+    if (selector.status?.indexOf("null") > -1) {
+      selector.status.splice(selector.status.indexOf("null"), 1)
+      if (selector.status.length === 0) {
+        delete selector.status
       }
     }
 

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

@@ -82,6 +82,14 @@ export default async (req, res) => {
       if (!value.region_id) {
         const regionService = req.scope.resolve("regionService")
         const regions = await regionService.withTransaction(manager).list({})
+
+        if (!regions?.length) {
+          throw new MedusaError(
+            MedusaError.Types.INVALID_DATA,
+            `A region is required to create a cart`
+          )
+        }
+
         regionId = regions[0].id
       }
 

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

@@ -116,4 +116,6 @@ export const defaultRelations = [
   "payment_sessions",
   "shipping_methods.shipping_option",
   "discounts",
+  "discounts.rule",
+  "discounts.rule.valid_for",
 ]

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

@@ -36,6 +36,8 @@ export const defaultRelations = [
   "items.variant.product",
   "shipping_methods",
   "discounts",
+  "discounts.rule",
+  "discounts.rule.valid_for",
   "customer",
   "payments",
   "region",
@@ -74,6 +76,8 @@ export const allowedRelations = [
   "items.variant.product",
   "shipping_methods",
   "discounts",
+  "discounts.rule",
+  "discounts.rule.valid_for",
   "customer",
   "payments",
   "region",

packages/medusa/src/api/routes/store/variants/__tests__/get-variant.js

@@ -16,7 +16,7 @@ describe("Get variant by id", () => {
     it("calls get variant from variantSerice", () => {
       expect(ProductVariantServiceMock.retrieve).toHaveBeenCalledTimes(1)
       expect(ProductVariantServiceMock.retrieve).toHaveBeenCalledWith("1", {
-        relations: ["prices"],
+        relations: ["prices", "options"],
       })
     })
 

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

@@ -12,4 +12,4 @@ export default app => {
   return app
 }
 
-export const defaultRelations = ["prices"]
+export const defaultRelations = ["prices", "options"]