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}`