From 520e5c77638d0997165f4a044bb8414e488c398e Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Tue, 4 Jul 2017 16:43:31 +0100 Subject: [PATCH] Make SSL variable local since we only need it on api.js Former-commit-id: 8005ade6f3e0fe8bf4fcbe203ba791c3f8d21c6c [formerly cc41379f62eb83be78b1594babf83ac3056059c6] [formerly c89bc32b1092ded27b4172cbfa33f79ffe25413f [formerly cdcaa9102b91fe7388f73b055269a7aafa0f93e6]] Former-commit-id: 355f7675be000235114bbdb0d1c56e98937f0e05 [formerly 125dc4631d149cd5ab1c345e9c2130fba0dae141] Former-commit-id: 7d3d9748908f5884e61899d78155e4cde9ca9fcf --- _assets/src/store/store.js | 1 - _assets/src/utils/api.js | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/_assets/src/store/store.js b/_assets/src/store/store.js index 6e7268bc..f42e254c 100644 --- a/_assets/src/store/store.js +++ b/_assets/src/store/store.js @@ -9,7 +9,6 @@ const state = { user: {}, req: {}, baseURL: document.querySelector('meta[name="base"]').getAttribute('content'), - ssl: (window.location.protocol === 'https:'), jwt: '', reload: false, selected: [], diff --git a/_assets/src/utils/api.js b/_assets/src/utils/api.js index deec2751..735358d2 100644 --- a/_assets/src/utils/api.js +++ b/_assets/src/utils/api.js @@ -1,5 +1,7 @@ import store from '../store/store' +const ssl = (window.location.protocol === 'https:') + function removePrefix (url) { if (url.startsWith('/files')) { return url.slice(6) @@ -120,7 +122,7 @@ function checksum (url, algo) { } function command (url, command, onmessage, onclose) { - let protocol = (store.state.ssl ? 'wss:' : 'ws:') + let protocol = (ssl ? 'wss:' : 'ws:') url = removePrefix(url) url = `${protocol}//${window.location.hostname}${store.state.baseURL}/api/command${url}?token=${store.state.jwt}` @@ -131,7 +133,7 @@ function command (url, command, onmessage, onclose) { } function search (url, search, onmessage, onclose) { - let protocol = (store.state.ssl ? 'wss:' : 'ws:') + let protocol = (ssl ? 'wss:' : 'ws:') url = removePrefix(url) url = `${protocol}//${window.location.hostname}${store.state.baseURL}/api/search${url}?token=${store.state.jwt}`