From 10f46a6e9b7c8008f9a59fe8e5732597240e45bf Mon Sep 17 00:00:00 2001
From: rozetko <rozetko@corpglory.com>
Date: Mon, 25 Feb 2019 12:47:50 +0300
Subject: [PATCH] Hotfix for #416 (#429): - support ip:port scheme - url-parse
 -> url

---
 server/package.json           |  2 +-
 server/spec/utils/url.jest.ts |  2 ++
 server/src/utils/url.ts       | 10 +++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/server/package.json b/server/package.json
index 1fc344c..4af46bd 100644
--- a/server/package.json
+++ b/server/package.json
@@ -50,7 +50,7 @@
     "ts-jest": "^23.1.1",
     "ts-loader": "^4.4.1",
     "typescript": "^2.8.3",
-    "url-parse": "^1.4.4",
+    "url": "^0.11.0",
     "webpack": "^4.12.0",
     "webpack-cli": "^3.0.8",
     "zeromq": "^4.6.0"
diff --git a/server/spec/utils/url.jest.ts b/server/spec/utils/url.jest.ts
index db0746c..a236b9f 100644
--- a/server/spec/utils/url.jest.ts
+++ b/server/spec/utils/url.jest.ts
@@ -2,6 +2,8 @@ import { normalizeUrl } from '../../src/utils/url';
 
 describe('Normalize URL', function() {
   const cases = [
+    { value: '127.0.0.1:8000', expected: 'http://127.0.0.1:8000' },
+    { value: '127.0.0.1:8000/', expected: 'http://127.0.0.1:8000' },
     { value: 'localhost:8000', expected: 'http://localhost:8000' },
     { value: 'localhost:8000/', expected: 'http://localhost:8000' },
     { value: 'http://localhost:3000', expected: 'http://localhost:3000' },
diff --git a/server/src/utils/url.ts b/server/src/utils/url.ts
index 81809fd..417cdc8 100644
--- a/server/src/utils/url.ts
+++ b/server/src/utils/url.ts
@@ -1,17 +1,17 @@
-import * as url from 'url-parse';
+import * as url from 'url';
 
 export function normalizeUrl(grafanaUrl: string) {
   if(!grafanaUrl) {
     return grafanaUrl;
   }
-  let urlObj = new url(grafanaUrl);
+  let urlObj = url.parse(grafanaUrl);
   if(urlObj.protocol !== 'http:' && urlObj.protocol !== 'https:') {
     grafanaUrl = `http://${grafanaUrl}`;
-    urlObj = new url(grafanaUrl);
+    urlObj = url.parse(grafanaUrl);
     console.log('No protocol provided in GRAFANA_URL -> inserting "http://"');
   }
   if(urlObj.slashes === false) {
-    urlObj = new url(`${urlObj.protocol}//${urlObj.pathname}`);
+    urlObj = url.parse(`${urlObj.protocol}//${urlObj.pathname}`);
     console.log('No slashes were provided after the protocol -> inserting slashes');
   } 
   if(urlObj.pathname.slice(-1) === '/') {
@@ -19,7 +19,7 @@ export function normalizeUrl(grafanaUrl: string) {
     console.log('Removing the slash at the end of GRAFANA_URL');
   }
   let finalUrl = `${urlObj.protocol}//${urlObj.hostname}`;
-  if(urlObj.port !== '') {
+  if(urlObj.port !== null) {
     finalUrl = finalUrl + ':' + urlObj.port;
   }
   if(urlObj.pathname !== '') {