Merge pull request #1169 from cptran777/remove-ui-https-redirect

cptran777 · web-flow · commit 75019c185267 · 2018-05-17T13:54:43.000-07:00
remove client side redirection to https
diff --git a/wherehows-web/app/router.js b/wherehows-web/app/router.js
@@ -3,7 +3,6 @@ import { get, getWithDefault } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { scheduleOnce } from '@ember/runloop';
 import config from 'wherehows-web/config/environment';
-import { redirectToHttps } from 'wherehows-web/utils/build-url';
 
 const AppRouter = Router.extend({
   location: config.locationType,
@@ -12,17 +11,6 @@ const AppRouter = Router.extend({
 
   metrics: service(),
 
-  willTransition() {
-    const {
-      APP: { useSecureRedirect }
-    } = config;
-    this._super(...arguments);
-
-    if (useSecureRedirect) {
-      redirectToHttps(window.location);
-    }
-  },
-
   didTransition() {
     this._super(...arguments);
 
diff --git a/wherehows-web/app/utils/build-url.ts b/wherehows-web/app/utils/build-url.ts
@@ -39,15 +39,3 @@ export default (baseUrl: string, queryParam: string, queryValue: string): string
 
   return `${baseUrl}${separator}${queryParam}=${queryValue}`;
 };
-
-/**
- * Sets the href on a location object if the protocol is not https
- * @param {Location} { protocol, href }
- */
-export const redirectToHttps = ({ protocol, href, hostname }: Location): void => {
-  const secureProtocol = 'https:';
-
-  if (protocol !== secureProtocol && hostname !== 'localhost') {
-    window.location.replace(`${secureProtocol}${href.substring(protocol.length)}`);
-  }
-};
