The complete open source platform to run your entire marketplace. Storefront, vendor panel, admin console, and integrations in one enterprise-grade platform you own.
TypeScript b2b-marketplacecomposable-commerceecommerceenterpriseheadless-commercemarketplacemedusamedusajsmulti-vendortypescript
feat(vendor): add members/me endpoint and validate role_id (#826)
Viktor Holikc6a6ae7aade1
diff --git a/bun.lock b/bun.lockindex 8414572c6..9bed474ce 100644--- a/bun.lock+++ b/bun.lock@@ -99,6 +99,7 @@"devDependencies": {"@medusajs/test-utils": "^2.13.4","@medusajs/types": "2.13.4",+ "@mercurjs/types": "*","@swc/core": "^1.7.28","@swc/jest": "^0.2.36","@types/jest": "^29.5.13",@@ -467,6 +468,9 @@"@mercurjs/types": "workspace:*","@types/react": "^18.2.66","@types/react-dom": "^18.2.22",+ "autoprefixer": "^10.4.20",+ "postcss": "^8.4.49",+ "tailwindcss": "^3.4.19","tsup": "^8.0.2","typescript": "5.9.3",},@@ -935,7 +939,7 @@"@medusajs/admin-sdk": ["@medusajs/[email protected]", "", { "dependencies": { "@medusajs/admin-shared": "2.13.5", "zod": "3.25.76" } }, "sha512-/3CS6PLrKeTFFXMDgyuk3c8cmX2sbtc/yxVQ1+ZF1CmE+1foDRKkswbmO0IUiMH66xgpWi1WsTU1JHh/BTOm3w=="],- "@medusajs/admin-shared": ["@medusajs/[email protected]", "", {}, "sha512-pHfPibjFa8LiUxDUf64hFGXk0Q6jcg/yTpU/b9paOdxHowIUyVoOjubmmplpV8s0YDsacL8UioSFK2Js+vrutQ=="],+ "@medusajs/admin-shared": ["@medusajs/[email protected]", "", {}, "sha512-m1zRXTkwahCTD1/3fiY9LsSaL5GlnOqMSWIGmbv24SQX+lRrP8o0/52OFlYUPAV58up8QIiPoouQNtUP7+q4sA=="],"@medusajs/admin-vite-plugin": ["@medusajs/[email protected]", "", { "dependencies": { "@babel/parser": "7.25.6", "@babel/traverse": "7.25.6", "@babel/types": "7.25.6", "@medusajs/admin-shared": "2.13.4", "chokidar": "^3.5.3", "fdir": "6.1.1", "magic-string": "0.30.5", "outdent": "^0.8.0", "picocolors": "^1.1.0" }, "peerDependencies": { "vite": "^5.4.21" } }, "sha512-lF6JgVwXySiM+T1vA+xXTfbcgmd7LRn0HcFRhh9Gpse4La6bZle0sHXHRPdePhEzU9DRn1/BsyLGo/h7/L3WZA=="],@@ -3591,7 +3595,9 @@"@jridgewell/remapping/@jridgewell/trace-mapping": ["@jridgewell/[email protected]", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="],- "@medusajs/admin-sdk/@medusajs/admin-shared": ["@medusajs/[email protected]", "", {}, "sha512-m1zRXTkwahCTD1/3fiY9LsSaL5GlnOqMSWIGmbv24SQX+lRrP8o0/52OFlYUPAV58up8QIiPoouQNtUP7+q4sA=="],+ "@medusajs/admin-bundler/@medusajs/admin-shared": ["@medusajs/[email protected]", "", {}, "sha512-pHfPibjFa8LiUxDUf64hFGXk0Q6jcg/yTpU/b9paOdxHowIUyVoOjubmmplpV8s0YDsacL8UioSFK2Js+vrutQ=="],++ "@medusajs/admin-vite-plugin/@medusajs/admin-shared": ["@medusajs/[email protected]", "", {}, "sha512-pHfPibjFa8LiUxDUf64hFGXk0Q6jcg/yTpU/b9paOdxHowIUyVoOjubmmplpV8s0YDsacL8UioSFK2Js+vrutQ=="],"@medusajs/admin-vite-plugin/chokidar": ["[email protected]", "", { "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.6.0" }, "optionalDependencies": { "fsevents": "~2.3.2" } }, "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw=="],@@ -3603,6 +3609,8 @@"@medusajs/cli/yargs": ["[email protected]", "", { "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", "string-width": "^4.2.3", "y18n": "^5.0.5", "yargs-parser": "^21.1.1" } }, "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="],+ "@medusajs/dashboard/@medusajs/admin-shared": ["@medusajs/[email protected]", "", {}, "sha512-pHfPibjFa8LiUxDUf64hFGXk0Q6jcg/yTpU/b9paOdxHowIUyVoOjubmmplpV8s0YDsacL8UioSFK2Js+vrutQ=="],+"@medusajs/dashboard/@medusajs/ui": ["@medusajs/[email protected]", "", { "dependencies": { "@dnd-kit/core": "^6.1.0", "@dnd-kit/sortable": "^8.0.0", "@dnd-kit/utilities": "^3.2.2", "@medusajs/icons": "2.13.4", "@radix-ui/react-dialog": "1.1.4", "@radix-ui/react-dismissable-layer": "1.1.4", "@tanstack/react-table": "8.20.5", "clsx": "^1.2.1", "copy-to-clipboard": "^3.3.3", "cva": "1.0.0-beta.1", "lodash.isequal": "^4.5.0", "prism-react-renderer": "^2.0.6", "prismjs": "^1.30.0", "radix-ui": "1.1.2", "react-aria": "^3.33.1", "react-currency-input-field": "^3.6.11", "react-stately": "^3.31.1", "sonner": "^1.5.0", "tailwind-merge": "^2.2.1" }, "peerDependencies": { "react": "^18.3.1", "react-dom": "^18.3.1" } }, "sha512-UrXUCsGY3JoRHFfRDzx5hvyH9NI0FlSTkiddeiPLED71lgTqO0MHUrOA7M9cCovM7L8naM3Xn7KY8xPMXDGc5w=="],"@medusajs/dashboard/react-jwt": ["[email protected]", "", { "optionalDependencies": { "fsevents": "^2.3.2" }, "peerDependencies": { "react": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-aC+X6q8pi63zoO7A060/4mfF5jM6Ay+4YyY4QgdD8dDOqp89sPcg0IhWEHyPACnVETMjBWzmxMPgIPosQNeYyw=="],@@ -3621,12 +3629,16 @@"@medusajs/utils/jsonwebtoken": ["[email protected]", "", { "dependencies": { "jws": "^4.0.1", "lodash.includes": "^4.3.0", "lodash.isboolean": "^3.0.3", "lodash.isinteger": "^4.0.4", "lodash.isnumber": "^3.0.3", "lodash.isplainobject": "^4.0.6", "lodash.isstring": "^4.0.1", "lodash.once": "^4.0.0", "ms": "^2.1.1", "semver": "^7.5.4" } }, "sha512-MT/xP0CrubFRNLNKvxJ2BYfy53Zkm++5bX9dtuPbqAeQpTVe0MQTFhao8+Cp//EmJp244xt6Drw/GVEGCUj40g=="],+ "@mercurjs/admin/@medusajs/admin-shared": ["@medusajs/[email protected]", "", {}, "sha512-pHfPibjFa8LiUxDUf64hFGXk0Q6jcg/yTpU/b9paOdxHowIUyVoOjubmmplpV8s0YDsacL8UioSFK2Js+vrutQ=="],+"@mercurjs/admin/@mercurjs/client": ["@mercurjs/[email protected]", "", { "dependencies": { "@tanstack/react-query": "^5.64.2", "qs": "^6.12.1" }, "peerDependencies": { "typescript": ">=4.8.0" } }, "sha512-K/cFfsuJas2JC7d4aM5MJuYR9O3fgDP1HaNfj25FmAjWvuHpRpDIQTpOBCYuoURftrKOTPzopNvP7zxwue/IXg=="],"@mercurjs/admin/@mercurjs/dashboard-shared": ["@mercurjs/[email protected]", "", { "dependencies": { "@ariakit/react": "^0.4.15", "@babel/runtime": "^7.26.10", "@dnd-kit/core": "^6.1.0", "@dnd-kit/sortable": "^8.0.0", "@dnd-kit/utilities": "^3.2.2", "@hookform/error-message": "^2.0.1", "@hookform/resolvers": "3.4.2", "@medusajs/admin-shared": "^2.13.3", "@medusajs/dashboard": "^2.13.3", "@medusajs/icons": "2.13.3", "@medusajs/ui": "4.1.1", "@mercurjs/client": "2.0.0-canary.97", "@radix-ui/react-dialog": "1.1.4", "@radix-ui/react-dismissable-layer": "1.1.4", "@tanstack/react-query": "5.64.2", "@tanstack/react-table": "8.20.5", "@tanstack/react-virtual": "^3.8.3", "@uiw/react-json-view": "^2.0.0-alpha.17", "cmdk": "^0.2.0", "copy-to-clipboard": "^3.3.3", "date-fns": "^3.6.0", "i18next": "23.7.11", "i18next-browser-languagedetector": "7.2.0", "i18next-http-backend": "2.4.2", "lodash.debounce": "^4.0.8", "lodash.isequal": "^4.5.0", "match-sorter": "^6.3.4", "motion": "^11.15.0", "qs": "^6.12.1", "radix-ui": "1.1.2", "react-country-flag": "^3.1.0", "react-currency-input-field": "^3.6.11", "react-helmet-async": "^2.0.5", "react-hook-form": "7.49.1", "react-i18next": "13.5.0", "react-jwt": "^1.2.0", "react-router-dom": "6.30.3", "zod": "3.25.76" } }, "sha512-LueWIqtFE/5jcOsApZxuDO8iJs3FAcwo5135Y0xA17QJHzjYSDoZbx+QBiJWQxIu/eobnGxRJxTtC0fPM69uJg=="],"@mercurjs/admin/react-jwt": ["[email protected]", "", { "optionalDependencies": { "fsevents": "^2.3.2" }, "peerDependencies": { "react": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-aC+X6q8pi63zoO7A060/4mfF5jM6Ay+4YyY4QgdD8dDOqp89sPcg0IhWEHyPACnVETMjBWzmxMPgIPosQNeYyw=="],+ "@mercurjs/cli/@medusajs/admin-shared": ["@medusajs/[email protected]", "", {}, "sha512-pHfPibjFa8LiUxDUf64hFGXk0Q6jcg/yTpU/b9paOdxHowIUyVoOjubmmplpV8s0YDsacL8UioSFK2Js+vrutQ=="],+"@mercurjs/cli/@mercurjs/dashboard-sdk": ["@mercurjs/[email protected]", "", { "dependencies": { "@babel/parser": "7.25.6", "@babel/traverse": "7.25.6", "@babel/types": "7.25.6", "esbuild-register": "^3.6.0" } }, "sha512-Q0W+bOjALdwrwte503rIrEoE0MrMwNe//MtdiGNJAP20jO9VWxTUS0R1bABCT3HHjXP4SDMv3/7C0OcfSVUU2w=="],"@mercurjs/dashboard-sdk/@types/node": ["@types/[email protected]", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-F0R/h2+dsy5wJAUe3tAU6oqa2qbWY5TpNfL/RGmo1y38hiyO1w3x2jPtt76wmuaJI4DQnOBu21cNXQ2STIUUWg=="],diff --git a/integration-tests/http/seller/vendor/seller.spec.ts b/integration-tests/http/seller/vendor/seller.spec.tsindex 6b2db3229..c3e03d55c 100644--- a/integration-tests/http/seller/vendor/seller.spec.ts+++ b/integration-tests/http/seller/vendor/seller.spec.ts@@ -6,6 +6,7 @@ import {} from "../../../helpers/create-admin-user"import { createSellerUser } from "../../../helpers/create-seller-user"import { createSellerDefaultsWorkflow } from "@mercurjs/core-plugin/workflows"+import { SellerRole } from "@mercurjs/types"jest.setTimeout(50000)@@ -219,21 +220,25 @@ medusaIntegrationTestRunner({expect(response.data.seller).toBeDefined()})- it("should fail when already registered as member", async () => {- const response = await api- .post(- `/vendor/sellers`,- {- name: "Duplicate Registration",- email: "[email protected]",- member_email: "[email protected]",- currency_code: "usd",- },- headersA- )- .catch((e) => e.response)+ it("should create a second store for an existing member", async () => {+ const response = await api.post(+ `/vendor/sellers`,+ {+ name: "Second Store",+ email: "[email protected]",+ currency_code: "usd",+ },+ headersA+ )- expect(response.status).toEqual(400)+ expect(response.status).toEqual(201)+ expect(response.data.seller).toEqual(+ expect.objectContaining({+ name: "Second Store",+ email: "[email protected]",+ status: "pending_approval",+ })+ )})it("should fail for missing name", async () => {@@ -326,6 +331,54 @@ medusaIntegrationTestRunner({expect(response.status).toEqual(400)})++ it("should list multiple stores for a member with multiple sellers", async () => {+ await api.post(+ `/vendor/sellers`,+ {+ name: "Second Alpha Store",+ email: "[email protected]",+ currency_code: "usd",+ },+ headersA+ )++ const response = await api.get(`/vendor/sellers`, headersA)++ expect(response.status).toEqual(200)+ expect(response.data.seller_members.length).toEqual(2)+ })++ it("should create owner seller_member for existing member's new store", async () => {+ const createResponse = await api.post(+ `/vendor/sellers`,+ {+ name: "Ownership Check Store",+ email: "[email protected]",+ currency_code: "usd",+ },+ headersA+ )++ const sellerId = createResponse.data.seller.id+ const headersA_newSeller = {+ headers: {+ ...headersA.headers,+ "x-seller-id": sellerId,+ },+ }++ const membersResponse = await api.get(+ `/vendor/sellers/${sellerId}/members`,+ headersA_newSeller+ )++ expect(membersResponse.data.seller_members.length).toEqual(1)+ expect(membersResponse.data.seller_members[0].is_owner).toBe(true)+ expect(membersResponse.data.seller_members[0].member.id).toEqual(+ memberA.id+ )+ })})describe("GET /vendor/sellers", () => {@@ -921,7 +974,7 @@ medusaIntegrationTestRunner({`/vendor/sellers/${sellerA.id}/members`,{email: "[email protected]",- role_id: "role_test",+ role_id: SellerRole.SELLER_ADMINISTRATION,},headersA)@@ -929,7 +982,7 @@ medusaIntegrationTestRunner({expect(response.status).toEqual(201)expect(response.data.member_invite).toBeDefined()expect(response.data.member_invite.email).toEqual("[email protected]")- expect(response.data.member_invite.role_id).toEqual("role_test")+ expect(response.data.member_invite.role_id).toEqual(SellerRole.SELLER_ADMINISTRATION)})it("should fail for invalid email format", async () => {@@ -938,7 +991,7 @@ medusaIntegrationTestRunner({`/vendor/sellers/${sellerA.id}/members`,{email: "not-an-email",- role_id: "role_test",+ role_id: SellerRole.SELLER_ADMINISTRATION,},headersA)@@ -952,7 +1005,7 @@ medusaIntegrationTestRunner({.post(`/vendor/sellers/${sellerA.id}/members`,{- role_id: "role_test",+ role_id: SellerRole.SELLER_ADMINISTRATION,},headersA)@@ -974,6 +1027,21 @@ medusaIntegrationTestRunner({expect(response.status).toEqual(400)})++ it("should fail for invalid role_id", async () => {+ const response = await api+ .post(+ `/vendor/sellers/${sellerA.id}/members`,+ {+ email: "[email protected]",+ role_id: "invalid_role",+ },+ headersA+ )+ .catch((e) => e.response)++ expect(response.status).toEqual(400)+ })})describe("POST /vendor/sellers/:id/members/:member_id", () => {@@ -985,7 +1053,7 @@ medusaIntegrationTestRunner({`/admin/sellers/${sellerA.id}/members`,{member_id: memberB.id,- role_id: "role_test",+ role_id: SellerRole.SELLER_ADMINISTRATION,},adminHeaders)@@ -995,7 +1063,7 @@ medusaIntegrationTestRunner({it("should update role on an existing seller_member", async () => {const response = await api.post(`/vendor/sellers/${sellerA.id}/members/${sellerMemberBId}`,- { role_id: "role_admin" },+ { role_id: SellerRole.ORDER_MANAGEMENT },headersA)@@ -1024,7 +1092,7 @@ medusaIntegrationTestRunner({`/admin/sellers/${sellerA.id}/members`,{member_id: memberB.id,- role_id: "role_test",+ role_id: SellerRole.SELLER_ADMINISTRATION,},adminHeaders)@@ -1064,6 +1132,69 @@ medusaIntegrationTestRunner({expect(response.status).toBeGreaterThanOrEqual(400)})})++ describe("GET /vendor/sellers/:id/members/me", () => {+ it("should return current authenticated member", async () => {+ const response = await api.get(+ `/vendor/sellers/${sellerA.id}/members/me`,+ headersA+ )++ expect(response.status).toEqual(200)+ expect(response.data.seller_member).toBeDefined()+ expect(response.data.seller_member.member).toBeDefined()+ expect(response.data.seller_member.is_owner).toBe(true)+ })++ it("should return member with default fields", async () => {+ const response = await api.get(+ `/vendor/sellers/${sellerA.id}/members/me`,+ headersA+ )++ expect(response.status).toEqual(200)+ const sm = response.data.seller_member+ expect(sm).toHaveProperty("id")+ expect(sm).toHaveProperty("is_owner")+ expect(sm).toHaveProperty("member")+ expect(sm).toHaveProperty("rbac_role")+ })++ it("should return different members for different users", async () => {+ const responseA = await api.get(+ `/vendor/sellers/${sellerA.id}/members/me`,+ headersA+ )++ // Add memberB to sellerA+ const addResponse = await api.post(+ `/admin/sellers/${sellerA.id}/members`,+ {+ member_id: memberB.id,+ role_id: SellerRole.SELLER_ADMINISTRATION,+ },+ adminHeaders+ )++ const headersB_sellerA = {+ headers: {+ ...headersB.headers,+ "x-seller-id": sellerA.id,+ },+ }++ const responseB = await api.get(+ `/vendor/sellers/${sellerA.id}/members/me`,+ headersB_sellerA+ )++ expect(responseA.data.seller_member.id).not.toEqual(+ responseB.data.seller_member.id+ )+ expect(responseA.data.seller_member.is_owner).toBe(true)+ expect(responseB.data.seller_member.is_owner).toBe(false)+ })+ })})},})diff --git a/integration-tests/package.json b/integration-tests/package.jsonindex df0429ebb..2c5a14fc4 100644--- a/integration-tests/package.json+++ b/integration-tests/package.json@@ -14,6 +14,7 @@"@medusajs/draft-order": "^2.13.4"},"devDependencies": {+ "@mercurjs/types": "*","@medusajs/test-utils": "^2.13.4","@swc/core": "^1.7.28","@swc/jest": "^0.2.36",diff --git a/packages/core-plugin/.mercur/_generated/index.ts b/packages/core-plugin/.mercur/_generated/index.tsindex bf77ba7cb..9e1f02c74 100644--- a/packages/core-plugin/.mercur/_generated/index.ts+++ b/packages/core-plugin/.mercur/_generated/index.ts@@ -702,6 +702,7 @@ export type Routes = {address: typeof import("../../src/api/vendor/sellers/[id]/address/route");members: typeof import("../../src/api/vendor/sellers/[id]/members/route") & {$memberId: typeof import("../../src/api/vendor/sellers/[id]/members/[member_id]/route");+ me: typeof import("../../src/api/vendor/sellers/[id]/members/me/route");};paymentDetails: typeof import("../../src/api/vendor/sellers/[id]/payment-details/route");professionalDetails: typeof import("../../src/api/vendor/sellers/[id]/professional-details/route");diff --git a/packages/core-plugin/src/api/admin/sellers/validators.ts b/packages/core-plugin/src/api/admin/sellers/validators.tsindex 1f45bd4e3..43b3d57bf 100644--- a/packages/core-plugin/src/api/admin/sellers/validators.ts+++ b/packages/core-plugin/src/api/admin/sellers/validators.ts@@ -5,6 +5,7 @@ import {createSelectParams,} from "@medusajs/medusa/api/utils/validators"import { booleanString } from "@medusajs/medusa/api/utils/common-validators/common"+import { SellerRole } from "@mercurjs/types"export type AdminGetSellerParamsType = z.infer<typeof AdminGetSellerParams>export const AdminGetSellerParams = createSelectParams()@@ -80,7 +81,7 @@ export const AdminTerminateSeller = z.object({export type AdminAddSellerMemberType = z.infer<typeof AdminAddSellerMember>export const AdminAddSellerMember = z.object({member_id: z.string(),- role_id: z.string(),+ role_id: z.nativeEnum(SellerRole),})export type AdminInviteSellerMemberType = z.infer<@@ -88,7 +89,7 @@ export type AdminInviteSellerMemberType = z.infer<>export const AdminInviteSellerMember = z.object({email: z.string().email(),- role_id: z.string(),+ role_id: z.nativeEnum(SellerRole),})export type AdminUpsertSellerAddressType = z.infer<diff --git a/packages/core-plugin/src/api/vendor/sellers/[id]/members/me/route.ts b/packages/core-plugin/src/api/vendor/sellers/[id]/members/me/route.tsnew file mode 100644index 000000000..398265d22--- /dev/null+++ b/packages/core-plugin/src/api/vendor/sellers/[id]/members/me/route.ts@@ -0,0 +1,32 @@+import {+ AuthenticatedMedusaRequest,+ MedusaResponse,+} from "@medusajs/framework"+import { ContainerRegistrationKeys, MedusaError } from "@medusajs/framework/utils"+import { HttpTypes } from "@mercurjs/types"++export const GET = async (+ req: AuthenticatedMedusaRequest,+ res: MedusaResponse<HttpTypes.VendorSellerMemberResponse>+) => {+ const query = req.scope.resolve(ContainerRegistrationKeys.QUERY)+ const memberId = req.auth_context.actor_id++ const { data: sellerMembers } = await query.graph({+ entity: "seller_member",+ fields: req.queryConfig.fields,+ filters: {+ seller_id: req.params.id,+ member_id: memberId,+ },+ })++ if (!sellerMembers.length) {+ throw new MedusaError(+ MedusaError.Types.NOT_FOUND,+ "Seller member not found"+ )+ }++ res.json({ seller_member: sellerMembers[0] })+}diff --git a/packages/core-plugin/src/api/vendor/sellers/middlewares.ts b/packages/core-plugin/src/api/vendor/sellers/middlewares.tsindex 28cd6e42d..4e798dbfd 100644--- a/packages/core-plugin/src/api/vendor/sellers/middlewares.ts+++ b/packages/core-plugin/src/api/vendor/sellers/middlewares.ts@@ -145,6 +145,23 @@ export const vendorSellersMiddlewares: MiddlewareRoute[] = [},],},+ // GET /vendor/sellers/:id/members/me — get current member+ {+ method: ["GET"],+ matcher: "/vendor/sellers/:id/members/me",+ middlewares: [+ validateAndTransformQuery(+ VendorGetSellerParams,+ QueryConfig.retrieveVendorMemberQueryConfig+ ),+ ],+ policies: [+ {+ resource: Entities.seller,+ operation: PolicyOperation.read,+ },+ ],+ },// GET /vendor/sellers/:id/members — list members{method: ["GET"],diff --git a/packages/core-plugin/src/api/vendor/sellers/query-config.ts b/packages/core-plugin/src/api/vendor/sellers/query-config.tsindex 626383ec2..e0f7a247b 100644--- a/packages/core-plugin/src/api/vendor/sellers/query-config.ts+++ b/packages/core-plugin/src/api/vendor/sellers/query-config.ts@@ -46,3 +46,12 @@ export const listVendorMembersQueryConfig = {defaultLimit: 50,isList: true,}++export const retrieveVendorMemberQueryConfig = {+ defaults: [+ "id",+ "is_owner",+ "member.*",+ "rbac_role.*",+ ],+}diff --git a/packages/core-plugin/src/api/vendor/sellers/route.ts b/packages/core-plugin/src/api/vendor/sellers/route.tsindex 87de10a18..6ba50afb1 100644--- a/packages/core-plugin/src/api/vendor/sellers/route.ts+++ b/packages/core-plugin/src/api/vendor/sellers/route.ts@@ -51,20 +51,23 @@ export const POST = async ()}- if (req.auth_context?.actor_id) {+ const { address, professional_details, member_email, ...sellerData } = req.validatedBody++ const existingMemberId = req.auth_context?.actor_id++ if (!existingMemberId && !member_email) {throw new MedusaError(- MedusaError.Types.NOT_ALLOWED,- "Already registered as a member."+ MedusaError.Types.INVALID_DATA,+ "member_email is required when creating a new account")}- const { address, professional_details, member_email, ...sellerData } = req.validatedBody-const { result: seller } = await createSellerAccountWorkflow(req.scope).run({input: {auth_identity_id: req.auth_context.auth_identity_id,seller: sellerData,member_email,+ member_id: existingMemberId || undefined,address,professional_details,},diff --git a/packages/core-plugin/src/api/vendor/sellers/validators.ts b/packages/core-plugin/src/api/vendor/sellers/validators.tsindex 5a0b74b74..51f6cb554 100644--- a/packages/core-plugin/src/api/vendor/sellers/validators.ts+++ b/packages/core-plugin/src/api/vendor/sellers/validators.ts@@ -2,6 +2,7 @@ import {createFindParams,createSelectParams,} from "@medusajs/medusa/api/utils/validators"+import { SellerRole } from "@mercurjs/types"import { z } from "zod"export type VendorGetSellersParamsType = z.infer<typeof VendorGetSellersParams>@@ -17,7 +18,7 @@ export type VendorCreateSellerAccountType = z.infer<typeof VendorCreateSellerAccexport const VendorCreateSellerAccount = z.object({name: z.string(),email: z.string().email(),- member_email: z.string().email(),+ member_email: z.string().email().optional(),description: z.string().nullable().optional(),currency_code: z.string(),address: z@@ -59,12 +60,12 @@ export const VendorUpdateSeller = z.object({export type VendorInviteMemberType = z.infer<typeof VendorInviteMember>export const VendorInviteMember = z.object({email: z.string().email(),- role_id: z.string(),+ role_id: z.nativeEnum(SellerRole),})export type VendorUpdateMemberRoleType = z.infer<typeof VendorUpdateMemberRole>export const VendorUpdateMemberRole = z.object({- role_id: z.string(),+ role_id: z.nativeEnum(SellerRole),})export type VendorUpsertSellerAddressType = z.infer<typeof VendorUpsertSellerAddress>diff --git a/packages/core-plugin/src/workflows/seller/workflows/create-seller-account.ts b/packages/core-plugin/src/workflows/seller/workflows/create-seller-account.tsindex 970af3130..f0bedf88e 100644--- a/packages/core-plugin/src/workflows/seller/workflows/create-seller-account.ts+++ b/packages/core-plugin/src/workflows/seller/workflows/create-seller-account.ts@@ -32,7 +32,8 @@ export const createSellerAccountWorkflowId = "create-seller-account"type CreateSellerAccountWorkflowInput = {auth_identity_id: stringseller: CreateSellerDTO- member_email: string+ member_email?: string+ member_id?: stringaddress?: UpdateSellerAddressDTOprofessional_details?: UpdateProfessionalDetailsDTO} & AdditionalData@@ -47,19 +48,33 @@ export const createSellerAccountWorkflow = createWorkflow(const sellers = createSellersStep(sellerData)const seller = transform({ sellers }, ({ sellers }) => sellers[0])- const members = upsertMembersStep(- transform(input, ({ member_email }) => [{ email: member_email }])- )+ const newMember = when('no-existing-member', input, ({ member_id }) => !member_id).then(() => {+ const members = upsertMembersStep(+ transform(input, ({ member_email }) => [{ email: member_email! }])+ )+ const member = transform({ members }, ({ members }) => members[0])- const member = transform({ members }, ({ members }) => members[0])+ setAuthAppMetadataStep({+ authIdentityId: input.auth_identity_id,+ actorType: "member",+ value: member.id,+ })++ return member+ })++ const memberId = transform(+ { input, newMember },+ ({ input, newMember }) => input.member_id || newMember?.id as string+ )createSellerMembersStep(transform(- { seller, member },- ({ seller, member }) => [+ { seller, memberId },+ ({ seller, memberId }) => [{seller_id: seller.id,- member_id: member.id,+ member_id: memberId,role_id: SellerRole.SELLER_ADMINISTRATION,is_owner: true,},@@ -67,12 +82,6 @@ export const createSellerAccountWorkflow = createWorkflow())- setAuthAppMetadataStep({- authIdentityId: input.auth_identity_id,- actorType: "member",- value: member.id,- })-when(input, ({ address }) => !!address).then(() => {updateSellerAddressWorkflow.runAsStep({input: transform({ seller, input }, ({ seller, input }) => ({diff --git a/packages/types/src/http/seller.ts b/packages/types/src/http/seller.tsindex 45d05f06e..6d92754d0 100644--- a/packages/types/src/http/seller.ts+++ b/packages/types/src/http/seller.ts@@ -15,6 +15,13 @@ export type VendorSellerListResponse = PaginatedResponse<{sellers: SellerDTO[]}>+export interface VendorSellerMemberResponse {+ /**+ * The seller member's details.+ */+ seller_member: SellerMemberDTO+}+export type VendorSellerMemberListResponse = PaginatedResponse<{/*** The list of seller members.diff --git a/packages/vendor/package.json b/packages/vendor/package.jsonindex 808f9fc3d..71ecc88b7 100644--- a/packages/vendor/package.json+++ b/packages/vendor/package.json@@ -77,6 +77,9 @@"@medusajs/ui-preset": "2.13.4","@types/react": "^18.2.66","@types/react-dom": "^18.2.22",+ "autoprefixer": "^10.4.20",+ "postcss": "^8.4.49",+ "tailwindcss": "^3.4.19","tsup": "^8.0.2","typescript": "5.9.3","@medusajs/types": "2.13.4",diff --git a/packages/vendor/postcss.config.cjs b/packages/vendor/postcss.config.cjsnew file mode 100644index 000000000..33ad091d2--- /dev/null+++ b/packages/vendor/postcss.config.cjs@@ -0,0 +1,6 @@+module.exports = {+ plugins: {+ tailwindcss: {},+ autoprefixer: {},+ },+}diff --git a/packages/vendor/src/get-route-map.tsx b/packages/vendor/src/get-route-map.tsxindex b2f651f75..7639f793b 100644--- a/packages/vendor/src/get-route-map.tsx+++ b/packages/vendor/src/get-route-map.tsx@@ -1327,6 +1327,14 @@ export function getRouteMap({path: "/onboarding",lazy: () => import("./pages/onboarding"),},+ {+ path: "/store-select",+ lazy: async () => {+ const { StoreSelectPage } =+ await import("./pages/store-select");+ return { Component: StoreSelectPage };+ },+ },...customPublicRoutes,{path: "*",diff --git a/packages/vendor/src/hooks/api/sellers.tsx b/packages/vendor/src/hooks/api/sellers.tsxindex 5e904de8e..0ce6b059e 100644--- a/packages/vendor/src/hooks/api/sellers.tsx+++ b/packages/vendor/src/hooks/api/sellers.tsx@@ -32,7 +32,7 @@ export const useSellers = (...options,});- return { ...(data ?? {}), ...rest };+ return { ...data, ...rest };};export const useCreateSellerAccount = (diff --git a/packages/vendor/src/i18n/translations/en.json b/packages/vendor/src/i18n/translations/en.jsonindex 2eb3de28a..13c770761 100644--- a/packages/vendor/src/i18n/translations/en.json+++ b/packages/vendor/src/i18n/translations/en.json@@ -2938,6 +2938,12 @@}}},+ "storeSelect": {+ "title": "Choose a store",+ "subtitle": "These are all your available stores",+ "pendingApproval": "Pending approval",+ "addNewStore": "Add new store"+ },"login": {"forgotPassword": "Forgot password? - <0>Reset</0>","title": "Welcome to {{name}}",@@ -2985,10 +2991,6 @@"detailsSetup": {"title": "Complete your profile","subtitle": "Add your address and business details",- "userEmailTitle": "User email",- "userEmailSubtitle": "Your account login and contact email",- "userEmail": "Email address",- "userEmailHint": "Used as your account login and contact email","addressTitle": "Address","addressSubtitle": "Your business address","professionalTitle": "Business details",diff --git a/packages/vendor/src/pages/login/login.tsx b/packages/vendor/src/pages/login/login.tsxindex 88ad7323f..860c92378 100644--- a/packages/vendor/src/pages/login/login.tsx+++ b/packages/vendor/src/pages/login/login.tsx@@ -1,28 +1,28 @@-import { Children, ReactNode } from "react"-import { zodResolver } from "@hookform/resolvers/zod"-import { Alert, Button, Heading, Hint, Input, Text } from "@medusajs/ui"-import { useForm } from "react-hook-form"-import { Trans, useTranslation } from "react-i18next"-import { Link, useNavigate, useSearchParams } from "react-router-dom"-import * as z from "zod"--import { Form } from "@components/common/form"-import AvatarBox from "@components/common/logo-box/avatar-box"-import { useSignInWithEmailPass } from "@hooks/api"-import { isFetchError } from "@lib/is-fetch-error"-import config from "virtual:mercur/config"+import { Children, ReactNode } from "react";+import { zodResolver } from "@hookform/resolvers/zod";+import { Alert, Button, Heading, Hint, Input, Text } from "@medusajs/ui";+import { useForm } from "react-hook-form";+import { Trans, useTranslation } from "react-i18next";+import { Link, useNavigate, useSearchParams } from "react-router-dom";+import * as z from "zod";++import { Form } from "@components/common/form";+import AvatarBox from "@components/common/logo-box/avatar-box";+import { useSignInWithEmailPass } from "@hooks/api";+import { isFetchError } from "@lib/is-fetch-error";+import config from "virtual:mercur/config";const LoginSchema = z.object({email: z.string().email(),password: z.string(),-})+});const LoginLogo = () => {- return <AvatarBox />-}+ return <AvatarBox />;+};const LoginHeader = () => {- const { t } = useTranslation()+ const { t } = useTranslation();return (<div className="mb-4 flex flex-col items-center">@@ -31,18 +31,19 @@ const LoginHeader = () => {{t("login.hint")}</Text></div>- )-}+ );+};const LoginForm = () => {- const { t } = useTranslation()- const navigate = useNavigate()- const [searchParams] = useSearchParams()+ const { t } = useTranslation();+ const navigate = useNavigate();+ const [searchParams] = useSearchParams();- const reason = searchParams.get("reason") || ""- const reasonMessage = reason && reason.toLowerCase() === "unauthorized" ? "Session expired" : reason-- const from = "/"+ const reason = searchParams.get("reason") || "";+ const reasonMessage =+ reason && reason.toLowerCase() === "unauthorized"+ ? "Session expired"+ : reason;const form = useForm<z.infer<typeof LoginSchema>>({resolver: zodResolver(LoginSchema),@@ -50,9 +51,9 @@ const LoginForm = () => {email: "",password: "",},- })+ });- const { mutateAsync, isPending } = useSignInWithEmailPass()+ const { mutateAsync, isPending } = useSignInWithEmailPass();const handleSubmit = form.handleSubmit(async ({ email, password }) => {await mutateAsync(@@ -67,39 +68,40 @@ const LoginForm = () => {form.setError("email", {type: "manual",message: error.message,- })+ });- return+ return;}}form.setError("root.serverError", {type: "manual",message: error.message,- })+ });},onSuccess: () => {+ const email = form.getValues("email");setTimeout(() => {- navigate(from, { replace: true })- }, 1000)+ navigate("/store-select", {+ replace: true,+ state: { email },+ });+ }, 1000);},- }- )- })+ },+ );+ });const serverError =- form.formState.errors?.root?.serverError?.message || reasonMessage+ form.formState.errors?.root?.serverError?.message || reasonMessage;const validationError =form.formState.errors.email?.message ||- form.formState.errors.password?.message+ form.formState.errors.password?.message;return (<div className="flex w-full flex-col gap-y-3"><Form {...form}>- <form- onSubmit={handleSubmit}- className="flex w-full flex-col gap-y-6"- >+ <form onSubmit={handleSubmit} className="flex w-full flex-col gap-y-6"><div className="flex flex-col gap-y-2"><Form.Fieldcontrol={form.control}@@ -116,7 +118,7 @@ const LoginForm = () => {/></Form.Control></Form.Item>- )+ );}}/><Form.Field@@ -135,7 +137,7 @@ const LoginForm = () => {/></Form.Control></Form.Item>- )+ );}}/>{validationError && (@@ -161,8 +163,8 @@ const LoginForm = () => {</form></Form></div>- )-}+ );+};const LoginFooter = () => {return (@@ -194,8 +196,8 @@ const LoginFooter = () => {</span>)}</div>- )-}+ );+};const Root = ({ children }: { children?: ReactNode }) => {return (@@ -213,12 +215,12 @@ const Root = ({ children }: { children?: ReactNode }) => {)}</div></div>- )-}+ );+};export const LoginPage = Object.assign(Root, {Logo: LoginLogo,Header: LoginHeader,Form: LoginForm,Footer: LoginFooter,-})+});diff --git a/packages/vendor/src/pages/onboarding/onboarding.tsx b/packages/vendor/src/pages/onboarding/onboarding.tsxindex 00387a0fe..c7cab854d 100644--- a/packages/vendor/src/pages/onboarding/onboarding.tsx+++ b/packages/vendor/src/pages/onboarding/onboarding.tsx@@ -35,7 +35,6 @@ const StoreSetupSchema = z.object({});const DetailsSetupSchema = z.object({- member_email: z.string().email(),first_name: z.string().min(1),last_name: z.string().min(1),company: z.string().optional(),@@ -95,7 +94,6 @@ export const Onboarding = () => {const detailsForm = useForm<DetailsSetupFormValues>({resolver: zodResolver(DetailsSetupSchema),defaultValues: {- member_email: email,first_name: "",last_name: "",company: "",@@ -127,7 +125,6 @@ export const Onboarding = () => {corporate_name,registration_number,tax_id,- member_email,...addressFields} = details;@@ -135,7 +132,7 @@ export const Onboarding = () => {await createSellerAccount({name: storeData.name,email: storeData.email,- member_email,+ member_email: email,currency_code: storeData.currency_code.toLowerCase(),description: storeData.description || undefined,address: addressFields,@@ -517,59 +514,13 @@ const DetailsStep = ({custom={1}/>- {/* User email section */}- <motion.div- className="grid grid-cols-2 gap-x-12 py-8"- variants={sectionVariants}- initial="hidden"- animate="visible"- custom={2}- >- <div>- <Text size="small" weight="plus" className="text-ui-fg-base">- {t("onboarding.detailsSetup.userEmailTitle")}- </Text>- <Text size="small" className="text-ui-fg-subtle mt-1">- {t("onboarding.detailsSetup.userEmailSubtitle")}- </Text>- </div>- <div className="flex flex-col gap-y-4">- <Form.Field- control={form.control}- name="member_email"- render={({ field }) => (- <Form.Item>- <Form.Label>- {t("onboarding.detailsSetup.userEmail")}- </Form.Label>- <Form.Control>- <Input type="email" autoComplete="email" {...field} />- </Form.Control>- <Form.Hint>- {t("onboarding.detailsSetup.userEmailHint")}- </Form.Hint>- <Form.ErrorMessage />- </Form.Item>- )}- />- </div>- </motion.div>-- <motion.div- className="border-t border-dotted border-ui-border-base"- variants={sectionVariants}- initial="hidden"- animate="visible"- custom={3}- />-{/* Address section */}<motion.divclassName="grid grid-cols-2 gap-x-12 py-8"variants={sectionVariants}initial="hidden"animate="visible"- custom={4}+ custom={2}><div><Text size="small" weight="plus" className="text-ui-fg-base">@@ -722,7 +673,7 @@ const DetailsStep = ({variants={sectionVariants}initial="hidden"animate="visible"- custom={5}+ custom={3}/>{/* Professional details section */}@@ -731,7 +682,7 @@ const DetailsStep = ({variants={sectionVariants}initial="hidden"animate="visible"- custom={6}+ custom={4}><div><Text size="small" weight="plus" className="text-ui-fg-base">@@ -835,7 +786,7 @@ const DetailsStep = ({variants={sectionVariants}initial="hidden"animate="visible"- custom={7}+ custom={5}/><motion.div@@ -843,7 +794,7 @@ const DetailsStep = ({variants={sectionVariants}initial="hidden"animate="visible"- custom={8}+ custom={6}><div /><div className="flex gap-x-2">diff --git a/packages/vendor/src/pages/store-select/index.ts b/packages/vendor/src/pages/store-select/index.tsnew file mode 100644index 000000000..3f546fe41--- /dev/null+++ b/packages/vendor/src/pages/store-select/index.ts@@ -0,0 +1 @@+export * from "./store-select";diff --git a/packages/vendor/src/pages/store-select/store-select.tsx b/packages/vendor/src/pages/store-select/store-select.tsxnew file mode 100644index 000000000..d46ba0c0f--- /dev/null+++ b/packages/vendor/src/pages/store-select/store-select.tsx@@ -0,0 +1,139 @@+import { ChevronRight, Plus, Spinner } from "@medusajs/icons";+import { Avatar, Heading, StatusBadge, Text } from "@medusajs/ui";+import { useTranslation } from "react-i18next";+import { useLocation, useNavigate } from "react-router-dom";++import AvatarBox from "@components/common/logo-box/avatar-box";+import { useFeatureFlags, useSellers } from "@hooks/api";+import { MercurFeatureFlags, SellerMemberDTO, SellerStatus } from "@mercurjs/types";++const StoreSelectLogo = () => {+ return <AvatarBox />;+};++const StoreSelectHeader = () => {+ const { t } = useTranslation();++ return (+ <div className="mb-4 flex flex-col items-center">+ <Heading>{t("storeSelect.title")}</Heading>+ <Text size="small" className="text-ui-fg-subtle text-center">+ {t("storeSelect.subtitle")}+ </Text>+ </div>+ );+};++const StoreSelectList = ({+ seller_members,+ canCreateStore,+ email,+}: {+ seller_members: SellerMemberDTO[];+ canCreateStore: boolean;+ email: string;+}) => {+ const { t } = useTranslation();+ const navigate = useNavigate();++ const handleSelect = (_storeId: string) => {+ navigate("/", { replace: true });+ };++ return (+ <div className="shadow-elevation-card-rest bg-ui-bg-base flex w-full flex-col divide-y rounded-lg">+ {seller_members?.map((member) => {+ const seller = member.seller;+ const isPending = seller.status === SellerStatus.PENDING_APPROVAL;++ return (+ <button+ key={seller.id}+ onClick={() => !isPending && handleSelect(seller.id)}+ disabled={isPending}+ className="transition-fg flex items-center gap-x-3 px-4 py-3 first:rounded-t-lg enabled:hover:bg-ui-bg-base-hover disabled:cursor-not-allowed disabled:opacity-60"+ >+ <Avatar+ variant="squared"+ size="small"+ fallback={seller.name.charAt(0).toUpperCase()}+ />+ <div className="flex flex-1 flex-col items-start">+ <Text size="small" weight="plus" leading="compact">+ {seller.name}+ </Text>+ <Text+ size="xsmall"+ className="text-ui-fg-subtle"+ leading="compact"+ >+ {seller.handle}+ </Text>+ </div>+ {isPending ? (+ <StatusBadge color="orange">{t("storeSelect.pendingApproval")}</StatusBadge>+ ) : (+ <ChevronRight className="text-ui-fg-muted" />+ )}+ </button>+ );+ })}+ {canCreateStore && (+ <button+ onClick={() => navigate("/onboarding", { state: { email } })}+ className="hover:bg-ui-bg-base-hover transition-fg flex items-center justify-center gap-x-2 rounded-b-lg px-4 py-3"+ >+ <Plus className="text-ui-fg-muted" />+ <Text size="small" weight="plus" leading="compact">+ {t("storeSelect.addNewStore")}+ </Text>+ </button>+ )}+ </div>+ );+};++const StoreSelectFooter = () => {+ return null;+};++const Root = () => {+ const location = useLocation();+ const email = (location.state as { email?: string })?.email ?? "";+ const { seller_members, isLoading: isSellersLoading } = useSellers();+ const { feature_flags, isLoading: isFlagsLoading } = useFeatureFlags();++ const isLoading = isSellersLoading || isFlagsLoading;+ const canCreateStore =+ !!feature_flags?.[MercurFeatureFlags.SELLER_REGISTRATION];++ if (isLoading) {+ return (+ <div className="bg-ui-bg-subtle flex min-h-dvh w-dvw items-center justify-center">+ <Spinner className="text-ui-fg-muted animate-spin" />+ </div>+ );+ }++ return (+ <div className="bg-ui-bg-subtle flex min-h-dvh w-dvw items-center justify-center">+ <div className="flex w-[380px] flex-col items-center">+ <StoreSelectLogo />+ <StoreSelectHeader />+ <StoreSelectList+ seller_members={seller_members ?? []}+ canCreateStore={canCreateStore}+ email={email}+ />+ <StoreSelectFooter />+ </div>+ </div>+ );+};++export const StoreSelectPage = Object.assign(Root, {+ Logo: StoreSelectLogo,+ Header: StoreSelectHeader,+ List: StoreSelectList,+ Footer: StoreSelectFooter,+});diff --git a/packages/vendor/tailwind.config.cjs b/packages/vendor/tailwind.config.cjsnew file mode 100644index 000000000..b2781995b--- /dev/null+++ b/packages/vendor/tailwind.config.cjs@@ -0,0 +1,17 @@+const path = require("path")++const medusaUI = path.join(+ path.dirname(require.resolve("@medusajs/ui")),+ "**/*.{js,jsx,ts,tsx}"+)++/** @type {import('tailwindcss').Config} */+module.exports = {+ presets: [require("@medusajs/ui-preset")],+ content: ["./src/**/*.{js,ts,jsx,tsx}", medusaUI],+ darkMode: "class",+ theme: {+ extend: {},+ },+ plugins: [],+}