Merge branch 'develop' into feat/medusa-app-listen

.changeset/happy-mirrors-decide.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+chore(medusa): strict zod versions in workspace

.changeset/itchy-forks-relate.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+fix(medusa): Missing middlewares export

package.json

@@ -77,8 +77,8 @@
  "test:integration:packages": "turbo run test:integration --concurrency=50% --no-daemon --no-cache --force --filter='./packages/*' --filter='./packages/core/*' --filter='./packages/cli/*' --filter='./packages/modules/*' --filter='./packages/modules/providers/*'",
  "test:integration:api": "turbo run test:integration:chunk --concurrency=50% --no-daemon --no-cache --force --filter=integration-tests-api",
  "test:integration:modules": "turbo run test:integration:chunk --concurrency=50% --no-daemon --no-cache --force --filter=integration-tests-modules",
- "openapi:generate": "yarn ./packages/oas/oas-github-ci run ci --with-full-file --v2",
- "medusa-oas": "yarn ./packages/oas/medusa-oas-cli run medusa-oas --v2",
+ "openapi:generate": "yarn ./packages/cli/oas/oas-github-ci run ci --with-full-file --v2",
+ "medusa-oas": "yarn ./packages/cli/oas/medusa-oas-cli run medusa-oas --v2",
  "release:snapshot": "changeset publish --no-git-tags --snapshot --tag snapshot",
  "release:next": "chgstangeset publish --no-git-tags --snapshot --tag next",
  "version:next": "changeset version --snapshot next",

packages/medusa/package.json

@@ -103,7 +103,7 @@
  "ulid": "^2.3.0",
  "uuid": "^9.0.0",
  "winston": "^3.8.2",
- "zod": "^3.22.4"
+ "zod": "3.22.4"
  },
  "gitHead": "cd1f5afa5aa8c0b15ea957008ee19f1d695cbd2e"
 }

packages/medusa/src/api-v2/admin/api-keys/middlewares.ts

@@ -1,7 +1,7 @@
 import * as QueryConfig from "./query-config"
 
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import {
  AdminCreateApiKey,

packages/medusa/src/api-v2/admin/campaigns/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformBody } from "../../utils/validate-body"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import { createLinkBody } from "../../utils/validators"

packages/medusa/src/api-v2/admin/collections/middlewares.ts

@@ -1,6 +1,6 @@
 import * as QueryConfig from "./query-config"
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import {
  AdminCreateCollection,

packages/medusa/src/api-v2/admin/currencies/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import * as QueryConfig from "./query-config"
 import { AdminGetCurrencyParams, AdminGetCurrenciesParams } from "./validators"

packages/medusa/src/api-v2/admin/customer-groups/middlewares.ts

@@ -1,6 +1,6 @@
 import * as QueryConfig from "./query-config"
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import {
  AdminCreateCustomerGroup,

packages/medusa/src/api-v2/admin/customers/middlewares.ts

@@ -11,7 +11,7 @@ import {
 } from "./validators"
 
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformBody } from "../../utils/validate-body"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 

packages/medusa/src/api-v2/admin/draft-orders/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformBody } from "../../utils/validate-body"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import * as QueryConfig from "./query-config"

packages/medusa/src/api-v2/admin/fulfillment-providers/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../../types/middlewares"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import * as QueryConfig from "./query-config"
 import { AdminFulfillmentProvidersParams } from "./validators"

packages/medusa/src/api-v2/admin/fulfillment-sets/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../../types/middlewares"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformBody } from "../../utils/validate-body"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import * as QueryConfig from "./query-config"

packages/medusa/src/api-v2/admin/fulfillments/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../../types/middlewares"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformBody } from "../../utils/validate-body"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import * as QueryConfig from "./query-config"

packages/medusa/src/api-v2/admin/inventory-items/middlewares.ts

@@ -1,6 +1,6 @@
 import * as QueryConfig from "./query-config"
 import { MiddlewareRoute } from "../../../types/middlewares"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import {
  AdminCreateInventoryItem,

packages/medusa/src/api-v2/admin/invites/middlewares.ts

@@ -9,7 +9,7 @@ import {
 } from "./validators"
 
 import { MiddlewareRoute } from "../../../types/middlewares"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import { validateAndTransformBody } from "../../utils/validate-body"
 

packages/medusa/src/api-v2/admin/orders/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import * as QueryConfig from "./query-config"
 import { AdminGetOrdersOrderParams, AdminGetOrdersParams } from "./validators"

packages/medusa/src/api-v2/admin/payments/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../../types/middlewares"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { unlessPath } from "../../utils/unless-path"
 import { validateAndTransformBody } from "../../utils/validate-body"
 import { validateAndTransformQuery } from "../../utils/validate-query"

packages/medusa/src/api-v2/admin/price-lists/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformBody } from "../../utils/validate-body"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import { createBatchBody, createLinkBody } from "../../utils/validators"

packages/medusa/src/api-v2/admin/pricing/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformBody } from "../../utils/validate-body"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import * as QueryConfig from "./query-config"

packages/medusa/src/api-v2/admin/product-categories/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformBody } from "../../utils/validate-body"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import { createLinkBody } from "../../utils/validators"

packages/medusa/src/api-v2/admin/product-types/middlewares.ts

@@ -1,6 +1,6 @@
 import * as QueryConfig from "./query-config"
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import {
  AdminCreateProductType,

packages/medusa/src/api-v2/admin/products/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { maybeApplyLinkFilter } from "../../utils/maybe-apply-link-filter"
 import { unlessPath } from "../../utils/unless-path"
 import { validateAndTransformBody } from "../../utils/validate-body"

packages/medusa/src/api-v2/admin/promotions/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformBody } from "../../utils/validate-body"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import { createBatchBody } from "../../utils/validators"

packages/medusa/src/api-v2/admin/regions/middlewares.ts

@@ -1,6 +1,6 @@
 import * as QueryConfig from "./query-config"
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import {
  AdminCreateRegion,

packages/medusa/src/api-v2/admin/reservations/middlewares.ts

@@ -1,7 +1,7 @@
 import * as QueryConfig from "./query-config"
 
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import {
  AdminCreateReservation,

packages/medusa/src/api-v2/admin/sales-channels/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { maybeApplyLinkFilter } from "../../utils/maybe-apply-link-filter"
 import { validateAndTransformBody } from "../../utils/validate-body"
 import { validateAndTransformQuery } from "../../utils/validate-query"

packages/medusa/src/api-v2/admin/shipping-options/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import {
  AdminCreateShippingOption,
  AdminCreateShippingOptionRule,

packages/medusa/src/api-v2/admin/shipping-profiles/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformBody } from "../../utils/validate-body"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import {

packages/medusa/src/api-v2/admin/stock-locations/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../../types/middlewares"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { maybeApplyLinkFilter } from "../../utils/maybe-apply-link-filter"
 import { validateAndTransformBody } from "../../utils/validate-body"
 import { validateAndTransformQuery } from "../../utils/validate-query"

packages/medusa/src/api-v2/admin/stores/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformBody } from "../../utils/validate-body"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import * as QueryConfig from "./query-config"

packages/medusa/src/api-v2/admin/tax-rates/middlewares.ts

@@ -10,7 +10,7 @@ import {
 } from "./validators"
 
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformBody } from "../../utils/validate-body"
 
 export const adminTaxRateRoutesMiddlewares: MiddlewareRoute[] = [

packages/medusa/src/api-v2/admin/tax-regions/middlewares.ts

@@ -7,7 +7,7 @@ import {
 } from "./validators"
 
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformBody } from "../../utils/validate-body"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 

packages/medusa/src/api-v2/admin/uploads/middlewares.ts

@@ -1,6 +1,6 @@
 import multer from "multer"
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import { retrieveUploadConfig } from "./query-config"
 import { AdminGetUploadParams } from "./validators"

packages/medusa/src/api-v2/admin/users/middlewares.ts

@@ -8,7 +8,7 @@ import {
 } from "./validators"
 
 import { MiddlewareRoute } from "../../../types/middlewares"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import { validateAndTransformBody } from "../../utils/validate-body"
 

packages/medusa/src/api-v2/admin/workflows-executions/middlewares.ts

@@ -8,7 +8,7 @@ import {
 } from "./validators"
 
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import { validateAndTransformBody } from "../../utils/validate-body"
 

packages/medusa/src/api-v2/auth/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../types/middlewares"
-import { authenticate } from "../../utils/authenticate-middleware"
+import { authenticate } from "../../utils/middlewares/authenticate-middleware"
 
 export const authRoutesMiddlewares: MiddlewareRoute[] = [
  {

packages/medusa/src/api-v2/store/carts/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformBody } from "../../utils/validate-body"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import * as OrderQueryConfig from "../orders/query-config"

packages/medusa/src/api-v2/store/customers/middlewares.ts

@@ -11,7 +11,7 @@ import {
 } from "./validators"
 
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformBody } from "../../utils/validate-body"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 

packages/medusa/src/api-v2/store/orders/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import * as QueryConfig from "./query-config"
 import { StoreGetOrderParams, StoreGetOrdersParams } from "./validators"

packages/medusa/src/api-v2/store/payment-collections/middlewares.ts

@@ -1,5 +1,5 @@
 import { MiddlewareRoute } from "../../../types/middlewares"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { validateAndTransformBody } from "../../utils/validate-body"
 import { validateAndTransformQuery } from "../../utils/validate-query"
 import * as queryConfig from "./query-config"

packages/medusa/src/api-v2/store/products/middlewares.ts

@@ -1,6 +1,6 @@
 import { isPresent, ProductStatus } from "@medusajs/utils"
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { authenticate } from "../../../utils/middlewares/authenticate-middleware"
 import { maybeApplyLinkFilter } from "../../utils/maybe-apply-link-filter"
 import {
  applyDefaultFilters,

packages/medusa/src/loaders/helpers/routing/index.ts

@@ -1,12 +1,12 @@
 import { promiseAll, wrapHandler } from "@medusajs/utils"
 import cors from "cors"
-import { Router, json, text, urlencoded, type Express } from "express"
+import { type Express, json, Router, text, urlencoded } from "express"
 import { readdir } from "fs/promises"
 import { parseCorsOrigins } from "medusa-core-utils"
 import { extname, join, sep } from "path"
 import {
- authenticate,
  authenticateCustomer,
+ authenticateLegacy,
  errorHandler,
  requireCustomerAuthentication,
 } from "../../../utils/middlewares"
@@ -18,8 +18,8 @@ import {
  GlobalMiddlewareDescriptor,
  HTTP_METHODS,
  MiddlewareRoute,
- MiddlewareVerb,
  MiddlewaresConfig,
+ MiddlewareVerb,
  ParserConfigArgs,
  RouteConfig,
  RouteDescriptor,
@@ -665,7 +665,7 @@ export class RoutesLoader {
  /**
  * Require the admin to be authenticated
  */
- this.router.use(descriptor.route, authenticate())
+ this.router.use(descriptor.route, authenticateLegacy())
  }
 
  for (const route of routes) {

packages/medusa/src/utils/index.ts

@@ -16,3 +16,4 @@ export * from "./set-metadata"
 export * from "./validate-id"
 export { registerOverriddenValidators, validator } from "./validator"
 export * from "./validators/is-type"
+export * from "./middlewares"

packages/medusa/src/utils/authenticate-middleware.ts → packages/medusa/src/utils/middlewares/authenticate-middleware.ts

@@ -7,7 +7,7 @@ import {
  AuthenticatedMedusaRequest,
  MedusaRequest,
  MedusaResponse,
-} from "../types/routing"
+} from "../../types/routing"
 
 const SESSION_AUTH = "session"
 const BEARER_AUTH = "bearer"

packages/medusa/src/utils/middlewares/index.ts

@@ -1,4 +1,5 @@
-export { default as authenticate } from "./authenticate"
+export { default as authenticateLegacy } from "./authenticate"
+export { authenticate } from "./authenticate-middleware"
 export { default as authenticateCustomer } from "./authenticate-customer"
 export { default as wrapHandler } from "./await-middleware"
 export { default as errorHandler } from "./error-handler"