Merge pull request #2565 from withspectrum/linkification-god-dammit

Fix linkification

Author: brianlovin

shared/clients/draft-js/links-decorator/core.js

@@ -1,7 +1,6 @@
 // @flow
 import React from 'react';
-import findWithRegex from 'find-with-regex';
-import { URL } from 'shared/regexps';
+import linkStrategy from 'draft-js-linkify-plugin/lib/linkStrategy';
 import normalizeUrl from '../../../normalize-url';
 import type { ContentBlock } from 'draft-js/lib/ContentBlock';
 import type { ComponentType, Node } from 'react';
@@ -20,10 +19,7 @@ let i = 0;
 const createLinksDecorator = (
   Component: ComponentType<LinksDecoratorComponentProps>
 ) => ({
-  strategy: (
-    contentBlock: ContentBlock,
-    callback: (...args?: Array<any>) => any
-  ) => findWithRegex(URL, contentBlock, callback),
+  strategy: linkStrategy,
   component: ({ decoratedText, children }: DecoratorComponentProps) => (
     <Component
       href={normalizeUrl(decoratedText)}

shared/normalize-url.js

@@ -1,14 +1,14 @@
 // @flow
 
-const PROTOCOL = /(http(s?)):\/\//gi;
+const STARTS_WITH_PROTOCOL = /^https?:\/\//i;
 
-const addProtocolToString = (string: string) => {
-  // if the string starts with http or https, we are good
-  if (PROTOCOL.test(string)) {
-    return string;
+// Note(@mxstbr): This method assumes that a string passed into it is already verified to be an URL
+// it'll just append https:// to anything that doesn't look like an URL
+const addProtocolToString = (url: string) => {
+  if (STARTS_WITH_PROTOCOL.test(url)) {
+    return url;
   } else {
-    // otherwise it doesn't start with a protocol, prepend http
-    return `http://${string}`;
+    return `https://${url}`;
   }
 };
 

shared/test/normalize-url.test.js

@@ -0,0 +1,30 @@
+// @flow
+import normalizeUrl from '../normalize-url';
+
+type Input = string;
+type Output = string;
+
+// If only Input is provided it tests for input === output
+type TestCase = [Input, Output];
+
+type TestCases = {
+  [testName: string]: TestCase,
+};
+
+const testCases: TestCases = {
+  'should do nothing to https URLs': [
+    'https://github.com',
+    'https://github.com',
+  ],
+  'should do nothing to http URLs': ['http://github.com', 'http://github.com'],
+  'should add https:// in front of URLs without protocol': [
+    'github.com',
+    'https://github.com',
+  ],
+};
+
+Object.keys(testCases).forEach(name => {
+  it(name, () => {
+    expect(normalizeUrl(testCases[name][0])).toEqual(testCases[name][1]);
+  });
+});