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

snapshot

Browse Source
This commit is contained in:
Karsten Hassel
2021-03-03 00:09:32 +01:00
parent f09c54184a
commit 1f9109f8e4
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/default/calendar/calendarfetcher.js
View File

@@ -44,9 +44,10 @@ const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEn
const fetchCalendar = function () { const fetchCalendar = function () {
clearTimeout(reloadTimer); clearTimeout(reloadTimer);
reloadTimer = null; reloadTimer = null;
httpsAgent = null; let httpsAgent = null;
user = ""; let user = "";
password = ""; let password = "";
let opts = {};
const nodeVersion = Number(process.version.match(/^v(\d+\.\d+)/)[1]); const nodeVersion = Number(process.version.match(/^v(\d+\.\d+)/)[1]);
const headers = { const headers = {
@@ -59,7 +60,7 @@ const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEn
}); });
} }
// todo: auth, // todo: bearer
// https://github.com/devfans/digest-fetch // https://github.com/devfans/digest-fetch
// https://github.com/pablopunk/auth-fetch/blob/master/index.js // https://github.com/pablopunk/auth-fetch/blob/master/index.js
// https://hackersandslackers.com/making-api-requests-with-nodejs/ // https://hackersandslackers.com/making-api-requests-with-nodejs/
@@ -71,11 +72,13 @@ const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEn
} else { } else {
user = auth.user; user = auth.user;
password = auth.pass; password = auth.pass;
if (auth.method === "basic") {
opts = { basic: true };
};
} }
} }
const client = new fetch(user, password); new fetch(user, password, opts)
client
.fetch(url, { headers: headers, httpsAgent: httpsAgent }) .fetch(url, { headers: headers, httpsAgent: httpsAgent })
.catch((error) => { .catch((error) => {
fetchFailedCallback(self, error); fetchFailedCallback(self, error);