Piteball
/
skolplattformen-backup
mirror of https://github.com/kolplattformen/skolplattformen.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bugfix events - needs proper user agent

This commit is contained in:
Christian Landgren 2020-12-15 00:34:18 +01:00
parent 52e0ff5846
commit 2a064ca709
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/api/lib/backend.js
View File

@ -6,10 +6,11 @@ const h2m = require('h2m')
const {htmlDecode} = require('js-htmlencode')
const urls = require('./urls')
const download = (url, cookie) => fetch(url, {headers: {cookie}})
const download = (url, cookie) => fetch(url, {headers: {cookie, 'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.87 Safari/537.36'}})
const fetchJson = (url, cookie) => {
return fetch(url, {headers: {cookie}})
.then(res => console.log('fetching', res.url) || res)
.then(res => res.ok ? res : Promise.reject(res.statusText))
.then(res => res.json())
// convert to camelCase
@ -39,7 +40,7 @@ const getNews = (childId, cookie) => fetchJson(urls.news(childId), cookie)
.catch(err => ({err}))
const getCalendar = (childId, cookie) => fetchJson(urls.calendar(childId), cookie)
.then(({title, id, description, location, longEventDateTime: startDate, longEndDateTime: endDate, allDayEvent: allDay}) => ({title, id, description, location, startDate, endDate, allDay}))
.then(calendar => calendar.map(({title, id, description, location, longEventDateTime: startDate, longEndDateTime: endDate, allDayEvent: allDay}) => ({title, id, description, location, startDate, endDate, allDay})))
.catch(err => ({err}))
const getNotifications = (childId, cookie) => fetchJson(urls.notifications(childId), cookie)
@ -47,17 +48,19 @@ const getNotifications = (childId, cookie) => fetchJson(urls.notifications(child
.catch(err => console.error(err) || {err})
const getMenu = (childId, cookie) => fetchJson(urls.menu(childId), cookie).catch(err => ({err}))
const getSchedule = (childId, cookie) => fetchJson(urls.schedule(childId, moment().startOf('day').toISOString(), moment().endOf('day').toISOString()), cookie).catch(err => ({err}))
const getSchedule = (childId, cookie) => fetchJson(urls.schedule(childId, moment().format('YYYY-MM-DD'), moment().add(7, 'days').format('YYYY-MM-DD')), cookie)
.then(schedule => schedule.map(({title, id, description, location, longEventDateTime: startDate, longEndDateTime: endDate, allDayEvent: allDay, mentor}) => ({title, id, description, location, startDate, endDate, allDay, mentor})))
.catch(err => ({err}))
const getChildById = async (childId, cookie) => {
const children = await getChildren()
const child = children.find(c => c.id == childId)
const [news, calendar, notifications, menu, schedule] = await Promise.all([
getNews(childId, cookie),
getCalendar(childId, cookie),
getNotifications(child.sdsId, cookie),
getMenu(child.id, cookie),
getSchedule(child.sdsId, cookie)])
const [news, calendar, notifications, menu, schedule] = [
await getNews(childId, cookie),
await getCalendar(childId, cookie),
await getNotifications(child.sdsId, cookie),
await getMenu(child.id, cookie),
await getSchedule(child.id, cookie)]
return {child, news, calendar, notifications, menu, schedule}
}

2
packages/api/lib/urls.js
View File

@ -10,7 +10,7 @@ const urls = {
news: childId => `${baseUrl}/vardnadshavare/inloggad2/News/GetNewsOverview?childId=${childId}`,
image: url => `${baseUrl}/vardnadshavare/inloggad2/NewsBanner?url=${url}`,
notifications: childId => `${baseUrl}/vardnadshavare/inloggad2/Overview/GetNotification?childId=${childId}`,
menu: childId => `${baseUrl}/vardnadshavare/inloggad2/Matsedel/GetMatsedelChoice?childId=${childId}`,
menu: childId => `${baseUrl}/vardnadshavare/inloggad2/Matsedel/GetMatsedelRSS?childId=${childId}`,
schedule: (childId, fromDate, endDate) => `${baseUrl}/vardnadshavare/inloggad2/Calender/GetSchema?childId=${childId}&startDate=${fromDate}&endDate=${endDate}`
}

6
packages/api/test.js
View File

@ -29,6 +29,12 @@ const test = async () => {
...child,
...await fetch(`http://localhost:9000/children/${child.id}`, {headers}).then(res => res.json())
})))
data.map(async child => ({
...child,
messages: await Promise.all(child.notifications.map((notification) => fetch(notification.url, {headers}).then(res => res.text())))
}))
console.log(JSON.stringify(data, null, 2))
}