From 6715a8b500a079a0a5c13e29593b197180977d8c Mon Sep 17 00:00:00 2001 From: om-3004 Date: Thu, 17 Oct 2024 10:02:01 +0530 Subject: [PATCH] Refactor code for check endpoint and update test cases accordingly --- Server/controllers/monitorController.js | 9 ++---- .../controllers/monitorController.test.js | 30 +++++++++---------- 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/Server/controllers/monitorController.js b/Server/controllers/monitorController.js index 0586d650e..80cc1eccf 100644 --- a/Server/controllers/monitorController.js +++ b/Server/controllers/monitorController.js @@ -277,13 +277,8 @@ const createMonitor = async (req, res, next) => { const checkEndpointResolution = async (req, res, next) => { try { let { monitorURL } = req.query; - - // Remove the protocol (http:// or https://) if present - monitorURL = monitorURL.replace(/^https?:\/\//, ''); - // Remove the trailing slash if it exists - monitorURL = monitorURL.endsWith('/') ? monitorURL.slice(0, -1) : monitorURL; - - dns.resolve(monitorURL, (error) => { + monitorURL = new URL(monitorURL); + dns.resolve(monitorURL.hostname, (error) => { if (error) { return res.status(400).json({ success: false, diff --git a/Server/tests/controllers/monitorController.test.js b/Server/tests/controllers/monitorController.test.js index 730deb327..b446edf73 100644 --- a/Server/tests/controllers/monitorController.test.js +++ b/Server/tests/controllers/monitorController.test.js @@ -478,7 +478,7 @@ describe("Monitor Controller - createMonitor", () => { describe('checkEndpointResolution', () => { let dnsResolveStub; beforeEach(() => { - req = { query: { monitorURL: 'example.com' } }; + req = { query: { monitorURL: 'https://example.com' } }; res = { status: sinon.stub().returnsThis(), json: sinon.stub() }; next = sinon.stub(); dnsResolveStub = sinon.stub(dns, 'resolve'); @@ -487,7 +487,7 @@ describe('checkEndpointResolution', () => { dnsResolveStub.restore(); }); it('should resolve the URL successfully', async () => { - dnsResolveStub.callsFake((monitorURL, callback) => callback(null)); + dnsResolveStub.callsFake((hostname, callback) => callback(null)); await checkEndpointResolution(req, res, next); expect(res.status.calledWith(200)).to.be.true; expect(res.json.calledWith({ @@ -498,7 +498,7 @@ describe('checkEndpointResolution', () => { }); it("should return a 400 error message if DNS resolution fails", async () => { const dnsError = new Error("DNS resolution failed"); - dnsResolveStub.callsFake((monitorURL, callback) => callback(dnsError)); + dnsResolveStub.callsFake((hostname, callback) => callback(dnsError)); await checkEndpointResolution(req, res, next); expect(res.status.calledOnceWith(400)).to.be.true; expect(res.json.calledOnceWith({ @@ -507,23 +507,21 @@ describe('checkEndpointResolution', () => { })).to.be.true; expect(next.notCalled).to.be.true; }); - it("should remove the trailing slash and resolve the URL successfully", async () => { - req.query.monitorURL = 'http://example.com/'; // URL with a trailing slash - dnsResolveStub.callsFake((monitorURL, callback) => callback(null)); - await checkEndpointResolution(req, res, next); - expect(res.status.calledWith(200)).to.be.true; - expect(res.json.calledWith({ - success: true, - msg: 'URL resolved successfully', - })).to.be.true; - expect(next.called).to.be.false; - }); - it("should call next with an error if an exception is thrown", async () => { - req.query = {}; // Missing monitorURL will cause an error + it('should call next with an error for invalid monitorURL', async () => { + req.query.monitorURL = 'invalid-url'; await checkEndpointResolution(req, res, next); expect(next.calledOnce).to.be.true; const error = next.getCall(0).args[0]; expect(error).to.be.an.instanceOf(Error); + expect(error.message).to.include('Invalid URL'); + }); + it('should handle an edge case where monitorURL is not provided', async () => { + req.query = {}; + await checkEndpointResolution(req, res, next); + expect(next.calledOnce).to.be.true; + const error = next.getCall(0).args[0]; + expect(error).to.be.an.instanceOf(Error); + expect(error.message).to.include('Invalid URL'); }); });