chore: remove container registration name (#9137)
This commit is contained in:
@@ -2,7 +2,7 @@ import { beginClaimOrderWorkflow } from "@medusajs/core-flows"
|
||||
import { HttpTypes } from "@medusajs/types"
|
||||
import {
|
||||
ContainerRegistrationKeys,
|
||||
ModuleRegistrationName,
|
||||
Modules,
|
||||
promiseAll,
|
||||
remoteQueryObjectFromString,
|
||||
} from "@medusajs/utils"
|
||||
@@ -49,7 +49,7 @@ export const POST = async (
|
||||
}
|
||||
|
||||
const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)
|
||||
const orderModuleService = req.scope.resolve(ModuleRegistrationName.ORDER)
|
||||
const orderModuleService = req.scope.resolve(Modules.ORDER)
|
||||
|
||||
const workflow = beginClaimOrderWorkflow(req.scope)
|
||||
const { result } = await workflow.run({
|
||||
|
||||
@@ -2,7 +2,7 @@ import { beginExchangeOrderWorkflow } from "@medusajs/core-flows"
|
||||
import { HttpTypes } from "@medusajs/types"
|
||||
import {
|
||||
ContainerRegistrationKeys,
|
||||
ModuleRegistrationName,
|
||||
Modules,
|
||||
promiseAll,
|
||||
remoteQueryObjectFromString,
|
||||
} from "@medusajs/utils"
|
||||
@@ -49,7 +49,7 @@ export const POST = async (
|
||||
}
|
||||
|
||||
const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)
|
||||
const orderModuleService = req.scope.resolve(ModuleRegistrationName.ORDER)
|
||||
const orderModuleService = req.scope.resolve(Modules.ORDER)
|
||||
|
||||
const workflow = beginExchangeOrderWorkflow(req.scope)
|
||||
const { result } = await workflow.run({
|
||||
|
||||
+3
-3
@@ -11,7 +11,7 @@ import {
|
||||
import {
|
||||
ContainerRegistrationKeys,
|
||||
MedusaError,
|
||||
ModuleRegistrationName,
|
||||
Modules,
|
||||
remoteQueryObjectFromString,
|
||||
} from "@medusajs/utils"
|
||||
import {
|
||||
@@ -52,7 +52,7 @@ export const POST = async (
|
||||
res: MedusaResponse<AdminFulfillmentSetResponse>
|
||||
) => {
|
||||
const fulfillmentModuleService = req.scope.resolve<IFulfillmentModuleService>(
|
||||
ModuleRegistrationName.FULFILLMENT
|
||||
Modules.FULFILLMENT
|
||||
)
|
||||
|
||||
// ensure fulfillment set exists and that the service zone is part of it
|
||||
@@ -99,7 +99,7 @@ export const DELETE = async (
|
||||
const { id, zone_id } = req.params
|
||||
|
||||
const fulfillmentModuleService = req.scope.resolve<IFulfillmentModuleService>(
|
||||
ModuleRegistrationName.FULFILLMENT
|
||||
Modules.FULFILLMENT
|
||||
)
|
||||
|
||||
// ensure fulfillment set exists and that the service zone is part of it
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import { ModuleRegistrationName } from "@medusajs/utils"
|
||||
import { HttpTypes } from "@medusajs/types"
|
||||
import { Modules } from "@medusajs/utils"
|
||||
import {
|
||||
AuthenticatedMedusaRequest,
|
||||
MedusaResponse,
|
||||
} from "../../../../../types/routing"
|
||||
import { HttpTypes } from "@medusajs/types"
|
||||
|
||||
export const GET = async (
|
||||
req: AuthenticatedMedusaRequest,
|
||||
@@ -12,7 +12,7 @@ export const GET = async (
|
||||
const { id } = req.params
|
||||
|
||||
// NOTE: Consider replacing with remoteQuery when possible
|
||||
const orderModuleService = req.scope.resolve(ModuleRegistrationName.ORDER)
|
||||
const orderModuleService = req.scope.resolve(Modules.ORDER)
|
||||
|
||||
const order = (await orderModuleService.previewOrderChange(
|
||||
id
|
||||
|
||||
@@ -3,12 +3,12 @@ import {
|
||||
MedusaResponse,
|
||||
} from "../../../../../../types/routing"
|
||||
|
||||
import { IWorkflowEngineService } from "@medusajs/types"
|
||||
import { ModuleRegistrationName, TransactionHandlerType } from "@medusajs/utils"
|
||||
import {
|
||||
importProductsWorkflowId,
|
||||
waitConfirmationProductImportStepId,
|
||||
} from "@medusajs/core-flows"
|
||||
import { IWorkflowEngineService } from "@medusajs/types"
|
||||
import { Modules, TransactionHandlerType } from "@medusajs/utils"
|
||||
import { StepResponse } from "@medusajs/workflows-sdk"
|
||||
|
||||
export const POST = async (
|
||||
@@ -16,7 +16,7 @@ export const POST = async (
|
||||
res: MedusaResponse
|
||||
) => {
|
||||
const workflowEngineService: IWorkflowEngineService = req.scope.resolve(
|
||||
ModuleRegistrationName.WORKFLOW_ENGINE
|
||||
Modules.WORKFLOW_ENGINE
|
||||
)
|
||||
const transactionId = req.params.transaction_id
|
||||
|
||||
|
||||
@@ -2,9 +2,10 @@ import {
|
||||
beginReceiveReturnWorkflow,
|
||||
cancelReturnReceiveWorkflow,
|
||||
} from "@medusajs/core-flows"
|
||||
import { HttpTypes } from "@medusajs/types"
|
||||
import {
|
||||
ContainerRegistrationKeys,
|
||||
ModuleRegistrationName,
|
||||
Modules,
|
||||
promiseAll,
|
||||
remoteQueryObjectFromString,
|
||||
} from "@medusajs/utils"
|
||||
@@ -13,14 +14,13 @@ import {
|
||||
MedusaResponse,
|
||||
} from "../../../../../types/routing"
|
||||
import { AdminPostReceiveReturnsReqSchemaType } from "../../validators"
|
||||
import { HttpTypes } from "@medusajs/types"
|
||||
|
||||
export const POST = async (
|
||||
req: AuthenticatedMedusaRequest<AdminPostReceiveReturnsReqSchemaType>,
|
||||
res: MedusaResponse<HttpTypes.AdminOrderReturnResponse>
|
||||
) => {
|
||||
const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)
|
||||
const orderModuleService = req.scope.resolve(ModuleRegistrationName.ORDER)
|
||||
const orderModuleService = req.scope.resolve(Modules.ORDER)
|
||||
|
||||
const { id } = req.params
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ import { beginReturnOrderWorkflow } from "@medusajs/core-flows"
|
||||
import { HttpTypes } from "@medusajs/types"
|
||||
import {
|
||||
ContainerRegistrationKeys,
|
||||
ModuleRegistrationName,
|
||||
Modules,
|
||||
promiseAll,
|
||||
remoteQueryObjectFromString,
|
||||
} from "@medusajs/utils"
|
||||
@@ -49,7 +49,7 @@ export const POST = async (
|
||||
}
|
||||
|
||||
const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)
|
||||
const orderModuleService = req.scope.resolve(ModuleRegistrationName.ORDER)
|
||||
const orderModuleService = req.scope.resolve(Modules.ORDER)
|
||||
|
||||
const workflow = beginReturnOrderWorkflow(req.scope)
|
||||
const { result } = await workflow.run({
|
||||
|
||||
@@ -3,7 +3,7 @@ import {
|
||||
updateShippingProfilesWorkflow,
|
||||
} from "@medusajs/core-flows"
|
||||
import { HttpTypes, IFulfillmentModuleService } from "@medusajs/types"
|
||||
import { ModuleRegistrationName } from "@medusajs/utils"
|
||||
import { Modules } from "@medusajs/utils"
|
||||
import {
|
||||
AuthenticatedMedusaRequest,
|
||||
MedusaResponse,
|
||||
@@ -34,7 +34,7 @@ export const DELETE = async (
|
||||
const { id } = req.params
|
||||
|
||||
const fulfillmentModuleService = req.scope.resolve<IFulfillmentModuleService>(
|
||||
ModuleRegistrationName.FULFILLMENT
|
||||
Modules.FULFILLMENT
|
||||
)
|
||||
|
||||
// Test if exists
|
||||
|
||||
+2
-2
@@ -4,14 +4,14 @@ import {
|
||||
MedusaResponse,
|
||||
} from "../../../../../../../types/routing"
|
||||
|
||||
import { ModuleRegistrationName } from "@medusajs/utils"
|
||||
import { Modules } from "@medusajs/utils"
|
||||
|
||||
export const GET = async (
|
||||
req: AuthenticatedMedusaRequest,
|
||||
res: MedusaResponse
|
||||
) => {
|
||||
const workflowEngineService: IWorkflowEngineService = req.scope.resolve(
|
||||
ModuleRegistrationName.WORKFLOW_ENGINE
|
||||
Modules.WORKFLOW_ENGINE
|
||||
)
|
||||
|
||||
const { workflow_id, transaction_id } = req.query as any
|
||||
|
||||
@@ -3,7 +3,7 @@ import {
|
||||
IWorkflowEngineService,
|
||||
WorkflowOrchestratorRunDTO,
|
||||
} from "@medusajs/types"
|
||||
import { ModuleRegistrationName } from "@medusajs/utils"
|
||||
import { Modules } from "@medusajs/utils"
|
||||
import {
|
||||
AuthenticatedMedusaRequest,
|
||||
MedusaResponse,
|
||||
@@ -15,7 +15,7 @@ export const POST = async (
|
||||
res: MedusaResponse<HttpTypes.AdminWorkflowRunResponse>
|
||||
) => {
|
||||
const workflowEngineService: IWorkflowEngineService = req.scope.resolve(
|
||||
ModuleRegistrationName.WORKFLOW_ENGINE
|
||||
Modules.WORKFLOW_ENGINE
|
||||
)
|
||||
|
||||
const { workflow_id } = req.params
|
||||
|
||||
+2
-2
@@ -6,7 +6,7 @@ import {
|
||||
} from "../../../../../../types/routing"
|
||||
|
||||
import { IWorkflowEngineService } from "@medusajs/types"
|
||||
import { ModuleRegistrationName } from "@medusajs/utils"
|
||||
import { Modules } from "@medusajs/utils"
|
||||
import { AdminCreateWorkflowsAsyncResponseType } from "../../../validators"
|
||||
|
||||
export const POST = async (
|
||||
@@ -14,7 +14,7 @@ export const POST = async (
|
||||
res: MedusaResponse<{ success: boolean }>
|
||||
) => {
|
||||
const workflowEngineService: IWorkflowEngineService = req.scope.resolve(
|
||||
ModuleRegistrationName.WORKFLOW_ENGINE
|
||||
Modules.WORKFLOW_ENGINE
|
||||
)
|
||||
|
||||
const { workflow_id } = req.params
|
||||
|
||||
+2
-2
@@ -6,7 +6,7 @@ import {
|
||||
} from "../../../../../../types/routing"
|
||||
|
||||
import { IWorkflowEngineService } from "@medusajs/types"
|
||||
import { ModuleRegistrationName } from "@medusajs/utils"
|
||||
import { Modules } from "@medusajs/utils"
|
||||
import { AdminCreateWorkflowsAsyncResponseType } from "../../../validators"
|
||||
|
||||
export const POST = async (
|
||||
@@ -14,7 +14,7 @@ export const POST = async (
|
||||
res: MedusaResponse<{ success: boolean }>
|
||||
) => {
|
||||
const workflowEngineService: IWorkflowEngineService = req.scope.resolve(
|
||||
ModuleRegistrationName.WORKFLOW_ENGINE
|
||||
Modules.WORKFLOW_ENGINE
|
||||
)
|
||||
|
||||
const { workflow_id } = req.params
|
||||
|
||||
@@ -4,14 +4,14 @@ import {
|
||||
MedusaResponse,
|
||||
} from "../../../../../types/routing"
|
||||
|
||||
import { ModuleRegistrationName } from "@medusajs/utils"
|
||||
import { Modules } from "@medusajs/utils"
|
||||
|
||||
export const GET = async (
|
||||
req: AuthenticatedMedusaRequest,
|
||||
res: MedusaResponse
|
||||
) => {
|
||||
const workflowEngineService: IWorkflowEngineService = req.scope.resolve(
|
||||
ModuleRegistrationName.WORKFLOW_ENGINE
|
||||
Modules.WORKFLOW_ENGINE
|
||||
)
|
||||
|
||||
const { workflow_id } = req.query as any
|
||||
|
||||
@@ -6,7 +6,7 @@ import {
|
||||
import {
|
||||
ContainerRegistrationKeys,
|
||||
MedusaError,
|
||||
ModuleRegistrationName,
|
||||
Modules,
|
||||
} from "@medusajs/utils"
|
||||
import { MedusaRequest, MedusaResponse } from "../../../../../types/routing"
|
||||
import { generateJwtTokenForAuthIdentity } from "../../../utils/generate-jwt-token"
|
||||
@@ -17,9 +17,7 @@ export const GET = async (req: MedusaRequest, res: MedusaResponse) => {
|
||||
const config: ConfigModule = req.scope.resolve(
|
||||
ContainerRegistrationKeys.CONFIG_MODULE
|
||||
)
|
||||
const service: IAuthModuleService = req.scope.resolve(
|
||||
ModuleRegistrationName.AUTH
|
||||
)
|
||||
const service: IAuthModuleService = req.scope.resolve(Modules.AUTH)
|
||||
|
||||
const authData = {
|
||||
url: req.url,
|
||||
|
||||
@@ -6,7 +6,7 @@ import {
|
||||
import {
|
||||
ContainerRegistrationKeys,
|
||||
MedusaError,
|
||||
ModuleRegistrationName,
|
||||
Modules,
|
||||
} from "@medusajs/utils"
|
||||
import { MedusaRequest, MedusaResponse } from "../../../../../types/routing"
|
||||
import { generateJwtTokenForAuthIdentity } from "../../../utils/generate-jwt-token"
|
||||
@@ -17,9 +17,7 @@ export const POST = async (req: MedusaRequest, res: MedusaResponse) => {
|
||||
ContainerRegistrationKeys.CONFIG_MODULE
|
||||
)
|
||||
|
||||
const service: IAuthModuleService = req.scope.resolve(
|
||||
ModuleRegistrationName.AUTH
|
||||
)
|
||||
const service: IAuthModuleService = req.scope.resolve(Modules.AUTH)
|
||||
|
||||
const authData = {
|
||||
url: req.url,
|
||||
|
||||
@@ -6,7 +6,7 @@ import {
|
||||
import {
|
||||
ContainerRegistrationKeys,
|
||||
MedusaError,
|
||||
ModuleRegistrationName,
|
||||
Modules,
|
||||
} from "@medusajs/utils"
|
||||
import { MedusaRequest, MedusaResponse } from "../../../../types/routing"
|
||||
import { generateJwtTokenForAuthIdentity } from "../../utils/generate-jwt-token"
|
||||
@@ -17,9 +17,7 @@ export const GET = async (req: MedusaRequest, res: MedusaResponse) => {
|
||||
ContainerRegistrationKeys.CONFIG_MODULE
|
||||
)
|
||||
|
||||
const service: IAuthModuleService = req.scope.resolve(
|
||||
ModuleRegistrationName.AUTH
|
||||
)
|
||||
const service: IAuthModuleService = req.scope.resolve(Modules.AUTH)
|
||||
|
||||
const authData = {
|
||||
url: req.url,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { AuthenticatedMedusaRequest } from "@medusajs/framework"
|
||||
import { IAuthModuleService } from "@medusajs/types"
|
||||
import { MedusaError, ModuleRegistrationName } from "@medusajs/utils"
|
||||
import { MedusaError, Modules } from "@medusajs/utils"
|
||||
import { MedusaResponse } from "../../../../../types/routing"
|
||||
|
||||
export const POST = async (
|
||||
@@ -9,9 +9,7 @@ export const POST = async (
|
||||
) => {
|
||||
const { auth_provider } = req.params
|
||||
|
||||
const authService = req.scope.resolve<IAuthModuleService>(
|
||||
ModuleRegistrationName.AUTH
|
||||
)
|
||||
const authService = req.scope.resolve<IAuthModuleService>(Modules.AUTH)
|
||||
|
||||
const { authIdentity, success, error } = await authService.updateProvider(
|
||||
auth_provider,
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
import { IAuthModuleService } from "@medusajs/types"
|
||||
import { ContainerRegistrationKeys, Modules } from "@medusajs/utils"
|
||||
import {
|
||||
AuthenticatedMedusaRequest,
|
||||
MedusaResponse,
|
||||
} from "../../../../types/routing"
|
||||
import {
|
||||
ContainerRegistrationKeys,
|
||||
ModuleRegistrationName,
|
||||
} from "@medusajs/utils"
|
||||
import { generateJwtTokenForAuthIdentity } from "../../utils/generate-jwt-token"
|
||||
|
||||
// Retrieve a newly generated JWT token. All checks that the existing token is valid already happen in the auth middleware.
|
||||
@@ -16,9 +13,7 @@ export const POST = async (
|
||||
req: AuthenticatedMedusaRequest,
|
||||
res: MedusaResponse
|
||||
) => {
|
||||
const service: IAuthModuleService = req.scope.resolve(
|
||||
ModuleRegistrationName.AUTH
|
||||
)
|
||||
const service: IAuthModuleService = req.scope.resolve(Modules.AUTH)
|
||||
|
||||
const authIdentity = await service.retrieveAuthIdentity(
|
||||
req.auth_context.auth_identity_id
|
||||
|
||||
@@ -5,11 +5,8 @@ import {
|
||||
MedusaResponse,
|
||||
} from "@medusajs/framework"
|
||||
import { ConfigModule, IAuthModuleService } from "@medusajs/types"
|
||||
import {
|
||||
ContainerRegistrationKeys,
|
||||
ModuleRegistrationName,
|
||||
} from "@medusajs/utils"
|
||||
import { decode, JwtPayload, verify } from "jsonwebtoken"
|
||||
import { ContainerRegistrationKeys, Modules } from "@medusajs/utils"
|
||||
import { JwtPayload, decode, verify } from "jsonwebtoken"
|
||||
|
||||
// Middleware to validate that a token is valid
|
||||
export const validateToken = () => {
|
||||
@@ -32,9 +29,7 @@ export const validateToken = () => {
|
||||
ContainerRegistrationKeys.CONFIG_MODULE
|
||||
).projectConfig
|
||||
|
||||
const authModule = req.scope.resolve<IAuthModuleService>(
|
||||
ModuleRegistrationName.AUTH
|
||||
)
|
||||
const authModule = req.scope.resolve<IAuthModuleService>(Modules.AUTH)
|
||||
|
||||
let decoded = decode(token as string) as JwtPayload
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { PaymentModuleOptions } from "@medusajs/types"
|
||||
import { ModuleRegistrationName, PaymentWebhookEvents } from "@medusajs/utils"
|
||||
import { Modules, PaymentWebhookEvents } from "@medusajs/utils"
|
||||
|
||||
import { MedusaRequest, MedusaResponse } from "../../../../types/routing"
|
||||
|
||||
@@ -9,14 +9,14 @@ export const POST = async (req: MedusaRequest, res: MedusaResponse) => {
|
||||
|
||||
const options: PaymentModuleOptions =
|
||||
// @ts-expect-error "Not sure if .options exists on a module"
|
||||
req.scope.resolve(ModuleRegistrationName.PAYMENT).options || {}
|
||||
req.scope.resolve(Modules.PAYMENT).options || {}
|
||||
|
||||
const event = {
|
||||
provider,
|
||||
payload: { data: req.body, rawData: req.rawBody, headers: req.headers },
|
||||
}
|
||||
|
||||
const eventBus = req.scope.resolve(ModuleRegistrationName.EVENT_BUS)
|
||||
const eventBus = req.scope.resolve(Modules.EVENT_BUS)
|
||||
|
||||
// we delay the processing of the event to avoid a conflict caused by a race condition
|
||||
await eventBus.emit(
|
||||
|
||||
@@ -1,16 +1,13 @@
|
||||
import {
|
||||
ModuleRegistrationName,
|
||||
calculateAmountsWithTax,
|
||||
} from "@medusajs/utils"
|
||||
HttpTypes,
|
||||
ItemTaxLineDTO,
|
||||
MedusaContainer,
|
||||
TaxCalculationContext,
|
||||
TaxableItemDTO,
|
||||
} from "@medusajs/types"
|
||||
import { Modules, calculateAmountsWithTax } from "@medusajs/utils"
|
||||
import { MedusaRequest } from "../../../types/routing"
|
||||
import { refetchEntities, refetchEntity } from "../../utils/refetch-entity"
|
||||
import {
|
||||
MedusaContainer,
|
||||
HttpTypes,
|
||||
TaxableItemDTO,
|
||||
ItemTaxLineDTO,
|
||||
TaxCalculationContext,
|
||||
} from "@medusajs/types"
|
||||
|
||||
export type RequestWithContext<T> = MedusaRequest<T> & {
|
||||
taxContext: {
|
||||
@@ -67,7 +64,7 @@ export const wrapProductsWithTaxPrices = async <T>(
|
||||
return
|
||||
}
|
||||
|
||||
const taxService = req.scope.resolve(ModuleRegistrationName.TAX)
|
||||
const taxService = req.scope.resolve(Modules.TAX)
|
||||
|
||||
const taxRates = (await taxService.getTaxLines(
|
||||
products.map(asTaxItem).flat(),
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { listShippingOptionsForCartWorkflow } from "@medusajs/core-flows"
|
||||
import { HttpTypes, ICartModuleService } from "@medusajs/types"
|
||||
import { MedusaError, ModuleRegistrationName } from "@medusajs/utils"
|
||||
import { MedusaError, Modules } from "@medusajs/utils"
|
||||
import { MedusaRequest, MedusaResponse } from "../../../types/routing"
|
||||
|
||||
export const GET = async (
|
||||
@@ -15,9 +15,7 @@ export const GET = async (
|
||||
)
|
||||
}
|
||||
|
||||
const cartService = req.scope.resolve<ICartModuleService>(
|
||||
ModuleRegistrationName.CART
|
||||
)
|
||||
const cartService = req.scope.resolve<ICartModuleService>(Modules.CART)
|
||||
|
||||
const cart = await cartService.retrieveCart(cart_id, {
|
||||
select: [
|
||||
|
||||
Reference in New Issue
Block a user