cx/commerce
4
0
Fork 0
forked from crowetic/commerce
Code Pull Requests Activity

Fix redirect checkout (#502)

Browse Source 
* Fix redirect checkout

* Don't use checkout for saleor
This commit is contained in:
Gonzalo Pozzo 2021-09-24 13:42:09 -03:00 committed by GitHub
parent c440ff06d4
commit 8e7b942240
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/bigcommerce/api/endpoints/checkout/submit-checkout.ts → framework/bigcommerce/api/endpoints/checkout/get-checkout.ts
View File

@ -5,7 +5,7 @@ import { uuid } from 'uuidv4'
const fullCheckout = true const fullCheckout = true
const submitCheckout: CheckoutEndpoint['handlers']['submitCheckout'] = async ({ const getCheckout: CheckoutEndpoint['handlers']['getCheckout'] = async ({
req, req,
res, res,
config, config,
@ -87,4 +87,4 @@ const submitCheckout: CheckoutEndpoint['handlers']['submitCheckout'] = async ({
res.end() res.end()
} }
export default submitCheckout export default getCheckout

4
framework/bigcommerce/api/endpoints/checkout/index.ts
View File

@ -2,13 +2,13 @@ import { GetAPISchema, createEndpoint } from '@commerce/api'
import checkoutEndpoint from '@commerce/api/endpoints/checkout' import checkoutEndpoint from '@commerce/api/endpoints/checkout'
import type { CheckoutSchema } from '../../../types/checkout' import type { CheckoutSchema } from '../../../types/checkout'
import type { BigcommerceAPI } from '../..' import type { BigcommerceAPI } from '../..'
import submitCheckout from './submit-checkout' import getCheckout from './get-checkout'
export type CheckoutAPI = GetAPISchema<BigcommerceAPI, CheckoutSchema> export type CheckoutAPI = GetAPISchema<BigcommerceAPI, CheckoutSchema>
export type CheckoutEndpoint = CheckoutAPI['endpoint'] export type CheckoutEndpoint = CheckoutAPI['endpoint']
export const handlers: CheckoutEndpoint['handlers'] = { submitCheckout } export const handlers: CheckoutEndpoint['handlers'] = { getCheckout }
const checkoutApi = createEndpoint<CheckoutAPI>({ const checkoutApi = createEndpoint<CheckoutAPI>({
handler: checkoutEndpoint, handler: checkoutEndpoint,

4
framework/commerce/api/endpoints/checkout.ts
View File

@ -26,11 +26,11 @@ const checkoutEndpoint: GetAPISchema<
// Create checkout // Create checkout
if (req.method === 'GET') { if (req.method === 'GET') {
const body = { ...req.body, cartId } const body = { ...req.body, cartId }
return await handlers['getCheckout']?.({ ...ctx, body }) return await handlers['getCheckout']({ ...ctx, body })
} }
// Create checkout // Create checkout
if (req.method === 'POST') { if (req.method === 'POST' && handlers['submitCheckout']) {
const body = { ...req.body, cartId } const body = { ...req.body, cartId }
return await handlers['submitCheckout']({ ...ctx, body }) return await handlers['submitCheckout']({ ...ctx, body })
} }

6
framework/commerce/types/checkout.ts
View File

@ -3,7 +3,7 @@ import type { Address } from './customer/address'
import type { Card } from './customer/card' import type { Card } from './customer/card'
// Index // Index
export type Checkout = unknown; export type Checkout = any
export type CheckoutTypes = { export type CheckoutTypes = {
card?: Card card?: Card
@ -45,8 +45,8 @@ export type SubmitCheckoutHandler<T extends CheckoutTypes = CheckoutTypes> =
} }
export type CheckoutHandlers<T extends CheckoutTypes = CheckoutTypes> = { export type CheckoutHandlers<T extends CheckoutTypes = CheckoutTypes> = {
getCheckout?: GetCheckoutHandler<T> getCheckout: GetCheckoutHandler<T>
submitCheckout: SubmitCheckoutHandler<T> submitCheckout?: SubmitCheckoutHandler<T>
} }
export type CheckoutSchema<T extends CheckoutTypes = CheckoutTypes> = { export type CheckoutSchema<T extends CheckoutTypes = CheckoutTypes> = {

4
framework/saleor/api/endpoints/checkout/index.ts
View File

@ -6,7 +6,7 @@ export type CheckoutAPI = GetAPISchema<CommerceAPI, CheckoutSchema>
export type CheckoutEndpoint = CheckoutAPI['endpoint'] export type CheckoutEndpoint = CheckoutAPI['endpoint']
const submitCheckout: CheckoutEndpoint['handlers']['submitCheckout'] = async ({ req, res, config }) => { const getCheckout: CheckoutEndpoint['handlers']['getCheckout'] = async ({ req, res, config }) => {
try { try {
const html = ` const html = `
<!DOCTYPE html> <!DOCTYPE html>
@ -43,7 +43,7 @@ const submitCheckout: CheckoutEndpoint['handlers']['submitCheckout'] = async ({
} }
} }
export const handlers: CheckoutEndpoint['handlers'] = { submitCheckout } export const handlers: CheckoutEndpoint['handlers'] = { getCheckout }
const checkoutApi = createEndpoint<CheckoutAPI>({ const checkoutApi = createEndpoint<CheckoutAPI>({
handler: checkoutEndpoint, handler: checkoutEndpoint,

3
framework/saleor/commerce.config.json
View File

@ -1,7 +1,6 @@
{ {
"provider": "saleor", "provider": "saleor",
"features": { "features": {
"wishlist": false, "wishlist": false
"customCheckout": true
} }
} }

4
framework/shopify/api/endpoints/checkout/submit-checkout.ts → framework/shopify/api/endpoints/checkout/get-checkout.ts
View File

@ -6,7 +6,7 @@ import {
import associateCustomerWithCheckoutMutation from '../../../utils/mutations/associate-customer-with-checkout' import associateCustomerWithCheckoutMutation from '../../../utils/mutations/associate-customer-with-checkout'
import type { CheckoutEndpoint } from '.' import type { CheckoutEndpoint } from '.'
const submitCheckout: CheckoutEndpoint['handlers']['submitCheckout'] = async ({ const getCheckout: CheckoutEndpoint['handlers']['getCheckout'] = async ({
req, req,
res, res,
config, config,
@ -35,4 +35,4 @@ const submitCheckout: CheckoutEndpoint['handlers']['submitCheckout'] = async ({
} }
} }
export default submitCheckout export default getCheckout

4
framework/shopify/api/endpoints/checkout/index.ts
View File

@ -2,13 +2,13 @@ import { GetAPISchema, createEndpoint } from '@commerce/api'
import checkoutEndpoint from '@commerce/api/endpoints/checkout' import checkoutEndpoint from '@commerce/api/endpoints/checkout'
import type { CheckoutSchema } from '../../../types/checkout' import type { CheckoutSchema } from '../../../types/checkout'
import type { ShopifyAPI } from '../..' import type { ShopifyAPI } from '../..'
import submitCheckout from './submit-checkout' import getCheckout from './get-checkout'
export type CheckoutAPI = GetAPISchema<ShopifyAPI, CheckoutSchema> export type CheckoutAPI = GetAPISchema<ShopifyAPI, CheckoutSchema>
export type CheckoutEndpoint = CheckoutAPI['endpoint'] export type CheckoutEndpoint = CheckoutAPI['endpoint']
export const handlers: CheckoutEndpoint['handlers'] = { submitCheckout } export const handlers: CheckoutEndpoint['handlers'] = { getCheckout }
const checkoutApi = createEndpoint<CheckoutAPI>({ const checkoutApi = createEndpoint<CheckoutAPI>({
handler: checkoutEndpoint, handler: checkoutEndpoint,

4
framework/swell/api/endpoints/checkout/index.ts
View File

@ -3,7 +3,7 @@ import { CheckoutSchema } from '@commerce/types/checkout'
import { SWELL_CHECKOUT_URL_COOKIE } from '../../../const' import { SWELL_CHECKOUT_URL_COOKIE } from '../../../const'
import checkoutEndpoint from '@commerce/api/endpoints/checkout' import checkoutEndpoint from '@commerce/api/endpoints/checkout'
const submitCheckout: CheckoutEndpoint['handlers']['submitCheckout'] = async ({ const getCheckout: CheckoutEndpoint['handlers']['getCheckout'] = async ({
req, req,
res, res,
config, config,
@ -17,7 +17,7 @@ const submitCheckout: CheckoutEndpoint['handlers']['submitCheckout'] = async ({
res.redirect('/cart') res.redirect('/cart')
} }
} }
export const handlers: CheckoutEndpoint['handlers'] = { submitCheckout } export const handlers: CheckoutEndpoint['handlers'] = { getCheckout }
export type CheckoutAPI = GetAPISchema<CommerceAPI, CheckoutSchema> export type CheckoutAPI = GetAPISchema<CommerceAPI, CheckoutSchema>
export type CheckoutEndpoint = CheckoutAPI['endpoint'] export type CheckoutEndpoint = CheckoutAPI['endpoint']

4
framework/vendure/api/endpoints/checkout/index.ts
View File

@ -3,7 +3,7 @@ import { CommerceAPI, createEndpoint, GetAPISchema } from '@commerce/api'
import { CheckoutSchema } from '@commerce/types/checkout' import { CheckoutSchema } from '@commerce/types/checkout'
import checkoutEndpoint from '@commerce/api/endpoints/checkout' import checkoutEndpoint from '@commerce/api/endpoints/checkout'
const submitCheckout: CheckoutEndpoint['handlers']['submitCheckout'] = async ({ const getCheckout: CheckoutEndpoint['handlers']['getCheckout'] = async ({
req, req,
res, res,
config, config,
@ -48,7 +48,7 @@ export type CheckoutAPI = GetAPISchema<CommerceAPI, CheckoutSchema>
export type CheckoutEndpoint = CheckoutAPI['endpoint'] export type CheckoutEndpoint = CheckoutAPI['endpoint']
export const handlers: CheckoutEndpoint['handlers'] = { submitCheckout } export const handlers: CheckoutEndpoint['handlers'] = { getCheckout }
const checkoutApi = createEndpoint<CheckoutAPI>({ const checkoutApi = createEndpoint<CheckoutAPI>({
handler: checkoutEndpoint, handler: checkoutEndpoint,

2
next.config.js
View File

@ -19,7 +19,7 @@ module.exports = withCommerceConfig({
}, },
rewrites() { rewrites() {
return [ return [
(isBC || isShopify || isSwell || isVendure) && { (isBC || isShopify || isSwell || isVendure || isSaleor) && {
source: '/checkout', source: '/checkout',
destination: '/api/checkout', destination: '/api/checkout',
}, },