asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Revert "feat(core-flows,medusa): Add customer validation on cart update" (#9724)

Browse Source
This commit is contained in:
Riqwan Thamir
2024-10-22 18:26:01 +00:00
committed by GitHub
parent f1b2d22db7
commit d1ce6d4321
6 changed files with 62 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-tests/http/__tests__/cart/store/cart.spec.ts
+53 -128
View File
@@ -1,4 +1,3 @@
import { medusaIntegrationTestRunner } from "@medusajs/test-utils"
import {
Modules,
PriceListStatus,
@@ -7,19 +6,39 @@ import {
PromotionRuleOperator,
PromotionType,
} from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "@medusajs/test-utils"
import {
createAdminUser,
generatePublishableKey,
generateStoreHeaders,
} from "../../../../helpers/create-admin-user"
import { setupTaxStructure } from "../../../../modules/__tests__/fixtures"
import { createAuthenticatedCustomer } from "../../../../modules/helpers/create-authenticated-customer"
jest.setTimeout(100000)
const env = { MEDUSA_FF_MEDUSA_V2: true }
const adminHeaders = { headers: { "x-medusa-access-token": "test_token" } }
const generateStoreHeadersWithCustomer = async ({
api,
storeHeaders,
customer,
}) => {
const registeredCustomerToken = (
await api.post("/auth/customer/emailpass/register", {
email: customer.email,
password: "password",
})
).data.token
return {
headers: {
...storeHeaders.headers,
authorization: `Bearer ${registeredCustomerToken}`,
},
}
}
const shippingAddressData = {
address_1: "test address 1",
address_2: "test address 2",
@@ -117,19 +136,22 @@ medusaIntegrationTestRunner({
const publishableKey = await generatePublishableKey(appContainer)
storeHeaders = generateStoreHeaders({ publishableKey })
const result = await createAuthenticatedCustomer(appContainer, {
first_name: "tony",
last_name: "stark",
email: "tony@stark-industries.com",
})
customer = (
await api.post(
"/admin/customers",
{
first_name: "tony",
email: "tony@stark-industries.com",
},
adminHeaders
)
).data.customer
customer = result.customer
storeHeadersWithCustomer = {
headers: {
...storeHeaders.headers,
authorization: `Bearer ${result.jwt}`,
},
}
storeHeadersWithCustomer = await generateStoreHeadersWithCustomer({
storeHeaders,
api,
customer,
})
await setupTaxStructure(appContainer.resolve(Modules.TAX))
@@ -557,23 +579,23 @@ medusaIntegrationTestRunner({
})
describe("POST /store/carts/:id", () => {
let otherRegion, cartWithCustomer
let otherRegion
beforeEach(async () => {
const cartData = {
currency_code: "usd",
sales_channel_id: salesChannel.id,
region_id: region.id,
shipping_address: shippingAddressData,
items: [{ variant_id: product.variants[0].id, quantity: 1 }],
promo_codes: [promotion.code],
}
cart = (await api.post(`/store/carts`, cartData, storeHeaders)).data
.cart
cartWithCustomer = (
await api.post(`/store/carts`, cartData, storeHeadersWithCustomer)
cart = (
await api.post(
`/store/carts`,
{
email: "tony@stark.com",
currency_code: "usd",
sales_channel_id: salesChannel.id,
region_id: region.id,
shipping_address: shippingAddressData,
items: [{ variant_id: product.variants[0].id, quantity: 1 }],
promo_codes: [promotion.code],
},
storeHeadersWithCustomer
)
).data.cart
otherRegion = (
@@ -729,7 +751,7 @@ medusaIntegrationTestRunner({
it("should not generate tax lines if automatic taxes is false", async () => {
let updated = await api.post(
`/store/carts/${cart.id}`,
{},
{ email: "another@tax.com" },
storeHeaders
)
@@ -754,7 +776,7 @@ medusaIntegrationTestRunner({
updated = await api.post(
`/store/carts/${cart.id}`,
{ region_id: noAutomaticRegion.id },
{ email: "another@tax.com", region_id: noAutomaticRegion.id },
storeHeaders
)
@@ -1214,103 +1236,6 @@ medusaIntegrationTestRunner({
})
)
})
it("should update email if cart customer_id is not set", async () => {
const updated = await api.post(
`/store/carts/${cart.id}`,
{ email: "tony@stark.com" },
storeHeaders
)
expect(updated.status).toEqual(200)
expect(updated.data.cart).toEqual(
expect.objectContaining({
email: "tony@stark.com",
customer: expect.objectContaining({
email: "tony@stark.com",
}),
})
)
})
it("should update customer_id if cart customer_id if not already set", async () => {
const updated = await api.post(
`/store/carts/${cart.id}`,
{ customer_id: customer.id },
storeHeadersWithCustomer
)
expect(updated.status).toEqual(200)
expect(updated.data.cart).toEqual(
expect.objectContaining({
email: customer.email,
customer: expect.objectContaining({
id: customer.id,
email: customer.email,
}),
})
)
})
it("should throw when trying to set customer_id if customer is not logged in", async () => {
const { response } = await api
.post(
`/store/carts/${cartWithCustomer.id}`,
{ customer_id: customer.id },
storeHeaders
)
.catch((e) => e)
expect(response.status).toEqual(400)
expect(response.data.message).toEqual(
"auth_customer_id is required when customer_id is set"
)
})
it("should throw when trying to set customer_id if customer_id is already set", async () => {
const newCustomer = (
await api.post(
"/admin/customers",
{
first_name: "new tony",
email: "new-tony@stark-industries.com",
},
adminHeaders
)
).data.customer
const { response } = await api
.post(
`/store/carts/${cartWithCustomer.id}`,
{ customer_id: newCustomer.id },
storeHeadersWithCustomer
)
.catch((e) => e)
expect(response.status).toEqual(400)
expect(response.data.message).toEqual(
"Cannot update cart customer when customer_id is set"
)
})
it("should update email when email is already set and customer is logged in", async () => {
const updated = await api.post(
`/store/carts/${cart.id}`,
{ customer_id: customer.id },
storeHeadersWithCustomer
)
expect(updated.status).toEqual(200)
expect(updated.data.cart).toEqual(
expect.objectContaining({
email: customer.email,
customer: expect.objectContaining({
id: customer.id,
email: customer.email,
}),
})
)
})
})
})
},
integration-tests/modules/helpers/create-authenticated-customer.ts
+1 -1
View File
@@ -36,7 +36,7 @@ export const createAuthenticatedCustomer = async (
actor_type: "customer",
auth_identity_id: authIdentity.id,
},
http.jwtSecret!
http.jwtSecret
)
return { customer, authIdentity, jwt: token }