Extracts protocol redirection to helper

Author: andrewn

client/components/forceProtocol.jsx

@@ -1,6 +1,27 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
 import { format, parse } from 'url';
 
+const findCurrentProtocol = () => (
+  parse(window.location.href).protocol
+);
+
+const redirectToProtocol = (protocol, { appendSource, disable = false } = {}) => {
+  const currentProtocol = findCurrentProtocol();
+
+  if (protocol !== currentProtocol) {
+    if (disable === true) {
+      console.info(`forceProtocol: would have redirected from "${currentProtocol}" to "${protocol}"`);
+    } else {
+      const url = parse(window.location.href, true /* parse query string */);
+      url.protocol = protocol;
+      if (appendSource === true) {
+        url.query.source = currentProtocol;
+      }
+      window.location = format(url);
+    }
+  }
+};
+
 /**
  * A Higher Order Component that forces the protocol to change on mount
  *
@@ -14,29 +35,12 @@ const forceProtocol = ({ targetProtocol = 'https', sourceProtocol, disable = fal
     static propTypes = {}
 
     componentDidMount() {
-      this.redirectToProtocol(targetProtocol, { appendSource: true });
+      redirectToProtocol(targetProtocol, { appendSource: true, disable });
     }
 
     componentWillUnmount() {
       if (sourceProtocol != null) {
-        this.redirectToProtocol(sourceProtocol, { appendSource: false });
-      }
-    }
-
-    redirectToProtocol(protocol, { appendSource }) {
-      const currentProtocol = parse(window.location.href).protocol;
-
-      if (protocol !== currentProtocol) {
-        if (disable === true) {
-          console.info(`forceProtocol: would have redirected from "${currentProtocol}" to "${protocol}"`);
-        } else {
-          const url = parse(window.location.href, true /* parse query string */);
-          url.protocol = protocol;
-          if (appendSource === true) {
-            url.query.source = currentProtocol;
-          }
-          window.location = format(url);
-        }
+        redirectToProtocol(sourceProtocol, { appendSource: false, disable });
       }
     }
 
@@ -65,6 +69,8 @@ const findSourceProtocol = (state, location) => {
 
 export default forceProtocol;
 export {
+  findCurrentProtocol,
   findSourceProtocol,
+  redirectToProtocol,
   protocols,
 };