diff --git a/libs/api-skolplattformen/lib/api.ts b/libs/api-skolplattformen/lib/api.ts index 9487ef504..170b41bf2 100644 --- a/libs/api-skolplattformen/lib/api.ts +++ b/libs/api-skolplattformen/lib/api.ts @@ -44,12 +44,12 @@ const s24Init = { headers: { accept: 'application/json, text/javascript, */*; q=0.01', referer: - 'https://stockholm.skola24.se/ng/timetable/timetable-viewer/fns.stockholm.se/', + 'https://websthlm.skola24.se/ng/timetable/timetable-viewer/fns.stockholm.se/', 'accept-language': 'en-US,en;q=0.9,sv;q=0.8', 'cache-control': 'no-cache', 'content-type': 'application/json', pragma: 'no-cache', - host: 'stockholm.skola24.se', + host: 'websthlm.skola24.se', 'x-scope': '8a22163c-8662-4535-9050-bc5e1923df48', }, } @@ -586,7 +586,6 @@ export class ApiSkolplattformen extends EventEmitter implements Api { getPersonalTimetablesResponse: { childrenTimetables }, }, } = await response.json() - return childrenTimetables as Skola24Child[] } @@ -633,6 +632,7 @@ export class ApiSkolplattformen extends EventEmitter implements Api { week, width: 1227, year, + schoolYear: 'b976f986-4308-4583-b39e-2d3933094eb2', } const session = this.getRequestInit({ ...s24Init, diff --git a/libs/api-skolplattformen/lib/routes.ts b/libs/api-skolplattformen/lib/routes.ts index 107f4ce56..6f214a7d8 100644 --- a/libs/api-skolplattformen/lib/routes.ts +++ b/libs/api-skolplattformen/lib/routes.ts @@ -1,15 +1,15 @@ // BankId export const login = (personalNumber?: string) => { const baseUrl = - 'https://login003.stockholm.se/NECSadcmbid/authenticate/NECSadcmbid?TYPE=33554433&REALMOID=06-42f40edd-0c5b-4dbc-b714-1be1e907f2de&GUID=1&SMAUTHREASON=0&METHOD=GET&SMAGENTNAME=IfNE0iMOtzq2TcxFADHylR6rkmFtwzoxRKh5nRMO9NBqIxHrc38jFyt56FASdxk1&TARGET=-SM-HTTPS%3a%2f%2flogin001%2estockholm%2ese%2fNECSadc%2fmbid%2fb64startpage%2ejsp%3fstartpage%3daHR0cHM6Ly9ldGphbnN0ZXIuc3RvY2tob2xtLnNlL3ZhcmRuYWRzaGF2YXJlL2lubG9nZ2FkMi9oZW0%3d' + 'https://login003.stockholm.se/NECSadcmbid/authenticate/NECSadcmbid?TYPE=33554433&REALMOID=06-42f40edd-0c5b-4dbc-b714-1be1e907f2de&GUID=1&SMAUTHREASON=0&METHOD=GET&SMAGENTNAME=IfNE0iMOtzq2TcxFADHylR6rkmFtwzoxRKh5nRMO9NBqIxHrc38jFyt56FASdxk1&TARGET=-SM-HTTPS%3a%2f%2flogin001%2estockholm%2ese%2fNECSadc%2fmbid%2fb64startpage%2ejsp%3fstartpage%3daHR0cHM6Ly9ldGphbnN0ZXIuc3RvY2tob2xtLnNlL3ZhcmRuYWRzaGF2YXJlL2lubG9nZ2FkMi9oZW0%3d' const optionalPersonalNumber = personalNumber === undefined ? '' : `&personalNumber=${personalNumber}` return `${baseUrl}&initialize=bankid${optionalPersonalNumber}&_=${Date.now()}` } - export const loginStatus = (order: string) => +export const loginStatus = (order: string) => `https://login003.stockholm.se/NECSadcmbid/authenticate/NECSadcmbid?TYPE=33554433&REALMOID=06-42f40edd-0c5b-4dbc-b714-1be1e907f2de&GUID=1&SMAUTHREASON=0&METHOD=GET&SMAGENTNAME=IfNE0iMOtzq2TcxFADHylR6rkmFtwzoxRKh5nRMO9NBqIxHrc38jFyt56FASdxk1&TARGET=-SM-HTTPS%3a%2f%2flogin001%2estockholm%2ese%2fNECSadc%2fmbid%2fb64startpage%2ejsp%3fstartpage%3daHR0cHM6Ly9ldGphbnN0ZXIuc3RvY2tob2xtLnNlL3ZhcmRuYWRzaGF2YXJlL2lubG9nZ2FkMi9oZW0%3d&verifyorder=${order}&_=${Date.now()}` - export const loginCookie = +export const loginCookie = 'https://login003.stockholm.se/NECSadcmbid/authenticate/SiteMinderAuthADC?TYPE=33554433&REALMOID=06-42f40edd-0c5b-4dbc-b714-1be1e907f2de&GUID=1&SMAUTHREASON=0&METHOD=GET&SMAGENTNAME=IfNE0iMOtzq2TcxFADHylR6rkmFtwzoxRKh5nRMO9NBqIxHrc38jFyt56FASdxk1&TARGET=-SM-HTTPS%3a%2f%2flogin001%2estockholm%2ese%2fNECSadc%2fmbid%2fb64startpage%2ejsp%3fstartpage%3daHR0cHM6Ly9ldGphbnN0ZXIuc3RvY2tob2xtLnNlL3ZhcmRuYWRzaGF2YXJlL2lubG9nZ2FkMi9oZW0%3d' // Freja @@ -94,10 +94,10 @@ export const samlResponseUrl = 'https://stockholm-sso.skola24.se/nssso/saml-2.0/response' export const timetables = - 'https://stockholm.skola24.se/ng/api/services/skola24/get/personal/timetables' + 'https://websthlm.skola24.se/api/services/skola24/get/personal/timetables' export const renderKey = - 'https://stockholm.skola24.se/ng/api/get/timetable/render/key' -export const timetable = 'https://stockholm.skola24.se/ng/api/render/timetable' + 'https://websthlm.skola24.se/api/get/timetable/render/key' +export const timetable = 'https://websthlm.skola24.se/api/render/timetable' export const topologyConfigUrl = 'https://fantomenkrypto.vercel.app/api/getConfig'