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

Adds update payment + minor fixes

Browse Source
This commit is contained in:
olivermrbl
2020-08-20 08:19:03 +02:00
parent f68c3fe067
commit 9028a5afab
9 changed files with 94 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/medusa-payment-adyen/src/api/routes/hooks/capture-hook.js
View File

@@ -13,7 +13,7 @@ export default async (req, res) => {
switch (event.success) {
case "false":
res.status(400).send(event.reason)
res.status(400).send("[accepted]")
return
default:
res.status(200).send("[accepted]")

9
packages/medusa-payment-adyen/src/api/routes/store/authorize-payment.js
View File

@@ -3,8 +3,8 @@ import { Validator, MedusaError } from "medusa-core-utils"
export default async (req, res) => {
const schema = Validator.object().keys({
cart_id: Validator.string().required(),
payment_method: Validator.object().required(),
provider_id: Validator.string().required(),
payment_data: Validator.object().required(),
})
const { value, error } = schema.validate(req.body)
@@ -20,7 +20,7 @@ export default async (req, res) => {
const { data } = await paymentProvider.authorizePayment(
cart,
value.payment_method
value.payment_data.paymentMethod
)
const transactionReference = data.pspReference
@@ -46,6 +46,11 @@ export default async (req, res) => {
newPaymentSession
)
await cartService.setPaymentMethod(cart._id, {
provider_id: value.provider_id,
data,
})
res.status(200).json({ data })
} catch (err) {
throw err

16
packages/medusa-payment-adyen/src/api/routes/store/check-payment-status.js
View File

@@ -2,9 +2,9 @@ import { Validator, MedusaError } from "medusa-core-utils"
export default async (req, res) => {
const schema = Validator.object().keys({
payment_provider: Validator.string().required(),
payload: Validator.object().required(),
payment_data: Validator.object().required(),
payload: Validator.string().required(),
payment_data: Validator.string().required(),
provider_id: Validator.string().required(),
})
const { value, error } = schema.validate(req.body)
@@ -13,17 +13,15 @@ export default async (req, res) => {
}
try {
const adyenService = req.scope.resolve("adyenService")
const paymentProviderService = req.scope.resolve(
`${value.payment_provider}AdyenProviderService`
)
const adyen = req.scope.resolve("adyenService")
const paymentProvider = req.scope.resolve(`pp_${value.provider_id}`)
const adyenResultCode = await adyenService.checkPaymentResult(
const { data } = await adyen.checkPaymentResult(
value.payment_data,
value.payload
)
const status = paymentProviderService.getStatus(adyenResultCode)
const status = await paymentProvider.getStatus(data)
res.status(200).json({ status })
} catch (err) {

12
packages/medusa-payment-adyen/src/api/routes/store/index.js
View File

@@ -33,6 +33,18 @@ export default (app, rootDirectory) => {
)
route.post(
"/update",
bodyParser.json(),
middlewares.wrap(require("./update-payment").default)
)
route.post(
"/payment-status",
bodyParser.json(),
middlewares.wrap(require("./check-payment-status").default)
)
route.get(
"/payment-status",
bodyParser.json(),
middlewares.wrap(require("./check-payment-status").default)

5
packages/medusa-payment-adyen/src/api/routes/store/retrieve-payment-methods.js
View File

@@ -24,6 +24,11 @@ export default async (req, res) => {
(ps) => ps.provider_id.split("Adyen")[0]
)
if (allowedMethods.length === 0) {
res.status(200).json({ paymentMethods: {} })
return
}
const { data } = await adyenService.retrievePaymentMethods(
cart,
allowedMethods,

32
packages/medusa-payment-adyen/src/api/routes/store/update-payment.js Normal file
View File

@@ -0,0 +1,32 @@
import { Validator, MedusaError } from "medusa-core-utils"
export default async (req, res) => {
const schema = Validator.object().keys({
cart_id: Validator.string().required(),
provider_id: Validator.string().required(),
payment_data: Validator.object().required(),
})
const { value, error } = schema.validate(req.body)
if (error) {
throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
}
try {
const cartService = req.scope.resolve("cartService")
const paymentProvider = req.scope.resolve(`pp_${value.provider_id}`)
const cart = await cartService.retrieve(value.cart_id)
const { data } = await paymentProvider.updatePayment(
value.payment_data.paymentData,
value.payment_data.details
)
await cartService.updatePaymentSession(cart._id, value.provider_id, data)
res.status(200).json({ data })
} catch (err) {
throw err
}
}

32
packages/medusa-payment-adyen/src/services/adyen.js
View File

@@ -16,7 +16,7 @@ class AdyenService extends BaseService {
this.options_ = options
this.adyenCheckoutApi = axios.create({
baseURL: "https://checkout-test.adyen.com/v52",
baseURL: "https://checkout-test.adyen.com/v53",
headers: {
"Content-Type": "application/json",
"x-API-key": this.options_.api_key,
@@ -24,7 +24,7 @@ class AdyenService extends BaseService {
})
this.adyenPaymentApi = axios.create({
baseURL: "https://pal-test.adyen.com/pal/servlet/Payment/v52",
baseURL: "https://pal-test.adyen.com/pal/servlet/Payment/v53",
headers: {
"Content-Type": "application/json",
"x-API-key": this.options_.api_key,
@@ -96,6 +96,14 @@ class AdyenService extends BaseService {
return data
}
async updatePayment(paymentData, details) {
const request = {
paymentData,
details,
}
return this.adyenCheckoutApi.post("/payments/details", request)
}
/**
* Creates and authorizes an Ayden payment
* @returns {Object} payment data result
@@ -146,11 +154,29 @@ class AdyenService extends BaseService {
const { pspReference, amount } = data
try {
return this.adyenPaymentApi.post("/capture", {
const captured = this.adyenPaymentApi.post("/capture", {
originalReference: pspReference,
modificationAmount: amount,
merchantAccount: this.options_.merchant_account,
})
if (
captured.data.pspReference &&
captured.data.response !== "[capture-received]"
) {
throw new MedusaError(
MedusaError.Types.INVALID_ARGUMENT,
"Could not process capture"
)
}
// await this.orderService_.setMetadata(
// orderId,
// "adyen_capture_reference",
// captureData.data.pspReference
// )
return captured
} catch (error) {
console.log(error)
throw error

14
packages/medusa/src/services/order.js
View File

@@ -603,19 +603,7 @@ class OrderService extends BaseService {
provider_id
)
const captureData = await paymentProvider.capturePayment(data)
// If Adyen is used as payment provider, we need to check the
// validity of the capture request
if (
captureData.data.pspReference &&
captureData.data.response !== "[capture-received]"
) {
throw new MedusaError(
MedusaError.Types.INVALID_ARGUMENT,
"Could not process capture"
)
}
await paymentProvider.capturePayment(data)
return this.orderModel_
.updateOne(

8
packages/medusa/src/subscribers/order.js
View File

@@ -30,14 +30,6 @@ class OrderSubscriber {
await this.customerService_.addAddress(order.customer_id, address)
})
this.eventBus_.subscribe("order.placed", async order => {
await this.cartService_.delete(order.cart_id).catch(err => {
if (err.type !== "not_found") {
throw err
}
})
})
this.eventBus_.subscribe("order.placed", this.handleDiscounts)
}