feat: added transform to handle urls without proto

closes TryGhost#812

Update url handling behaviour:
- When entering a URL, add a protocol if one is missing
- Follow the rules laid out in TryGhost#812, so that we use https by default where possible
- Also handle domains entered with // at the start
Swap to using url util
- moved all old usages of validate-instance-url

Author: ErisDS

lib/commands/config/advanced.js

@@ -3,7 +3,7 @@
 const portfinder = require('portfinder');
 const toString = require('lodash/toString');
 const validator = require('validator');
-const validateInstanceURL = require('../../utils/validate-instance-url');
+const urlUtils = require('../../utils/url');
 const url = require('url');
 
 const BASE_PORT = 2368;
@@ -22,8 +22,8 @@ const knownMailServices = [
 module.exports = {
     url: {
         description: 'Blog URL with protocol E.g. http://loveghost.com',
-        validate: validateInstanceURL,
-        transform: value => value.toLowerCase(),
+        validate: urlUtils.validate,
+        transform: urlUtils.ensureProtocol,
         type: 'string',
         group: 'Ghost Options:'
     },
@@ -32,7 +32,7 @@ module.exports = {
         configPath: 'admin.url',
         validate: value => validator.isURL(value, {require_protocol: true}) ||
             'Invalid URL. Your URL should include a protocol, E.g. http://my-ghost-blog.com',
-        transform: value => value.toLowerCase(),
+        transform: urlUtils.ensureProtocol,
         type: 'string',
         group: 'Ghost Options:'
     },

lib/commands/config/index.js

@@ -91,7 +91,7 @@ class ConfigCommand extends Command {
     }
 
     getConfigPrompts(argv) {
-        const validateInstanceURL = require('../../utils/validate-instance-url');
+        const urlUtils = require('../../utils/url');
         const path = require('path');
 
         const prompts = [];
@@ -103,7 +103,8 @@ class ConfigCommand extends Command {
                 name: 'url',
                 message: 'Enter your blog URL:',
                 default: argv.auto ? null : this.instance.config.get('url', 'http://localhost:2368'),
-                validate: validateInstanceURL
+                validate: urlUtils.validate,
+                filter: urlUtils.ensureProtocol
             });
         }
 

lib/utils/validate-instance-url.js

@@ -128,6 +128,19 @@ describe('Unit: Command > Config', function () {
             });
         });
 
+        it('transforms domain without protocol', function () {
+            const ConfigCommand = require(modulePath);
+            const instanceConfig = new Config('config.json');
+            const saveStub = sinon.stub(instanceConfig, 'save');
+            const getInstanceStub = sinon.stub().returns({config: instanceConfig});
+            const config = new ConfigCommand({}, {getInstance: getInstanceStub});
+
+            return config.handleAdvancedOptions({url: 'myWebsite.com'}).then(() => {
+                expect(instanceConfig.get('url')).to.equal('https://mywebsite.com');
+                expect(saveStub.calledOnce).to.be.true;
+            });
+        });
+
         it('throws config error if validate function is defined and doesn\'t return true', function () {
             const ConfigCommand = proxyquire(modulePath, {'./advanced': {
                 url: {
@@ -183,7 +196,7 @@ describe('Unit: Command > Config', function () {
         });
 
         it('returns url prompt with validator if url is not provided and db is sqlite3', function () {
-            const expectedValidator = require('../../../lib/utils/validate-instance-url');
+            const expectedValidator = require('../../../lib/utils/url').validate;
             const argv = {db: 'sqlite3'};
             const result = config.getConfigPrompts(argv);
 
@@ -194,7 +207,7 @@ describe('Unit: Command > Config', function () {
         });
 
         it('returns url prompt with correct defaults', function () {
-            const expectedValidator = require('../../../lib/utils/validate-instance-url');
+            const expectedValidator = require('../../../lib/utils/url').validate;
             const argv = {db: 'sqlite3', auto: true};
             const result = config.getConfigPrompts(argv);
 
@@ -478,7 +491,7 @@ describe('Unit: Command > Config', function () {
     describe('advanced options', function () {
         it('url', function () {
             const advancedOptions = require(advancedModulePath);
-            const expectedValidator = require('../../../lib/utils/validate-instance-url');
+            const expectedValidator = require('../../../lib/utils/url').validate;
             expect(advancedOptions.url).to.exist;
 
             // Check validate function