kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 20:22:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2538 from codac/master

Browse Source
This commit is contained in:
Michael Teeuw 2021-04-15 16:16:51 +02:00 committed by GitHub
commit fd1913a72e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -32,6 +32,7 @@ _This release is scheduled to be released on 2021-04-01._
- Fix decimalSymbol in the forecast part of the new weather module #2530 - Fix decimalSymbol in the forecast part of the new weather module #2530
- Fix wrong treatment of `appendLocationNameToHeader` when using `ukmetofficedatahub` - Fix wrong treatment of `appendLocationNameToHeader` when using `ukmetofficedatahub`
- Fix alert not recognizing multiple alerts (#2522) - Fix alert not recognizing multiple alerts (#2522)
- Fix fetch option httpsAgent to agent in calendar module (#466)
## [2.15.0] - 2021-04-01 ## [2.15.0] - 2021-04-01

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

@ -52,13 +52,13 @@ const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEn
if (auth.method === "bearer") { if (auth.method === "bearer") {
headers.Authorization = "Bearer " + auth.pass; headers.Authorization = "Bearer " + auth.pass;
} else if (auth.method === "digest") { } else if (auth.method === "digest") {
fetcher = new digest(auth.user, auth.pass).fetch(url, { headers: headers, httpsAgent: httpsAgent }); fetcher = new digest(auth.user, auth.pass).fetch(url, { headers: headers, agent: httpsAgent });
} else { } else {
headers.Authorization = "Basic " + Buffer.from(auth.user + ":" + auth.pass).toString("base64"); headers.Authorization = "Basic " + Buffer.from(auth.user + ":" + auth.pass).toString("base64");
} }
} }
if (fetcher === null) { if (fetcher === null) {
fetcher = fetch(url, { headers: headers, httpsAgent: httpsAgent }); fetcher = fetch(url, { headers: headers, agent: httpsAgent });
} }
fetcher fetcher