Merge pull request #397 from CPatchane/fix_icon_props

Icon props usage with SSL and HOST
cozy · Dec 12, 2018 · b301358 · b301358
2 parents 97313cf + b10d9cd
commit b301358
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/src/lib/stack.js b/src/lib/stack.js
@@ -1,4 +1,3 @@
-/* global __TARGET__ */
 /* eslint-env browser */
 
 import realtime from 'cozy-realtime'
@@ -26,7 +25,9 @@ function fetchOptions() {
 }
 
 let COZY_URL
+let COZY_HOST
 let COZY_TOKEN
+let USE_SSL
 
 const errorStatuses = {
   '401': UnauthorizedStackException,
@@ -117,8 +118,9 @@ function getApp(slug) {
 const cache = {}
 
 export const getAppIconProps = () => ({
-  domain: COZY_URL,
-  secure: window.location.protocol === 'https:'
+  // we mustn't give the protocol here
+  domain: COZY_HOST,
+  secure: USE_SSL
 })
 
 async function initializeRealtime({
@@ -177,16 +179,31 @@ async function initializeRealtime({
   }
 }
 
+const determineURL = (cozyURL, ssl) => {
+  let url = cozyURL
+  let host = cozyURL
+  const protocol = ssl ? 'https' : 'http'
+  try {
+    host = new URL(cozyURL).host
+    if (host) url = `${protocol}://${host}`
+  } catch (e) {
+    host = cozyURL
+    url = cozyURL
+  }
+  return { COZY_URL: url, COZY_HOST: host }
+}
+
 module.exports = {
   async init({ cozyURL, token, onCreateApp, onDeleteApp, ssl }) {
-    COZY_URL = `${__TARGET__ === 'mobile' ? '' : '//'}${cozyURL}`
+    ;({ COZY_URL, COZY_HOST } = determineURL(cozyURL, ssl))
     COZY_TOKEN = token
+    USE_SSL = ssl
     await initializeRealtime({
       onCreateApp,
       onDeleteApp,
       token: COZY_TOKEN,
       url: COZY_URL,
-      ssl
+      ssl: USE_SSL
     })
   },
   updateAccessToken(token) {

diff --git a/test/components/__snapshots__/AppItem.spec.jsx.snap b/test/components/__snapshots__/AppItem.spec.jsx.snap
@@ -39,7 +39,6 @@ ShallowWrapper {
             }
           }
           className="coz-nav-apps-item-icon"
-          secure={false}
         />
         <p
           className="coz-label"
@@ -64,7 +63,6 @@ ShallowWrapper {
               }
             }
             className="coz-nav-apps-item-icon"
-            secure={false}
           />,
           <p
             className="coz-label"
@@ -91,7 +89,7 @@ ShallowWrapper {
             },
             "className": "coz-nav-apps-item-icon",
             "domain": undefined,
-            "secure": false,
+            "secure": undefined,
           },
           "ref": null,
           "rendered": null,
@@ -134,7 +132,6 @@ ShallowWrapper {
               }
             }
             className="coz-nav-apps-item-icon"
-            secure={false}
           />
           <p
             className="coz-label"
@@ -159,7 +156,6 @@ ShallowWrapper {
                 }
               }
               className="coz-nav-apps-item-icon"
-              secure={false}
             />,
             <p
               className="coz-label"
@@ -186,7 +182,7 @@ ShallowWrapper {
               },
               "className": "coz-nav-apps-item-icon",
               "domain": undefined,
-              "secure": false,
+              "secure": undefined,
             },
             "ref": null,
             "rendered": null,