Adapter for larandegruppen/admentum

.gitignore

@@ -110,3 +110,4 @@ xcshareddata
 xcuserdata
 /.vs
 *.hprof
+.aider*

apps/api-test-app/src/main.js

@@ -14,54 +14,69 @@ const path = require('path')
 const fs = require('fs')
 const HttpProxyAgent = require('https-proxy-agent')
 const agentWrapper = require('./app/agentFetchWrapper')
-const initSkolplattformen = require('@skolplattformen/api-skolplattformen').default
-const initHjarntorget = require('@skolplattformen/api-hjarntorget').default
+const initSkolplattformen =
+  require('@skolplattformen/api-skolplattformen').default
+const initAdmentum = require('@skolplattformen/api-admentum').default
 
 const [, , personalNumber, platform] = process.argv
-const isHjarntorget = platform && platform.startsWith('hj')
-const init = isHjarntorget ? initHjarntorget : initSkolplattformen;
+const isAdmentum = platform && platform.startsWith('ad')
+const init = isAdmentum ? initAdmentum : initSkolplattformen
 
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
 const cookieJar = new CookieJar()
-let bankIdUsed = false
+let bankIdUsed = true
 const recordFolder = `${__dirname}/record`
 
-async function run() {
-  const agent = new HttpProxyAgent('http://localhost:8080')
-  const agentEnabledFetch = agentWrapper(nodeFetch, agent)
+const now = DateTime.local()
+const [year, week] = now.toISOWeekDate().split('-')
+const isoWeek = week.replace('W','')
 
-  const fetch = fetchCookie(agentEnabledFetch, cookieJar)
+async function run() {
+  const fetch = fetchCookie(nodeFetch, cookieJar)
 
   try {
     const api = init(fetch, cookieJar, { record })
 
     api.on('login', async () => {
       console.log('Logged in')
 
-      if (bankIdUsed) {
-        const sessionCookie = getSessionCookieFromCookieJar()
-        ensureDirectoryExistence(recordFolder)
-        await writeFile(
-          `${recordFolder}/latestSessionCookie.txt`,
-          JSON.stringify(sessionCookie)
-        )
-        console.log(
-          `Session cookie saved to file ${recordFolder}/latesSessionCookie.txt`
-        )
-      }
-      console.log('user') //-
+      const cookies = cookieJar.toJSON()
+
+      console.log('cookies', cookies)
       const user = await api.getUser()
       console.log(user)
 
       console.log('children')
       const children = await api.getChildren()
       console.log(children)
-      /*
+
+
+      try {
+        console.log('timetable')
+        const timetable = await api.getTimetable(
+          children[0],
+          isoWeek,
+          year,
+          'sv'
+        )
+        console.log(inspect(timetable, false, 1000, true))
+      } catch (error) {
+        console.error(error)
+      }
+
+      console.log('menu')
+      const menu = await api.getMenu(children[0])
+      console.log(menu)
+
+
       console.log('calendar')
       const calendar = await api.getCalendar(children[0])
       console.log(calendar)
-
-      console.log('classmates')
+
+      console.log('news')
+      const news = await api.getNews(children[0])
+/*
+      /*console.log('classmates')
       const classmates = await api.getClassmates(children[0])
       console.log(classmates)
 
@@ -85,23 +100,6 @@ async function run() {
         console.error(error)
       }
 
-      try {
-        console.log('timetable')
-        const timetable = await api.getTimetable(
-          skola24children[0],
-          15,
-          2021,
-          'sv'
-        )
-        console.log(inspect(timetable, false, 1000, true))
-      } catch (error) {
-        console.error(error)
-      }
-
-      /*
-      console.log('news')
-      const news = await api.getNews(children[0])
-*/
       /* console.log('news details')
       const newsItems = await Promise.all(
         news.map((newsItem) =>
@@ -111,9 +109,7 @@ async function run() {
       )
       console.log(newsItems) */
 
-      /* console.log('menu')
-      const menu = await api.getMenu(children[0])
-      console.log(menu) */
+
 
       // console.log('notifications')
       // const notifications = await api.getNotifications(children[0])
@@ -141,8 +137,10 @@ async function Login(api) {
     console.log('Attempt to use saved session cookie to login')
     const rawContent = await readFile(`${recordFolder}/latestSessionCookie.txt`)
     const sessionCookies = JSON.parse(rawContent)
-    await api.setSessionCookie(`${sessionCookies[0].key}=${sessionCookies[0].value}`)
-
+    await api.setSessionCookie(
+      `${sessionCookies[0].key}=${sessionCookies[0].value}`
+    )
+
     useBankId = false
     console.log('Login with old cookie succeeded')
   } catch (error) {
@@ -180,18 +178,20 @@ function ensureDirectoryExistence(filePath) {
   fs.mkdirSync(dirname)
 }
 
-
 function getSessionCookieFromCookieJar() {
-  const cookieUrl = isHjarntorget ? 'https://hjarntorget.goteborg.se' : 'https://etjanst.stockholm.se'
+  const cookieUrl = isAdmentum
+    ? 'https://admentum.se'
+    : 'https://etjanst.stockholm.se'
   const cookies = cookieJar.getCookiesSync(cookieUrl)
-  const sessionCookieKey =  isHjarntorget  ? 'JSESSIONID' : 'SMSESSION'
-  return cookies.find(c => c.key === sessionCookieKey)
+  const sessionCookieKey = isAdmentum ? 'JSESSIONID' : 'SMSESSION'
+  return cookies.find((c) => c.key === sessionCookieKey)
 }
 
 const record = async (info, data) => {
   const name = info.error ? `${info.name}_error` : info.name
   const filename = `${recordFolder}/${name}.json`
   ensureDirectoryExistence(filename)
+  console.log('recording session', filename)
   const content = {
     url: info.url,
     headers: info.headers,

apps/skolplattformen-app/data/schoolPlatforms.ts

@@ -2,6 +2,9 @@ import CookieManager from '@react-native-cookies/cookies'
 import initHjarntorget, {
   features as featuresHjarntorget,
 } from '@skolplattformen/api-hjarntorget'
+import initAdmentum, {
+  features as featuresAdmentum,
+} from '@skolplattformen/api-admentum'
 import initSkolplattformen, {
   features as featuresSkolPlattformen,
 } from '@skolplattformen/api-skolplattformen'
@@ -19,4 +22,10 @@ export const schoolPlatforms = [
     api: initHjarntorget(fetch as any, CookieManager),
     features: featuresHjarntorget,
   },
+  {
+    id: 'larandegruppen-admentum',
+    displayName: 'Lärandegruppen (Admentum)',
+    api: initAdmentum(fetch as any, CookieManager),
+    features: featuresAdmentum,
+  },
 ]

apps/skolplattformen-app/ios/Podfile.lock

@@ -646,4 +646,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: f4a92b32cc4938e15ad7ccfefe9898548670abed
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.12.1

apps/skolplattformen-app/ios/app.xcodeproj/project.pbxproj

@@ -980,7 +980,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1042,7 +1042,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

apps/skolplattformen-app/project.json

@@ -85,6 +85,7 @@
   "implicitDependencies": [
     "api-skolplattformen",
     "api-hjarntorget",
+    "api-admentum",
     "api",
     "hooks",
     "curriculum"

libs/api-admentum/.babelrc.js

@@ -0,0 +1,6 @@
+module.exports = {
+  presets: [
+    ['@babel/preset-env', {targets: {node: 'current'}}],
+    '@babel/preset-typescript',
+  ],
+}

libs/api-admentum/.eslintrc

@@ -0,0 +1,22 @@
+{
+    "extends": ["plugin:@nrwl/nx/react", "../../.eslintrc.json"],
+    "ignorePatterns": ["!**/*", "public", ".cache", "node_modules"],
+    "overrides": [
+      {
+        "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+        "rules": {}
+      },
+      {
+        "files": ["*.ts", "*.tsx"],
+        "rules": {
+          "@typescript-eslint/ban-ts-comment": "off"
+        }
+      },
+      {
+        "files": ["*.js", "*.jsx"],
+        "rules": {
+          "@typescript-eslint/no-var-requires": "off"
+        }
+      }
+    ]
+  }

libs/api-admentum/.prettierrc

@@ -0,0 +1,10 @@
+{
+  "printWidth": 80,
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": false,
+  "singleQuote": true,
+  "trailingComma": "es5",
+  "bracketSpacing": true,
+  "jsxBracketSameLine": false
+}