diff --git a/.changeset/itchy-forks-relate.md b/.changeset/itchy-forks-relate.md new file mode 100644 index 0000000000000..c454d880f138a --- /dev/null +++ b/.changeset/itchy-forks-relate.md @@ -0,0 +1,5 @@ +--- +"@medusajs/medusa": patch +--- + +fix(medusa): Missing middlewares export diff --git a/packages/medusa/src/api-v2/admin/api-keys/middlewares.ts b/packages/medusa/src/api-v2/admin/api-keys/middlewares.ts index 8e9e00248625a..1993980313708 100644 --- a/packages/medusa/src/api-v2/admin/api-keys/middlewares.ts +++ b/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, diff --git a/packages/medusa/src/api-v2/admin/campaigns/middlewares.ts b/packages/medusa/src/api-v2/admin/campaigns/middlewares.ts index a83bfe4d37778..2a8c6f20da9b5 100644 --- a/packages/medusa/src/api-v2/admin/campaigns/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/admin/collections/middlewares.ts b/packages/medusa/src/api-v2/admin/collections/middlewares.ts index a584c53d4e570..4a86b57445753 100644 --- a/packages/medusa/src/api-v2/admin/collections/middlewares.ts +++ b/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, diff --git a/packages/medusa/src/api-v2/admin/currencies/middlewares.ts b/packages/medusa/src/api-v2/admin/currencies/middlewares.ts index 58f82d2f7dab0..ab49f125776c0 100644 --- a/packages/medusa/src/api-v2/admin/currencies/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/admin/customer-groups/middlewares.ts b/packages/medusa/src/api-v2/admin/customer-groups/middlewares.ts index a7c3dbacf2564..4356ee3de54d0 100644 --- a/packages/medusa/src/api-v2/admin/customer-groups/middlewares.ts +++ b/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, diff --git a/packages/medusa/src/api-v2/admin/customers/middlewares.ts b/packages/medusa/src/api-v2/admin/customers/middlewares.ts index 0306ba0b0e579..30a1664060cd6 100644 --- a/packages/medusa/src/api-v2/admin/customers/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/admin/draft-orders/middlewares.ts b/packages/medusa/src/api-v2/admin/draft-orders/middlewares.ts index 15a42ae7c9904..4964d2806c7e9 100644 --- a/packages/medusa/src/api-v2/admin/draft-orders/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/admin/fulfillment-providers/middlewares.ts b/packages/medusa/src/api-v2/admin/fulfillment-providers/middlewares.ts index 31c924d3f46fc..9b42a3d2b11a5 100644 --- a/packages/medusa/src/api-v2/admin/fulfillment-providers/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/admin/fulfillment-sets/middlewares.ts b/packages/medusa/src/api-v2/admin/fulfillment-sets/middlewares.ts index 9a378c6aa0939..f4bbf073d9f28 100644 --- a/packages/medusa/src/api-v2/admin/fulfillment-sets/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/admin/fulfillments/middlewares.ts b/packages/medusa/src/api-v2/admin/fulfillments/middlewares.ts index f1545f0e2c4ad..ebcaf91fcad99 100644 --- a/packages/medusa/src/api-v2/admin/fulfillments/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/admin/inventory-items/middlewares.ts b/packages/medusa/src/api-v2/admin/inventory-items/middlewares.ts index 4448c33c39477..bb6a336cc2c22 100644 --- a/packages/medusa/src/api-v2/admin/inventory-items/middlewares.ts +++ b/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, diff --git a/packages/medusa/src/api-v2/admin/invites/middlewares.ts b/packages/medusa/src/api-v2/admin/invites/middlewares.ts index 755b69edddbc8..b13f7591abe50 100644 --- a/packages/medusa/src/api-v2/admin/invites/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/admin/orders/middlewares.ts b/packages/medusa/src/api-v2/admin/orders/middlewares.ts index a5974dad042e3..9208d9fdbd49b 100644 --- a/packages/medusa/src/api-v2/admin/orders/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/admin/payments/middlewares.ts b/packages/medusa/src/api-v2/admin/payments/middlewares.ts index 7d0bcc3f4a7c4..acdf36bdd8bbb 100644 --- a/packages/medusa/src/api-v2/admin/payments/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/admin/price-lists/middlewares.ts b/packages/medusa/src/api-v2/admin/price-lists/middlewares.ts index 4982c54976183..178e91f80ca9e 100644 --- a/packages/medusa/src/api-v2/admin/price-lists/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/admin/pricing/middlewares.ts b/packages/medusa/src/api-v2/admin/pricing/middlewares.ts index 9075afdf6513b..98732f27a244d 100644 --- a/packages/medusa/src/api-v2/admin/pricing/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/admin/product-categories/middlewares.ts b/packages/medusa/src/api-v2/admin/product-categories/middlewares.ts index e62f07a9a60a8..e871e666120ba 100644 --- a/packages/medusa/src/api-v2/admin/product-categories/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/admin/product-types/middlewares.ts b/packages/medusa/src/api-v2/admin/product-types/middlewares.ts index 903202651d3f9..55fd9534da8db 100644 --- a/packages/medusa/src/api-v2/admin/product-types/middlewares.ts +++ b/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, diff --git a/packages/medusa/src/api-v2/admin/products/middlewares.ts b/packages/medusa/src/api-v2/admin/products/middlewares.ts index 5f431ba4e97c9..1df9084c44206 100644 --- a/packages/medusa/src/api-v2/admin/products/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/admin/promotions/middlewares.ts b/packages/medusa/src/api-v2/admin/promotions/middlewares.ts index d0bb738b7360c..d708b54cbc380 100644 --- a/packages/medusa/src/api-v2/admin/promotions/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/admin/regions/middlewares.ts b/packages/medusa/src/api-v2/admin/regions/middlewares.ts index aa175b1dccb37..5ce7620c7d488 100644 --- a/packages/medusa/src/api-v2/admin/regions/middlewares.ts +++ b/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, diff --git a/packages/medusa/src/api-v2/admin/reservations/middlewares.ts b/packages/medusa/src/api-v2/admin/reservations/middlewares.ts index 6cd787a7574cd..45cac0485e85d 100644 --- a/packages/medusa/src/api-v2/admin/reservations/middlewares.ts +++ b/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, diff --git a/packages/medusa/src/api-v2/admin/sales-channels/middlewares.ts b/packages/medusa/src/api-v2/admin/sales-channels/middlewares.ts index c976e1b77d051..ac249fffa7a06 100644 --- a/packages/medusa/src/api-v2/admin/sales-channels/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/admin/shipping-options/middlewares.ts b/packages/medusa/src/api-v2/admin/shipping-options/middlewares.ts index 32d2fd8dc985d..335ac3142ecee 100644 --- a/packages/medusa/src/api-v2/admin/shipping-options/middlewares.ts +++ b/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, diff --git a/packages/medusa/src/api-v2/admin/shipping-profiles/middlewares.ts b/packages/medusa/src/api-v2/admin/shipping-profiles/middlewares.ts index 56ebd7278f18f..88a4b26ab891a 100644 --- a/packages/medusa/src/api-v2/admin/shipping-profiles/middlewares.ts +++ b/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 { diff --git a/packages/medusa/src/api-v2/admin/stock-locations/middlewares.ts b/packages/medusa/src/api-v2/admin/stock-locations/middlewares.ts index 18f67160bbdc5..cc106409a1774 100644 --- a/packages/medusa/src/api-v2/admin/stock-locations/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/admin/stores/middlewares.ts b/packages/medusa/src/api-v2/admin/stores/middlewares.ts index 5dd2672ee94ce..b128c13b71e7f 100644 --- a/packages/medusa/src/api-v2/admin/stores/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/admin/tax-rates/middlewares.ts b/packages/medusa/src/api-v2/admin/tax-rates/middlewares.ts index 63e810ef8db54..84a5928f4281d 100644 --- a/packages/medusa/src/api-v2/admin/tax-rates/middlewares.ts +++ b/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[] = [ diff --git a/packages/medusa/src/api-v2/admin/tax-regions/middlewares.ts b/packages/medusa/src/api-v2/admin/tax-regions/middlewares.ts index 288dcd9245b8b..4bf30a9abac92 100644 --- a/packages/medusa/src/api-v2/admin/tax-regions/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/admin/uploads/middlewares.ts b/packages/medusa/src/api-v2/admin/uploads/middlewares.ts index 74a30ca058912..c4a5eba550ef1 100644 --- a/packages/medusa/src/api-v2/admin/uploads/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/admin/users/middlewares.ts b/packages/medusa/src/api-v2/admin/users/middlewares.ts index 0106d9cdbf9ed..261e0f4303bbd 100644 --- a/packages/medusa/src/api-v2/admin/users/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/admin/workflows-executions/middlewares.ts b/packages/medusa/src/api-v2/admin/workflows-executions/middlewares.ts index 0a90fe3c8a4c8..43558acf4d85b 100644 --- a/packages/medusa/src/api-v2/admin/workflows-executions/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/auth/middlewares.ts b/packages/medusa/src/api-v2/auth/middlewares.ts index 499a192c48d6d..3c67152a73d9c 100644 --- a/packages/medusa/src/api-v2/auth/middlewares.ts +++ b/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[] = [ { diff --git a/packages/medusa/src/api-v2/store/carts/middlewares.ts b/packages/medusa/src/api-v2/store/carts/middlewares.ts index 749bbd8e094d9..1827d74034989 100644 --- a/packages/medusa/src/api-v2/store/carts/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/store/customers/middlewares.ts b/packages/medusa/src/api-v2/store/customers/middlewares.ts index 6910189c89c7b..a8b72f87939ed 100644 --- a/packages/medusa/src/api-v2/store/customers/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/store/orders/middlewares.ts b/packages/medusa/src/api-v2/store/orders/middlewares.ts index f172f5acd772c..c5bf47ab0bb62 100644 --- a/packages/medusa/src/api-v2/store/orders/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/store/payment-collections/middlewares.ts b/packages/medusa/src/api-v2/store/payment-collections/middlewares.ts index 5d438072ee44e..153b62cd665a7 100644 --- a/packages/medusa/src/api-v2/store/payment-collections/middlewares.ts +++ b/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" diff --git a/packages/medusa/src/api-v2/store/products/middlewares.ts b/packages/medusa/src/api-v2/store/products/middlewares.ts index 0c727c836f312..8527265fc579c 100644 --- a/packages/medusa/src/api-v2/store/products/middlewares.ts +++ b/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, diff --git a/packages/medusa/src/loaders/helpers/routing/index.ts b/packages/medusa/src/loaders/helpers/routing/index.ts index df40b43bff9f4..933cce0e8ad8e 100644 --- a/packages/medusa/src/loaders/helpers/routing/index.ts +++ b/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) { diff --git a/packages/medusa/src/utils/index.ts b/packages/medusa/src/utils/index.ts index 5b25a5dcaf795..f3e6dcbd2468b 100644 --- a/packages/medusa/src/utils/index.ts +++ b/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" diff --git a/packages/medusa/src/utils/authenticate-middleware.ts b/packages/medusa/src/utils/middlewares/authenticate-middleware.ts similarity index 99% rename from packages/medusa/src/utils/authenticate-middleware.ts rename to packages/medusa/src/utils/middlewares/authenticate-middleware.ts index 327e07e9870b3..7d5b3d78d3323 100644 --- a/packages/medusa/src/utils/authenticate-middleware.ts +++ b/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" diff --git a/packages/medusa/src/utils/middlewares/index.ts b/packages/medusa/src/utils/middlewares/index.ts index ee4cdcd5e9e20..97453ab2d363f 100644 --- a/packages/medusa/src/utils/middlewares/index.ts +++ b/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"