kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-21 04:45:17 +00:00
Code Issues Projects Releases Wiki Activity

introduce useCorsProxy, per default only enabled for darksky and envcanada

Browse Source
This commit is contained in:
Karsten Hassel
2022-01-26 19:23:08 +01:00
parent 9f9c17ea8a
commit f04dd6b6cd
9 changed files with 22 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/default/weather/weatherprovider.js
View File

@@ -112,20 +112,16 @@ const WeatherProvider = Class.extend({
},
getCorsUrl: function () {
if (this.config.mockData) {
if (this.config.mockData || typeof this.config.useCorsProxy === "undefined" || !this.config.useCorsProxy) {
return "";
} else {
const url = window.config.address + ":" + window.config.port + "/cors?url=";
if (window.config.useHttps) {
return "https://" + url;
} else {
return "http://" + url;
}
return location.protocol + "//" + location.host + "/cors?url=";
}
},
// A convenience function to make requests. It returns a promise.
fetchData: function (url, method = "GET", data = null) {
fetchData: function (url, method = "GET", type = "json") {
url = this.getCorsUrl() + url;
const getData = function (mockData) {
return new Promise(function (resolve, reject) {
if (mockData) {
@@ -138,7 +134,11 @@ const WeatherProvider = Class.extend({
request.onreadystatechange = function () {
if (this.readyState === 4) {
if (this.status === 200) {
resolve(JSON.parse(this.response));
if (type === "xml") {
resolve(this.responseXML);
} else {
resolve(JSON.parse(this.response));
}
} else {
reject(request);
}