From aa8bb6d8e80328b7d3278e81b2d4c105e433f64a Mon Sep 17 00:00:00 2001
From: Ergys Dona <ergys.dona@cern.ch>
Date: Mon, 3 Sep 2018 15:20:40 +0200
Subject: [PATCH] URSH: Refactor index.js URSH: URSH: * Submit on Enter URSH: *
 Differentiate invalid URL from invalid host

---
 ursh/indico_ursh/client/index.js | 86 +++++++++++++++++++-------------
 1 file changed, 52 insertions(+), 34 deletions(-)

diff --git a/ursh/indico_ursh/client/index.js b/ursh/indico_ursh/client/index.js
index ffc9d18..495c1ba 100644
--- a/ursh/indico_ursh/client/index.js
+++ b/ursh/indico_ursh/client/index.js
@@ -34,23 +34,34 @@ async function _makeUrshRequest(originalURL) {
     return response.data.url;
 }
 
-function _patchURL(url) {
-    if (url.startsWith(window.location.hostname)) {
-        return `${window.location.protocol}//${url}`;
-    } else {
-        return url;
+function _validateAndFormatURL(url) {
+    const $t = $T.domain('ursh');
+    if (!url) {
+        throw $t.gettext('Please fill in a URL to shorten');
     }
-}
 
-function _validateURL(url) {
-    const re = RegExp(`^(${window.location.protocol}//)?${window.location.hostname}/`);
-    return re.test(url);
+    // if protocol is missing, prepend it
+    if (url.startsWith(window.location.hostname)) {
+        url = `${window.location.protocol}//${url}`;
+    }
+
+    let parsedURL;
+    try {
+        parsedURL = new URL(url);
+    } catch (err) {
+        throw $t.gettext('This does not look like a valid URL');
+    }
+
+    parsedURL.protocol = window.location.protocol;  // patch protocol to match server
+    if (parsedURL.host !== window.location.host) {
+        throw $t.gettext('Invalid host: only Indico URLs are allowed');
+    }
+    return parsedURL.href;
 }
 
 function _getUrshInput() {
-    const $t = $T.domain('ursh');
     const input = $('#ursh-shorten-input');
-    const originalURL = input.val().trim();
+    const inputURL = input.val().trim();
 
     const tip = ((msg) => {
         input.qtip({
@@ -69,36 +80,43 @@ function _getUrshInput() {
         });
     });
 
-    if (!originalURL) {
-        tip($t.gettext('Please fill in a URL to shorten'));
-        input.focus();
+    try {
+        const formattedURL = _validateAndFormatURL(inputURL);
+        input.val(formattedURL);
+        return formattedURL;
+    } catch (err) {
+        tip(err);
+        input.focus().select();
         return null;
-    } else if (!_validateURL(originalURL)) {
-        tip($t.gettext('This does not look like a valid URL'));
-        input.focus();
-        return null;
-    } else {
-        const patchedURL = _patchURL(originalURL);
-        input.val(patchedURL);
-        return patchedURL;
     }
 }
 
-$(document)
-    .on('click', '#ursh-shorten-button', async (evt) => {
-        evt.preventDefault();
-        const originalURL = _getUrshInput();
-        if (originalURL) {
-            const result = await _makeUrshRequest(originalURL);
+async function _handleUrshPageInput(evt) {
+    evt.preventDefault();
+    const originalURL = _getUrshInput();
+    if (originalURL) {
+        const result = await _makeUrshRequest(originalURL);
+        if (result) {
             const outputElement = $('#ursh-shorten-output');
             $('#ursh-shorten-response-form').slideDown();
             outputElement.val(result);
             outputElement.select();
         }
+    }
+}
+
+async function _handleUrshClick(evt) {
+    evt.preventDefault();
+    const originalURL = $(evt.target).attr('data-original-url');
+    const result = await _makeUrshRequest(originalURL);
+    $(evt.target).copyURLTooltip(result);
+}
+
+$(document)
+    .on('click', '#ursh-shorten-button', _handleUrshPageInput)
+    .on('keydown', '#ursh-shorten-input', (evt) => {
+        if (evt.key === 'Enter') {
+            _handleUrshPageInput(evt);
+        }
     })
-    .on('click', '.ursh-get', async (evt) => {
-        evt.preventDefault();
-        const originalURL = $(evt.target).attr('data-original-url');
-        const result = await _makeUrshRequest(originalURL);
-        $(evt.target).copyURLTooltip(result).show();
-    });
+    .on('click', '.ursh-get', _handleUrshClick);