From a35e37a069701d32010b66b6c1a902f72a721318 Mon Sep 17 00:00:00 2001 From: ankitdas13 Date: Wed, 22 Feb 2023 19:30:25 +0530 Subject: [PATCH 1/7] version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ad7d6625..216e9ae9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "razorpay", - "version": "2.8.5", + "version": "2.8.6", "description": "Official Node SDK for Razorpay API", "main": "dist/razorpay", "typings": "dist/razorpay", From 5170381dd27b2afd9f09d77da0e0c9bc9e417b9c Mon Sep 17 00:00:00 2001 From: ankitdas13 Date: Tue, 1 Aug 2023 12:48:27 +0530 Subject: [PATCH 2/7] added beta url --- test_prod/razorpay.js | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 test_prod/razorpay.js diff --git a/test_prod/razorpay.js b/test_prod/razorpay.js new file mode 100644 index 00000000..7714458d --- /dev/null +++ b/test_prod/razorpay.js @@ -0,0 +1,24 @@ +'use strict'; + +const Razorpay = require("../dist/razorpay"); +let request = require('request-promise'); + +class RazorpayTest extends Razorpay { + constructor(options) { + super(options) + this.api.rq = request.defaults({ + baseUrl: "https://api-web.dev.razorpay.in", + json: true, + auth: { + user: options.key_id, + pass: options.key_secret + } + }) + } +} + + +module.exports = new RazorpayTest({ + key_id: process.env.API_KEY || "", + key_secret: process.env.API_SECRET || "" +}); \ No newline at end of file From fd20e89cb3bc257be06e199fb7824cc13fecf33a Mon Sep 17 00:00:00 2001 From: ankitdas13 Date: Tue, 1 Aug 2023 14:25:43 +0530 Subject: [PATCH 3/7] rename folder --- {test_prod => e2e}/razorpay.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename {test_prod => e2e}/razorpay.js (78%) diff --git a/test_prod/razorpay.js b/e2e/razorpay.js similarity index 78% rename from test_prod/razorpay.js rename to e2e/razorpay.js index 7714458d..b0feb408 100644 --- a/test_prod/razorpay.js +++ b/e2e/razorpay.js @@ -7,7 +7,7 @@ class RazorpayTest extends Razorpay { constructor(options) { super(options) this.api.rq = request.defaults({ - baseUrl: "https://api-web.dev.razorpay.in", + baseUrl: hostUrl, json: true, auth: { user: options.key_id, @@ -20,5 +20,6 @@ class RazorpayTest extends Razorpay { module.exports = new RazorpayTest({ key_id: process.env.API_KEY || "", - key_secret: process.env.API_SECRET || "" + key_secret: process.env.API_SECRET || "", + hostUrl : "https://api-web.dev.razorpay.in" }); \ No newline at end of file From 282d7ef92c798fec6b78ed9c44ce71fd4870126c Mon Sep 17 00:00:00 2001 From: ankitdas13 Date: Tue, 1 Aug 2023 15:05:34 +0530 Subject: [PATCH 4/7] refactor hostUrl --- e2e/razorpay.js | 18 +----------------- lib/razorpay.d.ts | 1 + lib/razorpay.js | 8 ++++++-- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/e2e/razorpay.js b/e2e/razorpay.js index b0feb408..35c26098 100644 --- a/e2e/razorpay.js +++ b/e2e/razorpay.js @@ -1,24 +1,8 @@ 'use strict'; const Razorpay = require("../dist/razorpay"); -let request = require('request-promise'); -class RazorpayTest extends Razorpay { - constructor(options) { - super(options) - this.api.rq = request.defaults({ - baseUrl: hostUrl, - json: true, - auth: { - user: options.key_id, - pass: options.key_secret - } - }) - } -} - - -module.exports = new RazorpayTest({ +module.exports = new Razorpay({ key_id: process.env.API_KEY || "", key_secret: process.env.API_SECRET || "", hostUrl : "https://api-web.dev.razorpay.in" diff --git a/lib/razorpay.d.ts b/lib/razorpay.d.ts index 83d06394..56b1f6d8 100644 --- a/lib/razorpay.d.ts +++ b/lib/razorpay.d.ts @@ -27,6 +27,7 @@ interface IRazorpayConfig { key_id: string; key_secret?: string; headers?: RazorpayHeaders; + hostUrl? : string; } declare class Razorpay { diff --git a/lib/razorpay.js b/lib/razorpay.js index dbbd1d86..263ddc66 100644 --- a/lib/razorpay.js +++ b/lib/razorpay.js @@ -15,17 +15,21 @@ class Razorpay { } constructor(options = {}) { - let { key_id, key_secret, headers } = options + let { key_id, key_secret, headers, hostUrl } = options if (!key_id) { throw new Error('`key_id` is mandatory') } + if(!hostUrl){ + hostUrl = 'https://api.razorpay.com' + } + this.key_id = key_id this.key_secret = key_secret this.api = new API({ - hostUrl: 'https://api.razorpay.com', + hostUrl, ua: `razorpay-node@${Razorpay.VERSION}`, key_id, key_secret, From d4630113cc713c71470c5ba6efe34e878b6a22ce Mon Sep 17 00:00:00 2001 From: ankitdas13 Date: Tue, 1 Aug 2023 15:12:50 +0530 Subject: [PATCH 5/7] Revert "refactor hostUrl" This reverts commit 282d7ef92c798fec6b78ed9c44ce71fd4870126c. --- e2e/razorpay.js | 18 +++++++++++++++++- lib/razorpay.d.ts | 1 - lib/razorpay.js | 8 ++------ 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/e2e/razorpay.js b/e2e/razorpay.js index 35c26098..b0feb408 100644 --- a/e2e/razorpay.js +++ b/e2e/razorpay.js @@ -1,8 +1,24 @@ 'use strict'; const Razorpay = require("../dist/razorpay"); +let request = require('request-promise'); -module.exports = new Razorpay({ +class RazorpayTest extends Razorpay { + constructor(options) { + super(options) + this.api.rq = request.defaults({ + baseUrl: hostUrl, + json: true, + auth: { + user: options.key_id, + pass: options.key_secret + } + }) + } +} + + +module.exports = new RazorpayTest({ key_id: process.env.API_KEY || "", key_secret: process.env.API_SECRET || "", hostUrl : "https://api-web.dev.razorpay.in" diff --git a/lib/razorpay.d.ts b/lib/razorpay.d.ts index 56b1f6d8..83d06394 100644 --- a/lib/razorpay.d.ts +++ b/lib/razorpay.d.ts @@ -27,7 +27,6 @@ interface IRazorpayConfig { key_id: string; key_secret?: string; headers?: RazorpayHeaders; - hostUrl? : string; } declare class Razorpay { diff --git a/lib/razorpay.js b/lib/razorpay.js index 263ddc66..dbbd1d86 100644 --- a/lib/razorpay.js +++ b/lib/razorpay.js @@ -15,21 +15,17 @@ class Razorpay { } constructor(options = {}) { - let { key_id, key_secret, headers, hostUrl } = options + let { key_id, key_secret, headers } = options if (!key_id) { throw new Error('`key_id` is mandatory') } - if(!hostUrl){ - hostUrl = 'https://api.razorpay.com' - } - this.key_id = key_id this.key_secret = key_secret this.api = new API({ - hostUrl, + hostUrl: 'https://api.razorpay.com', ua: `razorpay-node@${Razorpay.VERSION}`, key_id, key_secret, From 3faaf99ae4ac6c5a2615a9142a8ca919509aeb3c Mon Sep 17 00:00:00 2001 From: ankitdas13 Date: Tue, 1 Aug 2023 15:17:30 +0530 Subject: [PATCH 6/7] update class name --- e2e/razorpay.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/razorpay.js b/e2e/razorpay.js index b0feb408..b8a036c7 100644 --- a/e2e/razorpay.js +++ b/e2e/razorpay.js @@ -3,7 +3,7 @@ const Razorpay = require("../dist/razorpay"); let request = require('request-promise'); -class RazorpayTest extends Razorpay { +class RazorpayBeta extends Razorpay { constructor(options) { super(options) this.api.rq = request.defaults({ @@ -18,7 +18,7 @@ class RazorpayTest extends Razorpay { } -module.exports = new RazorpayTest({ +module.exports = new RazorpayBeta({ key_id: process.env.API_KEY || "", key_secret: process.env.API_SECRET || "", hostUrl : "https://api-web.dev.razorpay.in" From bdf5018d97b5118f5329a14ef8cc0257cc5693f1 Mon Sep 17 00:00:00 2001 From: Ankit Das <89454448+ankitdas13@users.noreply.github.com> Date: Tue, 1 Aug 2023 15:30:09 +0530 Subject: [PATCH 7/7] Update razorpay.js --- e2e/razorpay.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/razorpay.js b/e2e/razorpay.js index b8a036c7..5c2c49c4 100644 --- a/e2e/razorpay.js +++ b/e2e/razorpay.js @@ -7,7 +7,7 @@ class RazorpayBeta extends Razorpay { constructor(options) { super(options) this.api.rq = request.defaults({ - baseUrl: hostUrl, + baseUrl: options.hostUrl, json: true, auth: { user: options.key_id, @@ -22,4 +22,4 @@ module.exports = new RazorpayBeta({ key_id: process.env.API_KEY || "", key_secret: process.env.API_SECRET || "", hostUrl : "https://api-web.dev.razorpay.in" -}); \ No newline at end of file +});