git commit -m "ReplyHandler fix"

buckaroo-it · Jul 11, 2023 · 9866cba · 9866cba
1 parent 04a4e51
commit 9866cba
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 47 deletions.
diff --git a/example/ValidateResponse.ts b/example/ValidateResponse.ts
@@ -2,14 +2,13 @@ import {ReplyHandler} from "../src/Handlers/Reply/ReplyHandler";
 
 const buckarooClient  = require('./BuckarooClient')
 
-const JsonDATA = '{"Transaction":{"Key":"5340604668D74435AA344E1428ED1292","Invoice":"62d68b6c8ab0c","ServiceCode":"ideal","Status":{"Code":{"Code":190,"Description":"Success"},"SubCode":{"Code":"S001","Description":"Transaction successfully processed"},"DateTime":"2022-07-19T12:46:12"},"IsTest":true,"Order":"ORDER_NO_62d68b6ca2df3","Currency":"EUR","AmountDebit":10.1,"TransactionType":"C021","Services":[{"Name":"ideal","Action":null,"Parameters":[{"Name":"consumerIssuer","Value":"ABN AMRO"},{"Name":"transactionId","Value":"0000000000000001"},{"Name":"consumerName","Value":"J. de Tèster"},{"Name":"consumerIBAN","Value":"NL44RABO0123456789"},{"Name":"consumerBIC","Value":"RABONL2U"}],"VersionAsProperty":2}],"CustomParameters":null,"AdditionalParameters":{"List":[{"Name":"initiated_by_magento","Value":"1"},{"Name":"service_action","Value":"something"}]},"MutationType":1,"RelatedTransactions":null,"IsCancelable":false,"IssuingCountry":null,"StartRecurrent":false,"Recurring":false,"CustomerName":"J. de Tèster","PayerHash":"2d26d34584a4eafeeaa97eed10cfdae22ae64cdce1649a80a55fafca8850e3e22cb32eb7c8fc95ef0c6f96669a21651d4734cc568816f9bd59c2092911e6c0da","PaymentKey":"AEC974D455FF4A4B9B4C21E437A04838","Description":null}}'
+const JsonDATA = '{"Key":"5340604668D74435AA344E1428ED1292","Invoice":"62d68b6c8ab0c","ServiceCode":"ideal","Status":{"Code":{"Code":190,"Description":"Success"},"SubCode":{"Code":"S001","Description":"Transaction successfully processed"},"DateTime":"2022-07-19T12:46:12"},"IsTest":true,"Order":"ORDER_NO_62d68b6ca2df3","Currency":"EUR","AmountDebit":10.1,"TransactionType":"C021","Services":[{"Name":"ideal","Action":null,"Parameters":[{"Name":"consumerIssuer","Value":"ABN AMRO"},{"Name":"transactionId","Value":"0000000000000001"},{"Name":"consumerName","Value":"J. de Tèster"},{"Name":"consumerIBAN","Value":"NL44RABO0123456789"},{"Name":"consumerBIC","Value":"RABONL2U"}],"VersionAsProperty":2}],"CustomParameters":null,"AdditionalParameters":{"List":[{"Name":"initiated_by_magento","Value":"1"},{"Name":"service_action","Value":"something"}]},"MutationType":1,"RelatedTransactions":null,"IsCancelable":false,"IssuingCountry":null,"StartRecurrent":false,"Recurring":false,"CustomerName":"J. de Tèster","PayerHash":"2d26d34584a4eafeeaa97eed10cfdae22ae64cdce1649a80a55fafca8850e3e22cb32eb7c8fc95ef0c6f96669a21651d4734cc568816f9bd59c2092911e6c0da","PaymentKey":"AEC974D455FF4A4B9B4C21E437A04838","Description":null}'
 const auth_header = 'hmac N8hyQHxZ9W:swtPNR5+XSxKBYUJIWpJ8W/zDcZVuUJGn5kUR0HJEZg=:d550afab01d74207ad75f4ffe3e76beb:1686733946';
 
 const url = 'https://buckaroo.dev/push'
 
 //Validate Json Response
 let replyHandler = new ReplyHandler(buckarooClient().getCredentials(),JsonDATA,auth_header,url)
-
 replyHandler.validate()
 replyHandler.isValid // Returns true or false
 

diff --git a/src/Handlers/Reply/ReplyHandler.ts b/src/Handlers/Reply/ReplyHandler.ts
@@ -11,19 +11,15 @@ export class ReplyHandler {
     private credentials: ICredentials;
     private _isValid: boolean = false
 
-    constructor(credentials: ICredentials, data: string | object,auth_header?: string, uri?: string) {
-        if(typeof data === 'string'){
-            try {
-                this.data = JSON.parse(data)
-            } catch (e){
-                let objData = {}
-                new URLSearchParams(data).forEach((value, name)=>{
-                    objData[name] = value
-                })
-                this.data = objData
-            }
-        }else {
-            this.data = data
+    constructor(credentials: ICredentials, data: string,auth_header?: string, uri?: string) {
+        try {
+            this.data = JSON.parse(data)
+        } catch (e){
+            let objData = {}
+            new URLSearchParams(data).forEach((value, name)=>{
+                objData[name] = value
+            })
+            this.data = objData
         }
         this.credentials = credentials
         this.uri = uri
@@ -33,14 +29,18 @@ export class ReplyHandler {
         return this._isValid
     }
     validate() {
-        if(this.data["Key"] && this.auth_header && this.uri){
+        if(this.data["Key"] && this.auth_header && this.uri) {
             this._isValid = this.validateJson(this.auth_header)
-        }else if (this.data["brq_signature"]){
-            this._isValid = this.validateHttp({...this.data})
-        }else {
-            throw new Error('Invalid reply data')
+            return this
         }
-        return this
+
+        if (this.data["brq_signature"] || this.data["BRQ_SIGNATURE"]){
+            let  { brq_signature , BRQ_SIGNATURE, ...data} = this.data as any
+            this._isValid = this.validateHttp(data,brq_signature || BRQ_SIGNATURE)
+            return this
+        }
+
+        throw new Error('Invalid reply data')
     }
     private validateJson(auth_header:string){
         let header = auth_header.split(':')
@@ -54,18 +54,15 @@ export class ReplyHandler {
 
         return crypto.timingSafeEqual(Buffer.from(hash),Buffer.from(providedHash))
     }
-    private validateHttp(data:object){
-        let brq_signature = data['brq_signature']
+    private validateHttp(data:object,signature:string){
         let stringData = ''
-        delete data['brq_signature']
-
         for (const key in data ) {
             stringData+= key + '=' + data[key]
         }
         stringData = stringData + buckarooClient().getCredentials().websiteKey
 
         let hash = crypto.createHash('sha1').update(stringData).digest('hex')
 
-        return crypto.timingSafeEqual(Buffer.from(hash),Buffer.from(brq_signature))
+        return crypto.timingSafeEqual(Buffer.from(hash),Buffer.from(signature))
     }
 }
diff --git a/src/Request/Client.ts b/src/Request/Client.ts
@@ -100,8 +100,8 @@ export class Client {
     }
     specification(paymentName: string, serviceVersion = 0, type?: RequestType) {
         const url = this.getSpecificationUrl(paymentName, serviceVersion, type)
-        return this.get(url).then((response) => {
-            return new DataRequestResponse(response.data)
+        return this.get(url).then((res) => {
+            return new DataRequestResponse(res)
         })
     }
     specifications(

diff --git a/src/Request/Response.ts b/src/Request/Response.ts
@@ -1,8 +1,6 @@
 import {
     AxiosResponse,
 } from 'axios'
-import buckarooClient from "../BuckarooClient";
-import {ReplyHandler} from "../Handlers/Reply/ReplyHandler";
 
 export class Response {
 
@@ -18,13 +16,4 @@ export class Response {
         this._axiosResponse = response
         this._data = response.data
     }
-    validate() {
-        const replyHandler = new ReplyHandler(buckarooClient().getCredentials(),
-            this.data,
-            this.axiosResponse.headers["authorization"],
-            this.axiosResponse.config.url
-            )
-        return replyHandler.validate().isValid
-
-    }
 }
diff --git a/tests/PaymentMethods/PaymentInitiation.test.ts b/tests/PaymentMethods/PaymentInitiation.test.ts
@@ -1,8 +1,5 @@
-import {ReplyHandler} from "../../src/Handlers/Reply/ReplyHandler";
-
 require('../BuckarooClient.test')
 import PaymentInitiation from '../../src/PaymentMethods/PaymentInitiation'
-import buckarooClient from "../../src/BuckarooClient";
 
 const payByBank = new PaymentInitiation()
 
@@ -16,11 +13,7 @@ describe('PaymentInitiation methods', () => {
                 countryCode: 'NL'
             })
             .then((response) => {
-                const replyHandler = new ReplyHandler(buckarooClient().getCredentials(),
-                    response.data, response.axiosResponse.headers["authorization"],
-                    response.axiosResponse.config.url)
-                replyHandler.validate()
-                expect(replyHandler.isValid).toBeTruthy()
+                expect(response).toBeTruthy()
             })
     })
     test('Refund', async () => {