Remove hassCallApi from window

This commit is contained in:
Paulus Schoutsen 2018-05-18 15:01:33 -04:00
parent 81fbda49bd
commit 960bdc0c9b
2 changed files with 4 additions and 3 deletions

View File

@ -26,6 +26,7 @@ import '../util/hass-call-api.js';
import '../util/hass-translation.js'; import '../util/hass-translation.js';
import '../util/legacy-support'; import '../util/legacy-support';
import '../util/roboto.js'; import '../util/roboto.js';
import hassCallApi from '../util/hass-call-api.js';
// For mdi icons. // For mdi icons.
import '../components/ha-iconset-svg.js'; import '../components/ha-iconset-svg.js';
@ -201,13 +202,13 @@ class HomeAssistant extends PolymerElement {
callApi: (method, path, parameters) => { callApi: (method, path, parameters) => {
const host = window.location.protocol + '//' + window.location.host; const host = window.location.protocol + '//' + window.location.host;
const auth = conn.options; const auth = conn.options;
return window.hassCallApi(host, auth, method, path, parameters).catch((err) => { return hassCallApi(host, auth, method, path, parameters).catch((err) => {
if (err.status_code !== 401 || !auth.accessToken) throw err; if (err.status_code !== 401 || !auth.accessToken) throw err;
// If we connect with access token and get 401, refresh token and try again // If we connect with access token and get 401, refresh token and try again
return window.refreshToken().then((accessToken) => { return window.refreshToken().then((accessToken) => {
conn.options.accessToken = accessToken; conn.options.accessToken = accessToken;
return window.hassCallApi(host, auth, method, path, parameters); return hassCallApi(host, auth, method, path, parameters);
}); });
}); });
}, },

View File

@ -1,4 +1,4 @@
window.hassCallApi = function (host, auth, method, path, parameters) { export default function hassCallApi (host, auth, method, path, parameters) {
var url = host + '/api/' + path; var url = host + '/api/' + path;
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {