feat: update to node 22

refactor: remove deprecated @ionic-native/core (replaced by
@awesome-cordova-plugins/core)

.gitlab-ci.yml

@@ -30,13 +30,11 @@ variables:
     description: Bypass turbo cache
 
 default:
-  image: registry.gitlab.com/openstapps/openstapps/node-builder
+  image: registry.gitlab.com/openstapps/openstapps/node-builder:node-22
   tags:
     - saas-linux-xlarge-amd64
   interruptible: true
   before_script:
-    - corepack enable
-    - corepack prepare pnpm@latest-8 --activate
     - echo TURBO_API=$TURBO_API >> .env.local
     - echo TURBO_TOKEN=$TURBO_TOKEN >> .env.local
     - echo TURBO_TEAM=$TURBO_TEAM >> .env.local
@@ -101,7 +99,7 @@ stop review:
   rules: *deploy-rules
 
 unit:
-  image: registry.gitlab.com/openstapps/openstapps/app-builder
+  image: registry.gitlab.com/openstapps/openstapps/app-builder:node-22
   stage: test
   needs: ['build']
   script:

.syncpackrc.cjs

@@ -27,6 +27,7 @@ const config = {
     'bin',
     'files',
     'engines',
+    'packageManager',
     'scripts',
     'dependencies',
     'devDependencies',

.tool-versions

@@ -1,3 +1,3 @@
-nodejs 18.19.1
-pnpm 8.15.4
-python 3.11.5
+nodejs 22.2.0
+pnpm 8.15.5
+python 3.11.5

backend/backend/.gitlab-ci.yml

@@ -1,5 +1,5 @@
 integration:
-  image: registry.gitlab.com/openstapps/openstapps/node-builder
+  image: registry.gitlab.com/openstapps/openstapps/node-builder:node-22
   stage: test
   needs: ['build']
   variables:

backend/backend/CHANGELOG.md

@@ -1,31 +1,5 @@
 # @openstapps/backend
 
-## 3.3.2
-
-### Patch Changes
-
-- @openstapps/core@3.3.2
-- @openstapps/core-tools@3.3.2
-
-## 3.3.1
-
-### Patch Changes
-
-- 67ab1fd6: fix for geo.point mapping
-
-## 3.3.0
-
-### Minor Changes
-
-- 688bc5f2: v3.3.0 changes
-
-### Patch Changes
-
-- Updated dependencies [688bc5f2]
-  - @openstapps/core@3.3.0
-  - @openstapps/core-tools@3.3.0
-  - @openstapps/logger@3.0.0
-
 ## 3.2.0
 
 ### Minor Changes

backend/backend/config/f-u/version-history/2.5.0.en.md

@@ -2,7 +2,7 @@
 
 The Goethe-Uni App got even better!
 
-## Completely new map view
+## Completelty new map view
 
 We overhauled the map to offer you a clearer and faster and overview.
 

backend/backend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/backend",
   "description": "A reference implementation for a StApps backend",
-  "version": "3.3.2",
+  "version": "3.2.0",
   "private": true,
   "type": "module",
   "license": "AGPL-3.0-only",

backend/backend/src/storage/elasticsearch/query/filters/distance.ts

@@ -25,7 +25,7 @@ export function buildDistanceFilter(
 ): QueryDslSpecificQueryContainer<'geo_distance'> {
   const geoObject: QueryDslGeoDistanceQuery = {
     distance: `${filter.arguments.distance}m`,
-    [`${filter.arguments.field}.point`]: {
+    [`${filter.arguments.field}.point.coordinates`]: {
       lat: filter.arguments.position[1],
       lon: filter.arguments.position[0],
     },

backend/backend/src/storage/elasticsearch/query/sort/distance.ts

@@ -25,7 +25,7 @@ export function buildDistanceSort(sort: SCDistanceSort): SortOptions {
       mode: 'avg',
       order: sort.order,
       unit: 'm',
-      [`${sort.arguments.field}.point`]: {
+      [`${sort.arguments.field}.point.coordinates`]: {
         lat: sort.arguments.position[1],
         lon: sort.arguments.position[0],
       },

backend/backend/test/storage/elasticsearch/query.spec.ts

@@ -466,7 +466,7 @@ describe('Query', function () {
       const expectedFilter: QueryDslSpecificQueryContainer<'geo_distance'> = {
         geo_distance: {
           'distance': '1000m',
-          'geo.point': {
+          'geo.point.coordinates': {
             lat: 8.123,
             lon: 50.123,
           },
@@ -636,7 +636,7 @@ describe('Query', function () {
           'mode': 'avg',
           'order': 'desc',
           'unit': 'm',
-          'geo.point': {
+          'geo.point.coordinates': {
             lat: 50.123,
             lon: 8.123,
           },

configuration/tsconfig/CHANGELOG.md

@@ -1,11 +1,5 @@
 # @openstapps/tsconfig
 
-## 3.3.0
-
-### Minor Changes
-
-- 688bc5f2: v3.3.0 changes
-
 ## 3.0.0
 
 ### Major Changes
@@ -36,7 +30,7 @@
 
   ```js
   #!/usr/bin/env node
-  import "./lib/app.js";
+  import './lib/app.js';
   ```
 
 - 64caebaf: Migrate to ESM
@@ -111,7 +105,7 @@
 
   ```js
   #!/usr/bin/env node
-  import "./lib/app.js";
+  import './lib/app.js';
   ```
 
 - 64caebaf: Migrate to ESM

configuration/tsconfig/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/tsconfig",
   "description": "The tsconfig for the openstapps project",
-  "version": "3.3.0",
+  "version": "3.0.0",
   "type": "commonjs",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/eslint-config.git",

coverage.mjs

@@ -9,7 +9,7 @@ const args = files.map(it => `${it.split('/', 2)[1]}='${it}'`);
 
 console.log(
   'Collecting coverage...',
-  await promisify(exec)(`cobertura-merge -o ./coverage.xml ${args.join(' ')}`),
+  await promisify(exec)(`merge-cobertura -o ./coverage.xml ${args.join(' ')}`),
 );
 
 const reportFiles = await glob('./*/*/coverage/report-junit.xml');

examples/minimal-connector/CHANGELOG.md

@@ -1,28 +1,12 @@
 # @openstapps/minimal-connector
 
-## 3.3.2
-
-### Patch Changes
-
-- @openstapps/core@3.3.2
-- @openstapps/api@3.3.2
-
-## 3.3.0
-
-### Patch Changes
-
-- Updated dependencies [688bc5f2]
-  - @openstapps/api@3.3.0
-  - @openstapps/core@3.3.0
-  - @openstapps/logger@3.0.0
-
 ## 3.2.0
 
 ### Patch Changes
 
 - Updated dependencies [912ae422]
-  - @openstapps/core@3.2.0
-  - @openstapps/api@3.2.0
+  - @openstapps/core@4.0.0
+  - @openstapps/api@4.0.0
   - @openstapps/logger@3.0.0
 
 ## 3.1.1

examples/minimal-connector/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/minimal-connector",
   "description": "This is a minimal connector which serves as an example",
-  "version": "3.3.2",
+  "version": "3.2.0",
   "private": true,
   "type": "module",
   "license": "GPL-3.0-only",

examples/minimal-plugin/CHANGELOG.md

@@ -1,33 +1,13 @@
 # @openstapps/minimal-plugin
 
-## 3.3.2
-
-### Patch Changes
-
-- @openstapps/core@3.3.2
-- @openstapps/core-tools@3.3.2
-- @openstapps/api-plugin@3.3.2
-- @openstapps/api@3.3.2
-
-## 3.3.0
-
-### Patch Changes
-
-- Updated dependencies [688bc5f2]
-  - @openstapps/api@3.3.0
-  - @openstapps/core@3.3.0
-  - @openstapps/api-plugin@3.3.0
-  - @openstapps/core-tools@3.3.0
-  - @openstapps/logger@3.0.0
-
 ## 3.2.0
 
 ### Patch Changes
 
 - Updated dependencies [912ae422]
-  - @openstapps/core@3.2.0
-  - @openstapps/api@3.2.0
-  - @openstapps/api-plugin@3.2.0
+  - @openstapps/core@4.0.0
+  - @openstapps/api@4.0.0
+  - @openstapps/api-plugin@4.0.0
   - @openstapps/core-tools@3.0.0
   - @openstapps/logger@3.0.0
 

examples/minimal-plugin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/minimal-plugin",
   "description": "Minimal Plugin",
-  "version": "3.3.2",
+  "version": "3.2.0",
   "private": true,
   "type": "module",
   "license": "GPL-3.0-only",

flake.lock

@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1709126324,
-        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1709747860,
-        "narHash": "sha256-RT4zuBy579m+l8VyIQFOR66WXfcs4g1jntZUHjh6eoI=",
+        "lastModified": 1717112898,
+        "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "58ae79ea707579c40102ddf62d84b902a987c58b",
+        "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0",
         "type": "github"
       },
       "original": {

flake.nix

@@ -11,7 +11,7 @@
       flake-utils,
     }:
     let
-      aapt2buildToolsVersion = "33.0.2";
+      aapt2buildToolsVersion = "34.0.0";
     in
     flake-utils.lib.eachDefaultSystem (
       system:
@@ -19,7 +19,7 @@
         pkgs = import nixpkgs {
           inherit system;
           overlays = [
-            (final: prev: rec {
+            (final: prev: {
               fontMin = prev.python311.withPackages (
                 ps:
                 with ps;
@@ -30,21 +30,20 @@
                 ++ (with fonttools.optional-dependencies; [ woff ])
               );
               android = prev.androidenv.composeAndroidPackages {
-                buildToolsVersions = [
+                buildToolsVersions = prev.lib.lists.unique [
                   "34.0.0"
                   aapt2buildToolsVersion
                 ];
                 platformVersions = [ "34" ];
               };
               cypress = prev.cypress.overrideAttrs (cyPrev: rec {
-                version = "13.2.0";
+                version = "13.10.0";
                 src = prev.fetchzip {
                   url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
-                  hash = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM=";
+                  hash = "sha256-wKNXo2lWndsQaouOiul0rsOWah+RRQ6fljzdeC8/KW4=";
                 };
               });
-              nodejs = prev.nodejs_18;
-              corepack = prev.corepack_18;
+              nodejs = prev.nodejs_22;
             })
           ];
           config = {
@@ -54,7 +53,6 @@
         };
         androidFhs = pkgs.buildFHSUserEnv {
           name = "android-env";
-          targetPkgs = pkgs: with pkgs; [ ];
           runScript = "bash";
           profile = ''
             export ALLOW_NINJA_ENV=true
@@ -68,7 +66,7 @@
           nativeBuildInputs = [ androidFhs ];
           buildInputs = with pkgs; [
             nodejs
-            corepack
+            nodePackages.pnpm
             # tools
             curl
             jq
@@ -83,6 +81,8 @@
           GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${aapt2buildToolsVersion}/aapt2";
           CYPRESS_INSTALL_BINARY = "0";
           CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
+          # https://github.com/nodejs/node/issues/48444#issuecomment-1591882694
+          UV_USE_IO_URING = "0";
         };
       }
     );

frontend/app/.gitlab-ci.yml

@@ -1,5 +1,5 @@
 e2e:
-  image: registry.gitlab.com/openstapps/openstapps/app-cypress:node-18
+  image: registry.gitlab.com/openstapps/openstapps/app-cypress:node-22
   stage: test
   script:
     - pnpm --filter=@openstapps/app install

frontend/app/CHANGELOG.md

@@ -1,32 +1,5 @@
 # @openstapps/app
 
-## 3.3.3
-
-### Patch Changes
-
-- 496b50d8: Bug fixes and Android target sdk version is now 34
-
-## 3.3.2
-
-### Patch Changes
-
-- 7afc24f1: fixed config version comparison
-  - @openstapps/core@3.3.2
-  - @openstapps/api@3.3.2
-
-## 3.3.0
-
-### Minor Changes
-
-- 688bc5f2: v3.3.0 changes
-
-### Patch Changes
-
-- Updated dependencies [688bc5f2]
-  - @openstapps/api@3.2.0
-  - @openstapps/core@3.2.0
-  - @openstapps/collection-utils@3.0.0
-
 ## 3.2.0
 
 ### Patch Changes

frontend/app/README.md

@@ -13,25 +13,25 @@ The StApps 1.x.x (legacy app, but current app in stores) is written using Ionic
 
 There are (`npm`) scripts defined to get the app running as quickly as possible. Those scripts (shortcuts for docker commands) are called using the syntax `npm run + <script-name>`. So we have the following commands available:
 
-```sh
+```
 npm run docker:pull
 ```
 
 which pulls the up-to-date image ([Dockerfile](Dockerfile)) which contains all the tools needed for building, serving and deploying the app.
 
-```sh
+```
 npm run docker:enter
 ```
 
 which enters the container on docker builder image, where we can run `npm install` (to install the required npm packages) and `npm build` (to build the app: convert into executable files), but also any other arbitrary commands with the tools available in the docker image.
 
-```sh
+```
 npm run docker:build
 ```
 
 which runs `npm install` (to install the required npm packages) and `npm build` (to build the app: convert into executable files) in the docker container which runs on the docker builder image.
 
-```sh
+```
 npm run docker:serve
 ```
 
@@ -39,7 +39,7 @@ which serves the app for running it in the browser. It basically runs `ionic ser
 
 ## How to build and start the app using the default backend?
 
-```sh
+```
 npm run build
 npm run start
 ```
@@ -86,98 +86,52 @@ addToIonicDB(
 
 You'll need to run _Chromium_ using
 
-```sh
+```shell
 pnpm chromium:no-cors
 ```
 
 ### Help, I can't log in!
 
 Login services will often block hosts not coming from the production
-server.
+server. You can circumvent this locally by using the `:virtual-host`
+scripts:
 
-#### Web
-
-On the web you can circumvent this locally by using the `:virtual-host` scripts:
-
-```sh
+```shell
 # Start the dev server on mobile.app.uni-frankfurt.de
 pnpm start:virtual-host
 # Run chromium with flags that redirect mobile.app.uni-frankfurt.de to localhost:8100
 pnpm chromium:virtual-host
 ```
 
-#### Android
-
-On Android you will need to change the `custom_url_scheme` values
-to `de.unifrankfurt.app` in the following files:
-
-- `android/app/src/main/res/values/strings.xml`
-- `src/environment/environment.ts`
-
-Then start the app normally as you would
-
-```sh
-pnpm run:android
-```
-
-**This alone will not make auth work**, only the login flow.
-
-If you need to test login, you have to disable live reload:
-
-```sh
-pnpm ionic capacitor run android
-```
-
-_**CAUTION:** a remote chrome debugging session can in some
-cases hijack the device's ADB connection. If the connection
-fails for no obvious reason, close chrome and uninstall the
-app, then try again._
-
-#### iOS
-
-On Android you will need to change the `custom_url_scheme` value in
-`src/environment/environment.ts` as well as the `CFBundleURLTypes`
-in `ios/App/App/Info.plist`.
-
-- make sure to remove any `Info.plist.orig` as capacitor might override
-  the modified `Info.plist` with that.
-- make sure you have a valid device in XCode (Simulator or real device).
-
-After that, run
-
-```sh
-pnpm run:ios
-```
-
 ### Running the app
 
 Install the npm packages needed for running the app (as for any other node project which uses npm):
 
-```sh
+```
 npm install
 ```
 
 Check the code for linter issues:
 
-```sh
+```
 npm run lint
 ```
 
 Automatically fix linter issues (those where autofix is possible):
 
-```sh
+```
 npm run lint:fix
 ```
 
 Build the app (transpile etc.):
 
-```sh
+```
 npm run build
 ```
 
 Open the app in the browser:
 
-```sh
+```
 ionic serve
 ```
 
@@ -185,7 +139,7 @@ ionic serve
 
 Run the app for testing on an android device (with live reload in the webview / device, when files are changed):
 
-```sh
+```
 npm run build # if needed
 npm run resources:android # generate needed resources (icons and splashscreens)
 npm run docker:run:android # runs "ionic capacitor run android --livereload --external" on a selected device
@@ -205,7 +159,7 @@ Besides that, it is possible to monitor processes (and so the processes related
 
 Build the (debug) app for testing on an android device (creates an APK file in the android's build outputs path):
 
-```sh
+```
 npm run docker:build:android
 ```
 
@@ -215,13 +169,13 @@ The mentioned `docker:*:android` npm commands are executed in a docker container
 
 Execute unit tests:
 
-```sh
+```
 npm test
 ```
 
 Execute e2e tests:
 
-```sh
+```
 npm run e2e
 ```
 

frontend/app/android/app/capacitor.build.gradle

@@ -9,7 +9,6 @@ android {
 
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
-    implementation project(':capacitor-community-screen-brightness')
     implementation project(':capacitor-app')
     implementation project(':capacitor-browser')
     implementation project(':capacitor-clipboard')
@@ -22,7 +21,6 @@ dependencies {
     implementation project(':capacitor-local-notifications')
     implementation project(':capacitor-network')
     implementation project(':capacitor-preferences')
-    implementation project(':capacitor-screen-orientation')
     implementation project(':capacitor-share')
     implementation project(':capacitor-splash-screen')
     implementation project(':transistorsoft-capacitor-background-fetch')

frontend/app/android/app/src/main/assets/capacitor.plugins.json

@@ -1,8 +1,4 @@
 [
-	{
-		"pkg": "@capacitor-community/screen-brightness",
-		"classpath": "com.elylucas.capscreenbrightness.ScreenBrightnessPlugin"
-	},
 	{
 		"pkg": "@capacitor/app",
 		"classpath": "com.capacitorjs.plugins.app.AppPlugin"
@@ -51,10 +47,6 @@
 		"pkg": "@capacitor/preferences",
 		"classpath": "com.capacitorjs.plugins.preferences.PreferencesPlugin"
 	},
-	{
-		"pkg": "@capacitor/screen-orientation",
-		"classpath": "com.capacitorjs.plugins.screenorientation.ScreenOrientationPlugin"
-	},
 	{
 		"pkg": "@capacitor/share",
 		"classpath": "com.capacitorjs.plugins.share.SharePlugin"

frontend/app/android/capacitor.settings.gradle

@@ -1,57 +1,51 @@
 // DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 include ':capacitor-android'
-project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/android/capacitor')
-
-include ':capacitor-community-screen-brightness'
-project(':capacitor-community-screen-brightness').projectDir = new File('../../../node_modules/.pnpm/@capacitor-community+screen-brightness@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor-community/screen-brightness/android')
+project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/android/capacitor')
 
 include ':capacitor-app'
-project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/app/android')
+project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/app/android')
 
 include ':capacitor-browser'
-project(':capacitor-browser').projectDir = new File('../../../node_modules/.pnpm/@capacitor+browser@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/browser/android')
+project(':capacitor-browser').projectDir = new File('../../../node_modules/.pnpm/@capacitor+browser@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/browser/android')
 
 include ':capacitor-clipboard'
-project(':capacitor-clipboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/clipboard/android')
+project(':capacitor-clipboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/clipboard/android')
 
 include ':capacitor-device'
-project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/device/android')
+project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/device/android')
 
 include ':capacitor-dialog'
-project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/dialog/android')
+project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/dialog/android')
 
 include ':capacitor-filesystem'
-project(':capacitor-filesystem').projectDir = new File('../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/filesystem/android')
+project(':capacitor-filesystem').projectDir = new File('../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/filesystem/android')
 
 include ':capacitor-geolocation'
-project(':capacitor-geolocation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/geolocation/android')
+project(':capacitor-geolocation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/geolocation/android')
 
 include ':capacitor-haptics'
-project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/haptics/android')
+project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/haptics/android')
 
 include ':capacitor-keyboard'
-project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+keyboard@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/keyboard/android')
+project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+keyboard@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/keyboard/android')
 
 include ':capacitor-local-notifications'
-project(':capacitor-local-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/local-notifications/android')
+project(':capacitor-local-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/local-notifications/android')
 
 include ':capacitor-network'
-project(':capacitor-network').projectDir = new File('../../../node_modules/.pnpm/@capacitor+network@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/network/android')
+project(':capacitor-network').projectDir = new File('../../../node_modules/.pnpm/@capacitor+network@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/network/android')
 
 include ':capacitor-preferences'
-project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/preferences/android')
-
-include ':capacitor-screen-orientation'
-project(':capacitor-screen-orientation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/screen-orientation/android')
+project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/preferences/android')
 
 include ':capacitor-share'
-project(':capacitor-share').projectDir = new File('../../../node_modules/.pnpm/@capacitor+share@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/share/android')
+project(':capacitor-share').projectDir = new File('../../../node_modules/.pnpm/@capacitor+share@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/share/android')
 
 include ':capacitor-splash-screen'
-project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/splash-screen/android')
+project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/splash-screen/android')
 
 include ':transistorsoft-capacitor-background-fetch'
-project(':transistorsoft-capacitor-background-fetch').projectDir = new File('../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.2.0_@capacitor+core@6.1.1/node_modules/@transistorsoft/capacitor-background-fetch/android')
+project(':transistorsoft-capacitor-background-fetch').projectDir = new File('../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@6.0.0_@capacitor+core@6.0.0/node_modules/@transistorsoft/capacitor-background-fetch/android')
 
 include ':capacitor-secure-storage-plugin'
-project(':capacitor-secure-storage-plugin').projectDir = new File('../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@6.1.1/node_modules/capacitor-secure-storage-plugin/android')
+project(':capacitor-secure-storage-plugin').projectDir = new File('../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.10.0_@capacitor+core@6.0.0/node_modules/capacitor-secure-storage-plugin/android')

frontend/app/integration-test.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 
-rm coverage/integration-report-junit-*.xml
+rm coverage/integration-report-junit-*.xml || true
 
 ng e2e --watch=false --headless=true --browser="$BROWSER"
 exit_code=$?
 
-jrm coverage/integration-report-junit.xml coverage/integration-report-junit-*.xml
-rm coverage/integration-report-junit-*.xml
+jrm coverage/integration-report-junit.xml coverage/integration-report-junit-*.xml || true
+rm coverage/integration-report-junit-*.xml || true
 
 exit $exit_code

frontend/app/ios/App/Podfile

@@ -1,4 +1,4 @@
-require_relative '../../../../node_modules/.pnpm/@capacitor+ios@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/ios/scripts/pods_helpers'
+require_relative '../../../../node_modules/.pnpm/@capacitor+ios@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/ios/scripts/pods_helpers'
 
 platform :ios, '13.0'
 use_frameworks!
@@ -9,26 +9,24 @@ use_frameworks!
 install! 'cocoapods', :disable_input_output_paths => true
 
 def capacitor_pods
-  pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/ios'
-  pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/ios'
-  pod 'CapacitorCommunityScreenBrightness', :path => '../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor-community/screen-brightness'
-  pod 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/app'
-  pod 'CapacitorBrowser', :path => '../../../../node_modules/.pnpm/@capacitor+browser@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/browser'
-  pod 'CapacitorClipboard', :path => '../../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/clipboard'
-  pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/device'
-  pod 'CapacitorDialog', :path => '../../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/dialog'
-  pod 'CapacitorFilesystem', :path => '../../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/filesystem'
-  pod 'CapacitorGeolocation', :path => '../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/geolocation'
-  pod 'CapacitorHaptics', :path => '../../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/haptics'
-  pod 'CapacitorKeyboard', :path => '../../../../node_modules/.pnpm/@capacitor+keyboard@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/keyboard'
-  pod 'CapacitorLocalNotifications', :path => '../../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/local-notifications'
-  pod 'CapacitorNetwork', :path => '../../../../node_modules/.pnpm/@capacitor+network@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/network'
-  pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/preferences'
-  pod 'CapacitorScreenOrientation', :path => '../../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/screen-orientation'
-  pod 'CapacitorShare', :path => '../../../../node_modules/.pnpm/@capacitor+share@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/share'
-  pod 'CapacitorSplashScreen', :path => '../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/splash-screen'
-  pod 'TransistorsoftCapacitorBackgroundFetch', :path => '../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.2.0_@capacitor+core@6.1.1/node_modules/@transistorsoft/capacitor-background-fetch'
-  pod 'CapacitorSecureStoragePlugin', :path => '../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@6.1.1/node_modules/capacitor-secure-storage-plugin'
+  pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/ios'
+  pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/ios'
+  pod 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/app'
+  pod 'CapacitorBrowser', :path => '../../../../node_modules/.pnpm/@capacitor+browser@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/browser'
+  pod 'CapacitorClipboard', :path => '../../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/clipboard'
+  pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/device'
+  pod 'CapacitorDialog', :path => '../../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/dialog'
+  pod 'CapacitorFilesystem', :path => '../../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/filesystem'
+  pod 'CapacitorGeolocation', :path => '../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/geolocation'
+  pod 'CapacitorHaptics', :path => '../../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/haptics'
+  pod 'CapacitorKeyboard', :path => '../../../../node_modules/.pnpm/@capacitor+keyboard@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/keyboard'
+  pod 'CapacitorLocalNotifications', :path => '../../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/local-notifications'
+  pod 'CapacitorNetwork', :path => '../../../../node_modules/.pnpm/@capacitor+network@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/network'
+  pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/preferences'
+  pod 'CapacitorShare', :path => '../../../../node_modules/.pnpm/@capacitor+share@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/share'
+  pod 'CapacitorSplashScreen', :path => '../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.0_@capacitor+core@6.0.0/node_modules/@capacitor/splash-screen'
+  pod 'TransistorsoftCapacitorBackgroundFetch', :path => '../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.2.0_@capacitor+core@6.0.0/node_modules/@transistorsoft/capacitor-background-fetch'
+  pod 'CapacitorSecureStoragePlugin', :path => '../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@6.0.0/node_modules/capacitor-secure-storage-plugin'
   pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
 end
 

frontend/app/ios/App/Podfile.lock

@@ -1,70 +1,64 @@
 PODS:
-  - Capacitor (6.1.1):
+  - Capacitor (5.5.0):
     - CapacitorCordova
-  - CapacitorApp (6.0.0):
+  - CapacitorApp (5.0.6):
     - Capacitor
-  - CapacitorBrowser (6.0.1):
+  - CapacitorBrowser (5.1.0):
     - Capacitor
-  - CapacitorClipboard (6.0.0):
+  - CapacitorClipboard (5.0.6):
     - Capacitor
-  - CapacitorCommunityScreenBrightness (6.0.0):
+  - CapacitorCordova (5.5.0)
+  - CapacitorDevice (5.0.6):
     - Capacitor
-  - CapacitorCordova (6.1.1)
-  - CapacitorDevice (6.0.0):
+  - CapacitorDialog (5.0.6):
     - Capacitor
-  - CapacitorDialog (6.0.0):
+  - CapacitorFilesystem (5.1.4):
     - Capacitor
-  - CapacitorFilesystem (6.0.0):
+  - CapacitorGeolocation (5.0.6):
     - Capacitor
-  - CapacitorGeolocation (6.0.0):
+  - CapacitorHaptics (5.0.6):
     - Capacitor
-  - CapacitorHaptics (6.0.0):
+  - CapacitorKeyboard (5.0.6):
     - Capacitor
-  - CapacitorKeyboard (6.0.1):
+  - CapacitorLocalNotifications (5.0.6):
     - Capacitor
-  - CapacitorLocalNotifications (6.0.0):
+  - CapacitorNetwork (5.0.6):
     - Capacitor
-  - CapacitorNetwork (6.0.1):
-    - Capacitor
-  - CapacitorPreferences (6.0.1):
-    - Capacitor
-  - CapacitorScreenOrientation (6.0.1):
+  - CapacitorPreferences (5.0.6):
     - Capacitor
   - CapacitorSecureStoragePlugin (0.9.0):
     - Capacitor
     - SwiftKeychainWrapper
-  - CapacitorShare (6.0.1):
+  - CapacitorShare (5.0.6):
     - Capacitor
-  - CapacitorSplashScreen (6.0.1):
+  - CapacitorSplashScreen (5.0.6):
     - Capacitor
-  - CordovaPlugins (6.1.1):
+  - CordovaPlugins (5.5.0):
     - CapacitorCordova
   - SwiftKeychainWrapper (4.0.1)
-  - TransistorsoftCapacitorBackgroundFetch (5.2.0):
+  - TransistorsoftCapacitorBackgroundFetch (5.1.1):
     - Capacitor
 
 DEPENDENCIES:
-  - "Capacitor (from `../../../../node_modules/.pnpm/@capacitor+ios@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/ios`)"
-  - "CapacitorApp (from `../../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/app`)"
-  - "CapacitorBrowser (from `../../../../node_modules/.pnpm/@capacitor+browser@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/browser`)"
-  - "CapacitorClipboard (from `../../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/clipboard`)"
-  - "CapacitorCommunityScreenBrightness (from `../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor-community/screen-brightness`)"
-  - "CapacitorCordova (from `../../../../node_modules/.pnpm/@capacitor+ios@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/ios`)"
-  - "CapacitorDevice (from `../../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/device`)"
-  - "CapacitorDialog (from `../../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/dialog`)"
-  - "CapacitorFilesystem (from `../../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/filesystem`)"
-  - "CapacitorGeolocation (from `../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/geolocation`)"
-  - "CapacitorHaptics (from `../../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/haptics`)"
-  - "CapacitorKeyboard (from `../../../../node_modules/.pnpm/@capacitor+keyboard@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/keyboard`)"
-  - "CapacitorLocalNotifications (from `../../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/local-notifications`)"
-  - "CapacitorNetwork (from `../../../../node_modules/.pnpm/@capacitor+network@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/network`)"
-  - "CapacitorPreferences (from `../../../../node_modules/.pnpm/@capacitor+preferences@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/preferences`)"
-  - "CapacitorScreenOrientation (from `../../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/screen-orientation`)"
-  - "CapacitorSecureStoragePlugin (from `../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@6.1.1/node_modules/capacitor-secure-storage-plugin`)"
-  - "CapacitorShare (from `../../../../node_modules/.pnpm/@capacitor+share@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/share`)"
-  - "CapacitorSplashScreen (from `../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/splash-screen`)"
+  - "Capacitor (from `../../../../node_modules/.pnpm/@capacitor+ios@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/ios`)"
+  - "CapacitorApp (from `../../../../node_modules/.pnpm/@capacitor+app@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/app`)"
+  - "CapacitorBrowser (from `../../../../node_modules/.pnpm/@capacitor+browser@5.1.0_@capacitor+core@5.5.0/node_modules/@capacitor/browser`)"
+  - "CapacitorClipboard (from `../../../../node_modules/.pnpm/@capacitor+clipboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/clipboard`)"
+  - "CapacitorCordova (from `../../../../node_modules/.pnpm/@capacitor+ios@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/ios`)"
+  - "CapacitorDevice (from `../../../../node_modules/.pnpm/@capacitor+device@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/device`)"
+  - "CapacitorDialog (from `../../../../node_modules/.pnpm/@capacitor+dialog@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/dialog`)"
+  - "CapacitorFilesystem (from `../../../../node_modules/.pnpm/@capacitor+filesystem@5.1.4_@capacitor+core@5.5.0/node_modules/@capacitor/filesystem`)"
+  - "CapacitorGeolocation (from `../../../../node_modules/.pnpm/@capacitor+geolocation@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/geolocation`)"
+  - "CapacitorHaptics (from `../../../../node_modules/.pnpm/@capacitor+haptics@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/haptics`)"
+  - "CapacitorKeyboard (from `../../../../node_modules/.pnpm/@capacitor+keyboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/keyboard`)"
+  - "CapacitorLocalNotifications (from `../../../../node_modules/.pnpm/@capacitor+local-notifications@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/local-notifications`)"
+  - "CapacitorNetwork (from `../../../../node_modules/.pnpm/@capacitor+network@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/network`)"
+  - "CapacitorPreferences (from `../../../../node_modules/.pnpm/@capacitor+preferences@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/preferences`)"
+  - "CapacitorSecureStoragePlugin (from `../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@5.5.0/node_modules/capacitor-secure-storage-plugin`)"
+  - "CapacitorShare (from `../../../../node_modules/.pnpm/@capacitor+share@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/share`)"
+  - "CapacitorSplashScreen (from `../../../../node_modules/.pnpm/@capacitor+splash-screen@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/splash-screen`)"
   - CordovaPlugins (from `../capacitor-cordova-ios-plugins`)
-  - "TransistorsoftCapacitorBackgroundFetch (from `../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.2.0_@capacitor+core@6.1.1/node_modules/@transistorsoft/capacitor-background-fetch`)"
+  - "TransistorsoftCapacitorBackgroundFetch (from `../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.1.1_@capacitor+core@5.5.0/node_modules/@transistorsoft/capacitor-background-fetch`)"
 
 SPEC REPOS:
   trunk:
@@ -72,72 +66,66 @@ SPEC REPOS:
 
 EXTERNAL SOURCES:
   Capacitor:
-    :path: "../../../../node_modules/.pnpm/@capacitor+ios@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/ios"
+    :path: "../../../../node_modules/.pnpm/@capacitor+ios@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/ios"
   CapacitorApp:
-    :path: "../../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/app"
+    :path: "../../../../node_modules/.pnpm/@capacitor+app@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/app"
   CapacitorBrowser:
-    :path: "../../../../node_modules/.pnpm/@capacitor+browser@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/browser"
+    :path: "../../../../node_modules/.pnpm/@capacitor+browser@5.1.0_@capacitor+core@5.5.0/node_modules/@capacitor/browser"
   CapacitorClipboard:
-    :path: "../../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/clipboard"
-  CapacitorCommunityScreenBrightness:
-    :path: "../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor-community/screen-brightness"
+    :path: "../../../../node_modules/.pnpm/@capacitor+clipboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/clipboard"
   CapacitorCordova:
-    :path: "../../../../node_modules/.pnpm/@capacitor+ios@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/ios"
+    :path: "../../../../node_modules/.pnpm/@capacitor+ios@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/ios"
   CapacitorDevice:
-    :path: "../../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/device"
+    :path: "../../../../node_modules/.pnpm/@capacitor+device@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/device"
   CapacitorDialog:
-    :path: "../../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/dialog"
+    :path: "../../../../node_modules/.pnpm/@capacitor+dialog@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/dialog"
   CapacitorFilesystem:
-    :path: "../../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/filesystem"
+    :path: "../../../../node_modules/.pnpm/@capacitor+filesystem@5.1.4_@capacitor+core@5.5.0/node_modules/@capacitor/filesystem"
   CapacitorGeolocation:
-    :path: "../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/geolocation"
+    :path: "../../../../node_modules/.pnpm/@capacitor+geolocation@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/geolocation"
   CapacitorHaptics:
-    :path: "../../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/haptics"
+    :path: "../../../../node_modules/.pnpm/@capacitor+haptics@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/haptics"
   CapacitorKeyboard:
-    :path: "../../../../node_modules/.pnpm/@capacitor+keyboard@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/keyboard"
+    :path: "../../../../node_modules/.pnpm/@capacitor+keyboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/keyboard"
   CapacitorLocalNotifications:
-    :path: "../../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/local-notifications"
+    :path: "../../../../node_modules/.pnpm/@capacitor+local-notifications@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/local-notifications"
   CapacitorNetwork:
-    :path: "../../../../node_modules/.pnpm/@capacitor+network@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/network"
+    :path: "../../../../node_modules/.pnpm/@capacitor+network@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/network"
   CapacitorPreferences:
-    :path: "../../../../node_modules/.pnpm/@capacitor+preferences@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/preferences"
-  CapacitorScreenOrientation:
-    :path: "../../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/screen-orientation"
+    :path: "../../../../node_modules/.pnpm/@capacitor+preferences@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/preferences"
   CapacitorSecureStoragePlugin:
-    :path: "../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@6.1.1/node_modules/capacitor-secure-storage-plugin"
+    :path: "../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@5.5.0/node_modules/capacitor-secure-storage-plugin"
   CapacitorShare:
-    :path: "../../../../node_modules/.pnpm/@capacitor+share@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/share"
+    :path: "../../../../node_modules/.pnpm/@capacitor+share@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/share"
   CapacitorSplashScreen:
-    :path: "../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/splash-screen"
+    :path: "../../../../node_modules/.pnpm/@capacitor+splash-screen@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/splash-screen"
   CordovaPlugins:
     :path: "../capacitor-cordova-ios-plugins"
   TransistorsoftCapacitorBackgroundFetch:
-    :path: "../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.2.0_@capacitor+core@6.1.1/node_modules/@transistorsoft/capacitor-background-fetch"
+    :path: "../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.1.1_@capacitor+core@5.5.0/node_modules/@transistorsoft/capacitor-background-fetch"
 
 SPEC CHECKSUMS:
-  Capacitor: 8941aba4364ba9d1b22188569001f2ce45cc2b00
-  CapacitorApp: 9d53aec7101f7b030a950c5bdc4df8612576b279
-  CapacitorBrowser: 473c7fd70ddbe541608ff09ec1be14da0078279e
-  CapacitorClipboard: 80282f684154124b9019ebf401235b70b0cf4994
-  CapacitorCommunityScreenBrightness: 250184917bd0738a681c026a9513e18ddb0cb49b
-  CapacitorCordova: 8f2cc8d8d3619c566e9418fe8772064a94266106
-  CapacitorDevice: f8fd88f9edd1261c55a109f32015b09bbbfdc4a0
-  CapacitorDialog: 64aa82840ee5e9c066f9e1a49c1e186afd3f24d2
-  CapacitorFilesystem: 60e59ba274c234a979e7a3be2552feaadcee4263
-  CapacitorGeolocation: 1f12bbe372b65116e851bd8e3a94cf0ef9bacebb
-  CapacitorHaptics: 9ebc9363f0e9b8eb4295088a0b474530acf1859b
-  CapacitorKeyboard: 5f32a712adf41e07a61caafb82cf29fb6d8ba123
-  CapacitorLocalNotifications: 4ab68f0be5f697a579558fadd307d823a9ec1c26
-  CapacitorNetwork: 5c94acfdddc22043f2ffaff224ce9b4aa5a179f0
-  CapacitorPreferences: 72909b165bc7807103778ddbb86d5d8ce06abf71
-  CapacitorScreenOrientation: 3d4965dcbda5d901b6a48350a5d270ad7d404e05
+  Capacitor: 57890b363df14d5d2d5d8461aa23e886cb34da2a
+  CapacitorApp: 024e1b1bea5f883d79f6330d309bc441c88ad04a
+  CapacitorBrowser: 7a0fb6a1011abfaaf2dfedfd8248f942a8eda3d6
+  CapacitorClipboard: 77edf49827ea21da2a9c05c690a4a6a4d07199c4
+  CapacitorCordova: 3d3908a3d208a11a75f9df3b18c4405c4de76e1d
+  CapacitorDevice: 2c968f98a1ec4d22357418c1521e7ddc46c675e6
+  CapacitorDialog: 0f3c15dfe9414b83bc64aef4078f1b92bcfead26
+  CapacitorFilesystem: af704badfbc69f6f8623d9ed313e5490e3723dcb
+  CapacitorGeolocation: 7be5f77abc205c0efe319fff8587a7183e7b0240
+  CapacitorHaptics: 1fffc1217c7e64a472d7845be50fb0c2f7d4204c
+  CapacitorKeyboard: b978154b024a5f65e044908e37d15b7de58b9d12
+  CapacitorLocalNotifications: c2d8b14794064fd4814b1d6c4ddbac8029afa295
+  CapacitorNetwork: d80b3e79bef6ec37640ee2806c19771f07ff2d0c
+  CapacitorPreferences: f03954bcb0ff09c792909e46bff88e3183c16b10
   CapacitorSecureStoragePlugin: e91d7df060f2495a1acff9583641a6953e3aacba
-  CapacitorShare: 02222f2457ff003e642370a9c1ecd101baaa27c8
-  CapacitorSplashScreen: 61645214e8f955ff2b80f16a6a3648960fe4c89f
-  CordovaPlugins: 1078156cfc354dd440b38ce4062e69fd9b07033c
+  CapacitorShare: cd41743331cb71d217c029de54b681cbd91e0fcc
+  CapacitorSplashScreen: 5fa2ab5e46cf5cc530cf16a51c80c7a986579ccd
+  CordovaPlugins: de5669381702d76ed5b1d442177a6a5fc3252a9d
   SwiftKeychainWrapper: 807ba1d63c33a7d0613288512399cd1eda1e470c
-  TransistorsoftCapacitorBackgroundFetch: f130c5dcb6048401e74cc531e691e1d513045366
+  TransistorsoftCapacitorBackgroundFetch: ce4b3e01b898cef516e68485d2160a078016ee97
 
-PODFILE CHECKSUM: d0561b89b66368df409c77587e3e02b48e737203
+PODFILE CHECKSUM: 229278f2c257e8ab555325c7115b2e187e8e628d
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.13.0

frontend/app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/app",
   "description": "The generic app tailored to fulfill needs of German universities, written using Ionic Framework.",
-  "version": "3.3.3",
+  "version": "3.2.0",
   "private": true,
   "license": "GPL-3.0-only",
   "author": "Karl-Philipp Wulfert <krlwlfrt@gmail.com>",
@@ -14,9 +14,7 @@
     "Thea Schöbl <dev@theaninova.de>"
   ],
   "scripts": {
-    "analyze": "webpack-bundle-analyzer www/stats.json",
-    "build": "pnpm check-icons && ng build --configuration=production --stats-json && webpack-bundle-analyzer www/stats.json --mode static --report www/bundle-info.html --no-open",
-    "build:analyze": "npm run build:stats && npm run analyze",
+    "build": "pnpm check-icons && ng build --configuration=production --stats-json",
     "build:android": "ionic capacitor build android --no-open && cd android && ./gradlew clean assemble && cd ..",
     "build:prod": "ng build --configuration=production",
     "build:stats": "ng build --configuration=production --stats-json",
@@ -39,7 +37,6 @@
     "lint": "ng lint && stylelint \"**/*.scss\"",
     "lint:fix": "eslint --fix -c .eslintrc.json --ignore-path .eslintignore --ext .ts,.html src/ && stylelint --fix \"**/*.scss\"",
     "minify-icons": "node scripts/minify-icon-font.mjs",
-    "postinstall": "jetify && echo \"skipping jetify in production mode\"",
     "preview": "http-server www --p 8101 -o",
     "push": "git push && git push origin \"v$npm_package_version\"",
     "resources:ios": "capacitor-assets generate --ios --iconBackgroundColor $(grep -oE \"^@include ion-color\\(primary, #[a-fA-F0-9]{3,6}\" src/theme/colors.scss | grep -oE \"#[a-fA-F0-9]{3,6}\") --splashBackgroundColor $(grep -oE \"^@include ion-color\\(primary, #[a-fA-F0-9]{3,6}\" src/theme/colors.scss | grep -oE \"#[a-fA-F0-9]{3,6}\")",
@@ -52,34 +49,31 @@
     "test:integration": "sh integration-test.sh"
   },
   "dependencies": {
-    "@angular/animations": "17.3.0",
-    "@angular/cdk": "17.3.0",
-    "@angular/common": "17.3.0",
-    "@angular/core": "17.3.0",
-    "@angular/forms": "17.3.0",
-    "@angular/platform-browser": "17.3.0",
-    "@angular/router": "17.3.0",
+    "@angular/animations": "18.0.1",
+    "@angular/cdk": "18.0.1",
+    "@angular/common": "18.0.1",
+    "@angular/core": "18.0.1",
+    "@angular/forms": "18.0.1",
+    "@angular/platform-browser": "18.0.1",
+    "@angular/router": "18.0.1",
     "@awesome-cordova-plugins/calendar": "6.6.0",
     "@awesome-cordova-plugins/core": "6.6.0",
-    "@capacitor-community/screen-brightness": "6.0.0",
     "@capacitor/app": "6.0.0",
-    "@capacitor/browser": "6.0.1",
+    "@capacitor/browser": "6.0.0",
     "@capacitor/clipboard": "6.0.0",
-    "@capacitor/core": "6.1.1",
+    "@capacitor/core": "6.0.0",
     "@capacitor/device": "6.0.0",
     "@capacitor/dialog": "6.0.0",
     "@capacitor/filesystem": "6.0.0",
     "@capacitor/geolocation": "6.0.0",
     "@capacitor/haptics": "6.0.0",
-    "@capacitor/keyboard": "6.0.1",
+    "@capacitor/keyboard": "6.0.0",
     "@capacitor/local-notifications": "6.0.0",
-    "@capacitor/network": "6.0.1",
-    "@capacitor/preferences": "6.0.1",
-    "@capacitor/screen-orientation": "6.0.1",
-    "@capacitor/share": "6.0.1",
-    "@capacitor/splash-screen": "6.0.1",
-    "@ionic-native/core": "5.36.0",
-    "@ionic/angular": "7.8.0",
+    "@capacitor/network": "6.0.0",
+    "@capacitor/preferences": "6.0.0",
+    "@capacitor/share": "6.0.0",
+    "@capacitor/splash-screen": "6.0.0",
+    "@ionic/angular": "8.2.0",
     "@ionic/storage-angular": "4.0.0",
     "@maplibre/ngx-maplibre-gl": "17.4.1",
     "@ngx-translate/core": "15.0.0",
@@ -88,25 +82,26 @@
     "@openstapps/api": "workspace:*",
     "@openstapps/collection-utils": "workspace:*",
     "@openstapps/core": "workspace:*",
-    "@transistorsoft/capacitor-background-fetch": "5.2.0",
+    "@transistorsoft/capacitor-background-fetch": "6.0.0",
     "@types/dom-view-transitions": "1.0.4",
-    "capacitor-secure-storage-plugin": "0.9.0",
+    "capacitor-secure-storage-plugin": "0.10.0",
     "cordova-plugin-calendar": "5.1.6",
     "date-fns": "3.6.0",
     "deepmerge": "4.3.1",
     "form-data": "4.0.0",
     "geojson": "0.5.0",
     "ionic-appauth": "0.9.0",
-    "jsonpath-plus": "10.0.6",
+    "jsonpath-plus": "6.0.1",
     "maplibre-gl": "4.0.2",
     "material-symbols": "0.17.1",
     "moment": "2.30.1",
     "ngx-date-fns": "11.0.0",
     "ngx-logger": "5.0.12",
-    "ngx-markdown": "17.1.1",
+    "ngx-markdown": "18.0.0",
     "ngx-moment": "6.0.2",
     "opening_hours": "3.8.0",
     "pmtiles": "3.0.3",
+    "prettier": "3.1.1",
     "rxjs": "7.8.1",
     "semver": "7.6.0",
     "swiper": "8.4.5",
@@ -114,25 +109,25 @@
     "zone.js": "0.14.4"
   },
   "devDependencies": {
-    "@angular-devkit/architect": "0.1703.0",
-    "@angular-devkit/build-angular": "17.3.0",
-    "@angular-devkit/core": "17.3.0",
-    "@angular-devkit/schematics": "17.3.0",
-    "@angular-eslint/builder": "17.3.0",
-    "@angular-eslint/eslint-plugin": "17.3.0",
-    "@angular-eslint/eslint-plugin-template": "17.3.0",
-    "@angular-eslint/schematics": "17.3.0",
-    "@angular-eslint/template-parser": "17.3.0",
-    "@angular/cli": "17.3.0",
-    "@angular/compiler": "17.3.0",
-    "@angular/compiler-cli": "17.3.0",
+    "@angular-devkit/architect": "0.1800.2",
+    "@angular-devkit/build-angular": "18.0.2",
+    "@angular-devkit/core": "18.0.2",
+    "@angular-devkit/schematics": "18.0.2",
+    "@angular-eslint/builder": "18.0.1",
+    "@angular-eslint/eslint-plugin": "18.0.1",
+    "@angular-eslint/eslint-plugin-template": "18.0.1",
+    "@angular-eslint/schematics": "18.0.1",
+    "@angular-eslint/template-parser": "18.0.1",
+    "@angular/cli": "18.0.2",
+    "@angular/compiler": "18.0.1",
+    "@angular/compiler-cli": "18.0.1",
     "@angular/language-server": "17.3.0",
-    "@angular/language-service": "17.3.0",
-    "@angular/platform-browser-dynamic": "17.3.0",
-    "@capacitor/android": "6.1.1",
+    "@angular/language-service": "18.0.1",
+    "@angular/platform-browser-dynamic": "18.0.1",
+    "@capacitor/android": "6.0.0",
     "@capacitor/assets": "3.0.4",
-    "@capacitor/cli": "6.1.1",
-    "@capacitor/ios": "6.1.1",
+    "@capacitor/cli": "6.0.0",
+    "@capacitor/ios": "6.0.0",
     "@compodoc/compodoc": "1.1.23",
     "@cypress/schematic": "2.5.1",
     "@ionic/angular-toolkit": "11.0.1",
@@ -153,7 +148,7 @@
     "@typescript-eslint/eslint-plugin": "7.2.0",
     "@typescript-eslint/parser": "7.2.0",
     "cordova-res": "0.15.4",
-    "cypress": "13.7.0",
+    "cypress": "13.10.0",
     "eslint": "8.57.0",
     "eslint-plugin-jsdoc": "48.2.1",
     "eslint-plugin-prettier": "5.1.3",
@@ -165,7 +160,6 @@
     "is-docker": "2.2.1",
     "jasmine-core": "5.1.2",
     "jasmine-spec-reporter": "7.0.0",
-    "jetifier": "2.0.0",
     "junit-report-merger": "6.0.3",
     "karma": "6.4.3",
     "karma-chrome-launcher": "3.2.0",
@@ -181,8 +175,7 @@
     "stylelint-config-standard-scss": "13.0.0",
     "surge": "0.23.1",
     "ts-node": "10.9.2",
-    "typescript": "5.4.2",
-    "webpack-bundle-analyzer": "4.10.1"
+    "typescript": "5.4.2"
   },
   "cordova": {
     "plugins": {},

frontend/app/scripts/get-ip.mjs

@@ -1,8 +0,0 @@
-import {networkInterfaces} from 'os';
-
-console.log(
-  Object.entries(networkInterfaces())
-    .map(([, info]) => info)
-    .flat()
-    .find(info => info && !info.internal && info.family === 'IPv4')?.address,
-);

frontend/app/src/app/app.component.spec.ts

@@ -21,7 +21,7 @@ import {ModalController, Platform} from '@ionic/angular';
 
 import {TranslateService} from '@ngx-translate/core';
 import {ThingTranslateService} from './translation/thing-translate.service';
-import {HttpClientTestingModule} from '@angular/common/http/testing';
+import {provideHttpClientTesting} from '@angular/common/http/testing';
 import {AppComponent} from './app.component';
 import {AuthModule} from './modules/auth/auth.module';
 import {ConfigProvider} from './modules/config/config.provider';
@@ -32,6 +32,7 @@ import {ScheduleSyncService} from './modules/background/schedule/schedule-sync.s
 import {sampleAuthConfiguration} from './_helpers/data/sample-configuration';
 import {StorageProvider} from './modules/storage/storage.provider';
 import {SimpleBrowser} from './util/browser.factory';
+import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
 
 describe('AppComponent', () => {
   let platformReadySpy: any;
@@ -75,8 +76,9 @@ describe('AppComponent', () => {
     modalController = jasmine.createSpyObj('ModalController', ['create', 'dismiss', 'getTop']);
 
     TestBed.configureTestingModule({
-      imports: [RouterTestingModule.withRoutes([]), HttpClientTestingModule, AuthModule],
       declarations: [AppComponent],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
+      imports: [RouterTestingModule.withRoutes([]), AuthModule],
       providers: [
         {provide: Platform, useValue: platformSpy},
         {provide: TranslateService, useValue: translateServiceSpy},
@@ -88,8 +90,9 @@ describe('AppComponent', () => {
         {provide: StorageProvider, useValue: storageProvider},
         {provide: SimpleBrowser, useValue: simpleBrowser},
         {provide: ModalController, useValue: modalController},
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   });
 

frontend/app/src/app/app.module.ts

@@ -13,7 +13,7 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 import {CommonModule, LocationStrategy, PathLocationStrategy, registerLocaleData} from '@angular/common';
-import {HTTP_INTERCEPTORS, HttpClient, HttpClientModule} from '@angular/common/http';
+import {HTTP_INTERCEPTORS, HttpClient, provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
 import localeDe from '@angular/common/locales/de';
 import {APP_INITIALIZER, NgModule} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
@@ -161,7 +161,6 @@ export function createTranslateLoader(http: HttpClient) {
     JobModule,
     FavoritesModule,
     LibraryModule,
-    HttpClientModule,
     ProfilePageModule,
     FeedbackModule,
     MapModule,
@@ -221,6 +220,7 @@ export function createTranslateLoader(http: HttpClient) {
       useClass: ServiceHandlerInterceptor,
       multi: true,
     },
+    provideHttpClient(withInterceptorsFromDi()),
   ],
 })
 export class AppModule {

frontend/app/src/app/modules/about/about-licenses.scss

@@ -12,6 +12,24 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
+ion-content > div {
+  height: 100%;
+}
+
+cdk-virtual-scroll-viewport {
+  width: 100%;
+  height: 100%;
+}
+
+:host ::ng-deep {
+  .cdk-virtual-scroll-content-wrapper {
+    width: 100%;
+  }
+}
+
+.virtual-scroll-expander {
+  clear: both;
+}
 
 .supertext-icon {
   height: 14px;

frontend/app/src/app/modules/auth/auth-helper.service.spec.ts

@@ -22,7 +22,7 @@ import {Requestor, StorageBackend} from '@openid/appauth';
 import {TranslateService} from '@ngx-translate/core';
 import {PAIAAuthService} from './paia/paia-auth.service';
 import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
-import {HttpClientModule} from '@angular/common/http';
+import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
 import {SimpleBrowser} from '../../util/browser.factory';
 import {LoggerTestingModule} from 'ngx-logger/testing';
 
@@ -54,7 +54,7 @@ describe('AuthHelperService', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientModule, LoggerTestingModule],
+      imports: [LoggerTestingModule],
       providers: [
         StAppsWebHttpClient,
         {
@@ -88,6 +88,7 @@ describe('AuthHelperService', () => {
           provide: SimpleBrowser,
           useValue: simpleBrowserMock,
         },
+        provideHttpClient(withInterceptorsFromDi()),
       ],
     });
     authHelperService = TestBed.inject(AuthHelperService);

frontend/app/src/app/modules/auth/auth-helper.service.ts

@@ -81,6 +81,7 @@ export class AuthHelperService {
       user[key as keyof SCUserConfiguration] = JSONPath({
         path: this.userConfigurationMap[key as keyof SCUserConfiguration] as string,
         json: userInfo,
+        preventEval: true,
       })[0];
     }
     if (user.givenName && user.givenName.length > 0 && user.familyName && user.familyName.length > 0) {

frontend/app/src/app/modules/auth/default-auth.service.spec.ts

@@ -20,7 +20,7 @@ import {Browser} from 'ionic-appauth';
 import {nowInSeconds, Requestor, StorageBackend} from '@openid/appauth';
 import {TranslateService} from '@ngx-translate/core';
 import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
-import {HttpClientModule} from '@angular/common/http';
+import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
 import {IonicStorage} from 'ionic-appauth/lib';
 import {RouterModule} from '@angular/router';
 import {LoggerTestingModule} from 'ngx-logger/testing';
@@ -35,7 +35,7 @@ describe('AuthService', () => {
     storageBackendSpy = jasmine.createSpyObj('StorageBackend', ['getItem']);
 
     TestBed.configureTestingModule({
-      imports: [HttpClientModule, LoggerTestingModule, RouterModule.forRoot([])],
+      imports: [LoggerTestingModule, RouterModule.forRoot([])],
       providers: [
         StAppsWebHttpClient,
         {
@@ -54,6 +54,7 @@ describe('AuthService', () => {
           useValue: storageBackendSpy,
         },
         Requestor,
+        provideHttpClient(withInterceptorsFromDi()),
       ],
     });
     defaultAuthService = TestBed.inject(DefaultAuthService);

frontend/app/src/app/modules/config/config.provider.spec.ts

@@ -24,17 +24,13 @@ import {
 } from './errors';
 import {NGXLogger} from 'ngx-logger';
 import {sampleIndexResponse} from '../../_helpers/data/sample-configuration';
-import {BehaviorSubject} from 'rxjs';
-import {InternetConnectionService} from '../../util/internet-connection.service';
 
 describe('ConfigProvider', () => {
-  let internetConnectionServiceMock: {offline$: BehaviorSubject<boolean>};
   let configProvider: ConfigProvider;
   let storageProviderSpy: jasmine.SpyObj<StorageProvider>;
   let ngxLogger: jasmine.SpyObj<NGXLogger>;
 
   beforeEach(() => {
-    internetConnectionServiceMock = {offline$: new BehaviorSubject<boolean>(false)};
     storageProviderSpy = jasmine.createSpyObj('StorageProvider', ['init', 'get', 'has', 'put']);
     const webHttpClientMethodSpy = jasmine.createSpyObj('StAppsWebHttpClient', ['request']);
     ngxLogger = jasmine.createSpyObj('NGXLogger', ['log', 'error', 'warn']);
@@ -55,10 +51,6 @@ describe('ConfigProvider', () => {
           provide: NGXLogger,
           useValue: ngxLogger,
         },
-        {
-          provide: InternetConnectionService,
-          useValue: internetConnectionServiceMock,
-        },
       ],
     });
 
@@ -67,8 +59,7 @@ describe('ConfigProvider', () => {
 
   it('should fetch app configuration', async () => {
     spyOn(configProvider.client, 'handshake').and.returnValue(Promise.resolve(sampleIndexResponse));
-    await configProvider.fetch();
-    const result = configProvider.config;
+    const result = await configProvider.fetch();
     expect(result).toEqual(sampleIndexResponse);
   });
 
@@ -84,22 +75,6 @@ describe('ConfigProvider', () => {
     expect(error).toEqual(new ConfigFetchError());
   });
 
-  it('should throw device offline error when offline', async () => {
-    // eslint-disable-next-line unicorn/error-message
-    let error = new Error('');
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    internetConnectionServiceMock.offline$ = new BehaviorSubject<boolean>(true);
-
-    try {
-      await configProvider.fetch();
-    } catch (error_) {
-      error = error_ as Error;
-      expect(error).toBeInstanceOf(ConfigFetchError);
-      expect(error.message).toContain('Device is offline.');
-    }
-  });
-
   it('should init from remote and saved config not available', async () => {
     storageProviderSpy.has.and.returnValue(Promise.resolve(false));
     spyOn(configProvider.client, 'handshake').and.returnValue(Promise.resolve(sampleIndexResponse));
@@ -111,7 +86,7 @@ describe('ConfigProvider', () => {
     expect(storageProviderSpy.has).toHaveBeenCalled();
     expect(storageProviderSpy.get).toHaveBeenCalledTimes(0);
     expect(configProvider.client.handshake).toHaveBeenCalled();
-    expect(configProvider.getValue('name')).toEqual(sampleIndexResponse.app.name);
+    expect(await configProvider.getValue('name')).toEqual(sampleIndexResponse.app.name);
   });
 
   it('should throw error on failed initialisation', async () => {
@@ -133,8 +108,6 @@ describe('ConfigProvider', () => {
     wrongConfig.backend.SCVersion = '0.1.0';
     storageProviderSpy.get.and.returnValue(Promise.resolve(wrongConfig));
     spyOn(configProvider.client, 'handshake').and.returnValue(Promise.resolve(sampleIndexResponse));
-    // sets StApps core version which has a different major version
-    configProvider.scVersion = '1.0.0';
     await configProvider.init();
 
     expect(ngxLogger.warn).toHaveBeenCalledWith(
@@ -142,19 +115,6 @@ describe('ConfigProvider', () => {
     );
   });
 
-  it('should load from storage if offline and same major version stored', async () => {
-    internetConnectionServiceMock = {offline$: new BehaviorSubject<boolean>(true)};
-    storageProviderSpy.has.and.returnValue(Promise.resolve(true));
-    const configInStorage = structuredClone(sampleIndexResponse);
-    configInStorage.backend.SCVersion = '1.0.0';
-    storageProviderSpy.get.and.returnValue(Promise.resolve(configInStorage));
-    // sets StApps core version which has the same major version
-    configProvider.scVersion = '1.1.1';
-    await configProvider.init();
-
-    expect(configProvider.getAnyValue('app')).toEqual(configInStorage.app);
-  });
-
   it('should throw error on saved app configuration not available', async () => {
     storageProviderSpy.has.and.returnValue(Promise.resolve(false));
     // eslint-disable-next-line unicorn/error-message
@@ -193,31 +153,4 @@ describe('ConfigProvider', () => {
 
     expect(configProvider.getValue('name')).toEqual(sampleIndexResponse.app.name);
   });
-
-  it('should fetch new config from remote on init', async () => {
-    storageProviderSpy.has.and.returnValue(Promise.resolve(true));
-    storageProviderSpy.get.and.returnValue(Promise.resolve(sampleIndexResponse));
-    spyOn(configProvider, 'fetch');
-    await configProvider.init();
-
-    expect(configProvider.fetch).toHaveBeenCalled();
-  });
-
-  it('should update the local config with the one from remote', async () => {
-    storageProviderSpy.has.and.returnValue(Promise.resolve(true));
-    storageProviderSpy.get.and.returnValue(Promise.resolve(sampleIndexResponse));
-    const newConfig = structuredClone(sampleIndexResponse);
-    newConfig.app.name = 'New app name';
-    spyOn(configProvider.client, 'handshake').and.returnValue(Promise.resolve(newConfig));
-    await configProvider.init();
-
-    // Validate that the initial configuration is loaded
-    expect(configProvider.getValue('name')).toEqual(sampleIndexResponse.app.name);
-
-    // Fetch the new configuration from the remote
-    await configProvider.fetch();
-
-    // Validate that the new configuration is now set
-    expect(configProvider.getValue('name')).toEqual(newConfig.app.name);
-  });
 });

frontend/app/src/app/modules/config/config.provider.ts

@@ -27,8 +27,6 @@ import {
   SavedConfigNotAvailable,
   WrongConfigVersionInStorage,
 } from './errors';
-import {InternetConnectionService} from '../../util/internet-connection.service';
-import {firstValueFrom} from 'rxjs';
 
 /**
  * Key to store config in storage module
@@ -74,7 +72,6 @@ export class ConfigProvider {
     private readonly storageProvider: StorageProvider,
     swHttpClient: StAppsWebHttpClient,
     private readonly logger: NGXLogger,
-    private readonly internetConnectionService: InternetConnectionService,
   ) {
     console.log('config init');
     this.client = new Client(swHttpClient, environment.backend_url, environment.backend_version);
@@ -83,20 +80,11 @@ export class ConfigProvider {
   /**
    * Fetches configuration from backend
    */
-  async fetch(): Promise<void> {
+  async fetch(): Promise<SCIndexResponse> {
     try {
-      const isOffline = await firstValueFrom(this.internetConnectionService.offline$);
-      if (isOffline) {
-        throw new Error('Device is offline.');
-      } else {
-        const fetchedConfig: SCIndexResponse = await this.client.handshake(this.scVersion);
-        await this.set(fetchedConfig);
-        this.logger.log(`Configuration updated from remote`);
-      }
-    } catch (error) {
-      const error_ = error instanceof Error ? new ConfigFetchError(error.message) : new ConfigFetchError();
-      this.logger.warn(`Failed to fetch remote configuration:`, error_);
-      throw error_; // Rethrow the error to handle it in init()
+      return await this.client.handshake(this.scVersion);
+    } catch {
+      throw new ConfigFetchError();
     }
   }
 
@@ -124,33 +112,40 @@ export class ConfigProvider {
 
   /**
    * Initialises the ConfigProvider
-   * @throws ConfigInitError if no configuration could be loaded both locally and remote.
+   * @throws ConfigInitError if no configuration could be loaded.
+   * @throws WrongConfigVersionInStorage if fetch failed and saved config has wrong SCVersion
    */
   async init(): Promise<void> {
+    let loadError;
+    let fetchError;
+    // load saved configuration
     try {
-      // Attempt to load the configuration from local storage
       this.config = await this.loadLocal();
       this.firstSession = false;
       this.logger.log(`initialised configuration from storage`);
-
-      // Check if the stored configuration has the correct version
-      if (this.config.backend.SCVersion.split('.')[0] !== this.scVersion.split('.')[0]) {
-        throw new WrongConfigVersionInStorage(this.scVersion, this.config.backend.SCVersion);
+      if (this.config.backend.SCVersion !== this.scVersion) {
+        loadError = new WrongConfigVersionInStorage(this.scVersion, this.config.backend.SCVersion);
       }
-
-      // Fetch the remote configuration in a non-blocking manner
-      void this.fetch();
-    } catch (loadError) {
+    } catch (error) {
+      loadError = error;
+    }
+    // fetch remote configuration from backend
+    try {
+      const fetchedConfig: SCIndexResponse = await this.fetch();
+      await this.set(fetchedConfig);
+      this.logger.log(`initialised configuration from remote`);
+    } catch (error) {
+      fetchError = error;
+    }
+    // check for occurred errors and throw them
+    if (loadError !== undefined && fetchError !== undefined) {
+      throw new ConfigInitError();
+    }
+    if (loadError !== undefined) {
       this.logger.warn(loadError);
-
-      try {
-        // If local loading fails, immediately try to fetch the configuration from remote
-        await this.fetch();
-      } catch (fetchError) {
-        this.logger.warn(`Failed to fetch remote configuration:`, fetchError);
-        // If both local loading and remote fetching fail, throw ConfigInitError
-        throw new ConfigInitError();
-      }
+    }
+    if (fetchError !== undefined) {
+      this.logger.warn(fetchError);
     }
   }
 

frontend/app/src/app/modules/config/errors.ts

@@ -19,10 +19,8 @@ import {AppError} from '../../_helpers/errors';
  * Error that is thrown when fetching from backend fails
  */
 export class ConfigFetchError extends AppError {
-  constructor(reason?: string) {
-    const defaultMessage = 'App configuration could not be fetched!';
-    const message = reason ? `${defaultMessage} ${reason}` : defaultMessage;
-    super('ConfigFetchError', message);
+  constructor() {
+    super('ConfigFetchError', 'App configuration could not be fetched!');
   }
 }
 

frontend/app/src/app/modules/dashboard/sections/jobs-section/job-section.component.html

@@ -37,8 +37,5 @@
         {{ 'dashboard.jobs.noJobs' | translate }}
       </ion-label>
     </ion-item>
-    <ion-button slot="button-end" fill="clear" color="medium" [routerLink]="['/jobs']">
-      <ion-icon slot="icon-only" name="search" [size]="24"></ion-icon>
-    </ion-button>
   }
 </stapps-section>

frontend/app/src/app/modules/data/data.module.ts

@@ -14,7 +14,7 @@
  */
 import {ScrollingModule} from '@angular/cdk/scrolling';
 import {CommonModule} from '@angular/common';
-import {HttpClientModule} from '@angular/common/http';
+import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
 import {NgModule} from '@angular/core';
 import {FormsModule} from '@angular/forms';
 import {IonicModule, Platform} from '@ionic/angular';
@@ -181,12 +181,33 @@ import {ShareButtonComponent} from './elements/share-button.component';
     PeriodicalDetailContentComponent,
     ShareButtonComponent,
   ],
+  exports: [
+    DataDetailComponent,
+    DataDetailContentComponent,
+    DataIconPipe,
+    DataListComponent,
+    DataListItemComponent,
+    DateSeriesListItemComponent,
+    PlaceListItemComponent,
+    SimpleCardComponent,
+    SkeletonListItemComponent,
+    SkeletonSimpleCardComponent,
+    SearchPageComponent,
+    SimpleDataListComponent,
+    OriginDetailComponent,
+    FavoriteButtonComponent,
+    TreeListComponent,
+    ExternalLinkComponent,
+    ArticleDetailContentComponent,
+    BookDetailContentComponent,
+    PeriodicalDetailContentComponent,
+    TitleCardComponent,
+  ],
   imports: [
     CommonModule,
     DataRoutingModule,
     FormsModule,
     MapWidgetComponent,
-    HttpClientModule,
     IonicModule.forRoot(),
     MarkdownModule.forRoot(),
     MenuModule,
@@ -218,28 +239,7 @@ import {ShareButtonComponent} from './elements/share-button.component';
       useFactory: browserFactory,
       deps: [Platform],
     },
-  ],
-  exports: [
-    DataDetailComponent,
-    DataDetailContentComponent,
-    DataIconPipe,
-    DataListComponent,
-    DataListItemComponent,
-    DateSeriesListItemComponent,
-    PlaceListItemComponent,
-    SimpleCardComponent,
-    SkeletonListItemComponent,
-    SkeletonSimpleCardComponent,
-    SearchPageComponent,
-    SimpleDataListComponent,
-    OriginDetailComponent,
-    FavoriteButtonComponent,
-    TreeListComponent,
-    ExternalLinkComponent,
-    ArticleDetailContentComponent,
-    BookDetailContentComponent,
-    PeriodicalDetailContentComponent,
-    TitleCardComponent,
+    provideHttpClient(withInterceptorsFromDi()),
   ],
 })
 export class DataModule {}

frontend/app/src/app/modules/data/list/data-list-item.scss

@@ -33,9 +33,9 @@ ion-item {
   margin: var(--spacing-sm);
 
   ion-thumbnail {
-    --size: 36px;
+    --ion-margin: var(--spacing-xs);
 
-    margin: 0;
+    margin-block: auto;
     margin-inline: var(--spacing-md);
     padding: 0;
   }

frontend/app/src/app/modules/feedback/feedback-page.html

@@ -80,12 +80,13 @@
         </ion-item>
         <ion-item>
           <ion-checkbox
+            class="ion-text-wrap"
             color="primary"
             label-placement="end"
             justify="start"
             [(ngModel)]="termsAgree"
             name="termsAgree"
-            ><span class="ion-text-wrap">{{ 'feedback.form.termsAgree.0' | translate }}</span></ion-checkbox
+            >{{ 'feedback.form.termsAgree.0' | translate }}</ion-checkbox
           >
         </ion-item>
         <ion-item lines="none">
@@ -103,9 +104,7 @@
             justify="start"
             [(ngModel)]="protocolDataAgree"
             name="protocolDataAgree"
-            ><span class="ion-text-wrap">{{
-              'feedback.form.protocolDataAgree' | translate
-            }}</span></ion-checkbox
+            >{{ 'feedback.form.protocolDataAgree' | translate }}</ion-checkbox
           >
         </ion-item>
         <ion-card>

frontend/app/src/app/modules/hebis/daia-data.provider.spec.ts

@@ -21,7 +21,7 @@ import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
 import {StorageProvider} from '../storage/storage.provider';
 import {LoggerTestingModule} from 'ngx-logger/testing';
 import {MapModule} from '../map/map.module';
-import {HttpClientModule} from '@angular/common/http';
+import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
 import {StorageModule} from '../storage/storage.module';
 import {DaiaHolding, DaiaService} from './protocol/response';
 import {Observable, of} from 'rxjs';
@@ -47,7 +47,6 @@ describe('DaiaDataProvider', () => {
       imports: [
         HebisModule,
         MapModule,
-        HttpClientModule,
         StorageModule,
         LoggerTestingModule,
         TranslateModule.forRoot({
@@ -62,6 +61,7 @@ describe('DaiaDataProvider', () => {
         StAppsWebHttpClient,
         StorageProvider,
         DaiaDataProvider,
+        provideHttpClient(withInterceptorsFromDi()),
       ],
     });
     daiaDataProvider = TestBed.inject(DaiaDataProvider);

frontend/app/src/app/modules/hebis/hebis.module.ts

@@ -14,7 +14,7 @@
  */
 import {ScrollingModule} from '@angular/cdk/scrolling';
 import {CommonModule} from '@angular/common';
-import {HttpClientModule} from '@angular/common/http';
+import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
 import {NgModule} from '@angular/core';
 import {FormsModule} from '@angular/forms';
 import {IonicModule} from '@ionic/angular';
@@ -54,7 +54,6 @@ import {DaiaHoldingComponent} from './daia-availability/daia-holding.component';
     FormsModule,
     HebisRoutingModule,
     IonIconModule,
-    HttpClientModule,
     IonicModule.forRoot(),
     MarkdownModule.forRoot(),
     MenuModule,
@@ -69,6 +68,11 @@ import {DaiaHoldingComponent} from './daia-availability/daia-holding.component';
     ThingTranslateModule.forChild(),
     UtilModule,
   ],
-  providers: [HebisDataProvider, DaiaDataProvider, StAppsWebHttpClient],
+  providers: [
+    HebisDataProvider,
+    DaiaDataProvider,
+    StAppsWebHttpClient,
+    provideHttpClient(withInterceptorsFromDi()),
+  ],
 })
 export class HebisModule {}

frontend/app/src/app/modules/library/account/account.page.ts

@@ -11,7 +11,7 @@ export class LibraryAccountPageComponent {
   constructor(private readonly libraryAccountService: LibraryAccountService) {}
 
   async ionViewWillEnter(): Promise<void> {
-    const patron = await this.libraryAccountService.getPatron();
+    const patron = await this.libraryAccountService.getProfile();
     this.name = patron?.name;
   }
 }

frontend/app/src/app/modules/library/account/checked-out/checked-out-page.component.ts

@@ -39,8 +39,6 @@ export class CheckedOutPageComponent {
 
   async fetchItems() {
     try {
-      // Prepare patron (status) for the items
-      await this.libraryAccountService.getPatron();
       this.checkedOutItems = undefined;
       this.checkedOutItems = await this.libraryAccountService.getFilteredItems([PAIADocumentStatus.Held]);
     } catch {

frontend/app/src/app/modules/library/account/checked-out/checked-out-page.html

@@ -27,7 +27,7 @@
     @for (checkedOutItem of checkedOutItems; track checkedOutItem) {
       <stapps-paia-item
         [item]="checkedOutItem"
-        [propertiesToShow]="['label', 'renewals', 'duedate']"
+        [propertiesToShow]="['label', 'renewals', 'endtime']"
         (documentAction)="onDocumentAction($event)"
         listName="checked_out"
       >

frontend/app/src/app/modules/library/account/elements/paia-item/paiaitem.component.ts

@@ -14,8 +14,7 @@
  */
 
 import {Component, EventEmitter, Input, Output} from '@angular/core';
-import {DocumentAction, PAIADocument, PAIADocumentStatus, PAIADocumentVisualStatus} from '../../../types';
-import {LibraryAccountService} from '../../library-account.service';
+import {DocumentAction, PAIADocument} from '../../../types';
 
 @Component({
   selector: 'stapps-paia-item',
@@ -23,24 +22,7 @@ import {LibraryAccountService} from '../../library-account.service';
   styleUrls: ['./paiaitem.scss'],
 })
 export class PAIAItemComponent {
-  private _item: PAIADocument;
-
-  renewable: boolean;
-
-  visualStatus?: PAIADocumentVisualStatus;
-
-  constructor(private readonly libraryAccountService: LibraryAccountService) {}
-
-  @Input()
-  set item(value: PAIADocument) {
-    this._item = value;
-    void this.setRenewable();
-    this.visualStatus = this.getVisualStatus(Number(this.item.status));
-  }
-
-  get item(): PAIADocument {
-    return this._item;
-  }
+  @Input() item: PAIADocument;
 
   @Input()
   propertiesToShow: (keyof PAIADocument)[];
@@ -54,23 +36,4 @@ export class PAIAItemComponent {
   async onClick(action: DocumentAction['action']) {
     this.documentAction.emit({doc: this.item, action});
   }
-
-  private async setRenewable() {
-    const isActive = await this.libraryAccountService.isActivePatron();
-    this.renewable = isActive && Number(this.item.status) === PAIADocumentStatus.Held;
-  }
-
-  private getVisualStatus(status: PAIADocumentStatus): PAIADocumentVisualStatus | undefined {
-    switch (status) {
-      case PAIADocumentStatus.Ordered: {
-        return {color: 'warning', status: status, statusText: 'ordered'};
-      }
-      case PAIADocumentStatus.Provided: {
-        return {color: 'success', status: status, statusText: 'ready'};
-      }
-      default: {
-        return undefined;
-      }
-    }
-  }
 }

frontend/app/src/app/modules/library/account/elements/paia-item/paiaitem.html

@@ -14,22 +14,16 @@
 -->
 
 <ion-item>
+  <!-- TODO: text not selectable in Chrome, bugfix needed https://github.com/ionic-team/ionic-framework/issues/24956 -->
   <ion-label class="ion-text-wrap">
     @if (item.about) {
-      <h2 class="name">
-        @if (visualStatus) {
-          <ion-badge [color]="visualStatus.color" slot="start">
-            {{ 'library.account.pages' + '.' + listName + '.' + visualStatus.statusText | translate }}
-          </ion-badge>
-        }
-        {{ item.about }}
-      </h2>
+      <h2 class="name">{{ item.about }}</h2>
     }
     @for (property of propertiesToShow; track property) {
       @if (item[property]) {
         <p>
           {{ 'library.account.pages' + '.' + listName + '.' + 'labels' + '.' + property | translate }}:
-          @if (!['starttime', 'duedate'].includes(property)) {
+          @if (!['endtime', 'duedate'].includes(property)) {
             {{ item[property] }}
           } @else {
             {{ $any(item[property]) | amDateFormat: 'll' }}
@@ -46,7 +40,7 @@
       <!--      >-->
       <!--        {{ 'library.account.actions.cancel.header' | translate }}</ion-button-->
       <!--      >-->
-      @if (renewable && item.canrenew) {
+      @if (item.canrenew) {
         <ion-button color="primary" (click)="onClick('renew')">
           {{ 'library.account.actions.renew.header' | translate }}</ion-button
         >

frontend/app/src/app/modules/library/account/elements/paia-item/paiaitem.scss

@@ -12,6 +12,3 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-ion-badge {
-  vertical-align: bottom;
-}

frontend/app/src/app/modules/library/account/holds/holds-page.component.ts

@@ -45,8 +45,6 @@ export class HoldsPageComponent {
         ? [PAIADocumentStatus.Reserved]
         : [PAIADocumentStatus.Ordered, PAIADocumentStatus.Provided];
     try {
-      // Prepare patron (status) for the items
-      await this.libraryAccountService.getPatron();
       this.paiaDocuments = await this.libraryAccountService.getFilteredItems(itemsStatus);
     } catch {
       await this.libraryAccountService.handleError();

frontend/app/src/app/modules/library/account/holds/holds-page.html

@@ -35,20 +35,30 @@
       @switch (activeSegment) {
         @case ('orders') {
           @for (hold of paiaDocuments; track hold) {
-            <stapps-paia-item
-              [item]="hold"
-              [propertiesToShow]="['label', 'storage']"
-              (documentAction)="onDocumentAction($event)"
-              listName="holds"
-            >
-            </stapps-paia-item>
+            @if (toNumber(hold.status) === paiaDocumentStatus.Provided) {
+              <stapps-paia-item
+                [item]="hold"
+                [propertiesToShow]="['label', 'storage']"
+                (documentAction)="onDocumentAction($event)"
+                listName="holds"
+              >
+              </stapps-paia-item>
+            } @else {
+              <stapps-paia-item
+                [item]="hold"
+                [propertiesToShow]="['label']"
+                (documentAction)="onDocumentAction($event)"
+                listName="holds"
+              >
+              </stapps-paia-item>
+            }
           }
         }
         @case ('reservations') {
           @for (hold of paiaDocuments; track hold) {
             <stapps-paia-item
               [item]="hold"
-              [propertiesToShow]="['label', 'starttime', 'storage', 'queue']"
+              [propertiesToShow]="['label']"
               (documentAction)="onDocumentAction($event)"
               listName="holds"
             >

frontend/app/src/app/modules/library/account/library-account.service.ts

@@ -20,15 +20,7 @@ import {
   SCFeatureConfiguration,
   SCFeatureConfigurationExtern,
 } from '@openstapps/core';
-import {
-  DocumentAction,
-  PAIADocument,
-  PAIADocumentStatus,
-  PAIAFees,
-  PAIAItems,
-  PAIAPatron,
-  PAIAPatronStatus,
-} from '../types';
+import {DocumentAction, PAIADocument, PAIADocumentStatus, PAIAFees, PAIAItems, PAIAPatron} from '../types';
 import {HebisDataProvider} from '../../hebis/hebis-data.provider';
 import {PAIATokenResponse} from '../../auth/paia/paia-token-response';
 import {AuthHelperService} from '../../auth/auth-helper.service';
@@ -51,11 +43,6 @@ export class LibraryAccountService {
    */
   authType: SCAuthorizationProviderType;
 
-  /**
-   * Account (Patron) status
-   */
-  private status?: PAIAPatronStatus;
-
   constructor(
     protected requestor: Requestor = new JQueryRequestor(),
     private readonly hebisDataProvider: HebisDataProvider,
@@ -73,23 +60,12 @@ export class LibraryAccountService {
     this.authType = config.authProvider as SCAuthorizationProviderType;
   }
 
-  async getPatron() {
-    const patronId = ((await this.getValidToken()) as PAIATokenResponse).patron;
-    const patron = {
+  async getProfile() {
+    const patron = ((await this.getValidToken()) as PAIATokenResponse).patron;
+    return {
       ...(await this.performRequest<PAIAPatron>(`${this.baseUrl}/{patron}`)),
-      id: patronId,
+      id: patron,
     } as PAIAPatron;
-    // Refresh the status
-    this.status = Number(patron.status);
-    return patron;
-  }
-
-  async getPatronStatus() {
-    return this.status ?? (this.status = Number((await this.getPatron()).status) as PAIAPatronStatus);
-  }
-
-  async isActivePatron() {
-    return (await this.getPatronStatus()) === PAIAPatronStatus.Active;
   }
 
   async getItems() {

frontend/app/src/app/modules/library/account/profile/profile-page.component.ts

@@ -25,17 +25,15 @@ import {PAIAPatron} from '../../types';
 export class ProfilePageComponent {
   patron?: PAIAPatron;
 
+  propertiesToShow: (keyof PAIAPatron)[] = ['id', 'name', 'email', 'address', 'expires', 'note'];
+
   constructor(private readonly libraryAccountService: LibraryAccountService) {}
 
   async ionViewWillEnter(): Promise<void> {
     try {
-      this.patron = await this.libraryAccountService.getPatron();
+      this.patron = await this.libraryAccountService.getProfile();
     } catch {
       await this.libraryAccountService.handleError();
     }
   }
-
-  isUnlimitedExpiry(date = ''): boolean {
-    return new Date(date).getFullYear() === 9999;
-  }
 }

frontend/app/src/app/modules/library/account/profile/profile-page.html

@@ -26,45 +26,27 @@
     <ion-card>
       <ion-card-content>
         <ion-grid>
-          <ion-row>
-            <ion-col> {{ 'library.account.pages.profile.labels.id' | translate }}: </ion-col>
-            <ion-col>
-              {{ patron.id }}
-            </ion-col>
-          </ion-row>
-          <ion-row>
-            <ion-col> {{ 'library.account.pages.profile.labels.name' | translate }}: </ion-col>
-            <ion-col> {{ patron.name_details?.title ?? '' }} {{ patron.name }} </ion-col>
-          </ion-row>
-          @if (patron.email) {
-            <ion-row>
-              <ion-col> {{ 'library.account.pages.profile.labels.email' | translate }}: </ion-col>
-              <ion-col>
-                {{ patron.email }}
-              </ion-col>
-            </ion-row>
-          }
-          @if (patron.address) {
-            <ion-row>
-              <ion-col> {{ 'library.account.pages.profile.labels.address' | translate }}: </ion-col>
-              <ion-col>
-                {{ patron.address }}
-              </ion-col>
-            </ion-row>
-          }
-          @if (patron.expires) {
-            <ion-row>
-              <ion-col> {{ 'library.account.pages.profile.labels.expires' | translate }}: </ion-col>
-              <ion-col>
-                @if (isUnlimitedExpiry(patron.expires)) {
-                  {{ 'library.account.pages.profile.values.unlimited' | translate }}
-                } @else {
-                  {{ 'library.account.pages.profile.values.expires' | translate }}:&nbsp;{{
-                    patron.expires | amDateFormat: 'll'
-                  }}
-                }
-              </ion-col>
-            </ion-row>
+          @for (property of propertiesToShow; track property) {
+            @if (patron[property]) {
+              <ion-row>
+                <ion-col>
+                  {{ 'library.account.pages.profile.labels' + '.' + property | translate }}:
+                </ion-col>
+                <ion-col>
+                  @if (!['expires'].includes(property)) {
+                    {{ patron[property] }}
+                  } @else {
+                    @if (patron[property] === '9999-12-31') {
+                      {{ 'library.account.pages.profile.values.unlimited' | translate }}
+                    } @else {
+                      {{ 'library.account.pages.profile.values.expires' | translate }}:&nbsp;{{
+                        patron[property] | amDateFormat: 'll'
+                      }}
+                    }
+                  }
+                </ion-col>
+              </ion-row>
+            }
           }
         </ion-grid>
       </ion-card-content>

frontend/app/src/app/modules/library/types.ts

@@ -19,24 +19,9 @@ export interface PAIAPatron {
   email?: string;
   address?: string;
   expires?: string;
-  status?: PAIAPatronStatus;
+  status?: string;
   type?: string;
   note?: string;
-  // HeBIS specific property (not in PAIA documentation)
-  name_details?: {
-    firstname?: string;
-    lastname?: string;
-    gender?: string;
-    title?: string;
-  };
-}
-
-export enum PAIAPatronStatus {
-  Active = 0,
-  Inactive = 1,
-  InactiveExpired = 2,
-  InactiveOutstandingFees = 3,
-  InactiveExpiredOutstandingFees = 4,
 }
 
 /*
@@ -54,7 +39,7 @@ export interface PAIADocument {
   queue?: string;
   renewals?: string;
   reminder?: string;
-  starttime?: string;
+  endtime?: string;
   duedate?: string;
   cancancel?: boolean;
   canrenew?: boolean;
@@ -95,9 +80,3 @@ export interface DocumentAction {
   action: 'cancel' | 'renew';
   doc: PAIADocument;
 }
-
-export interface PAIADocumentVisualStatus {
-  color: 'warning' | 'success';
-  status: PAIADocumentStatus;
-  statusText: 'ordered' | 'ready';
-}

frontend/app/src/app/modules/map/map-style.directive.ts

@@ -1,6 +1,5 @@
 import {Directive, Input, Host} from '@angular/core';
 import {MapComponent} from '@maplibre/ngx-maplibre-gl';
-import {environment} from '../../../environments/environment';
 
 @Directive({
   selector: 'mgl-map[styleName]',
@@ -11,7 +10,7 @@ export class MapStyleDirective {
 
   @Input()
   set styleName(name: string) {
-    const style = `${environment.backend_url}/_static/map/styles/${name}/style.json`;
+    const style = `https://maps.server.uni-frankfurt.de/static/styles/${name}/style.json`;
     if (this.map.style) {
       this.map.mapInstance.setStyle(style);
     } else {

frontend/app/src/app/modules/map/position.service.spec.ts

@@ -14,7 +14,7 @@
  */
 import {TestBed} from '@angular/core/testing';
 import {MapModule} from './map.module';
-import {HttpClientModule} from '@angular/common/http';
+import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
 import {StorageModule} from '../storage/storage.module';
 import {MapPosition, PositionService} from './position.service';
 import {ConfigProvider} from '../config/config.provider';
@@ -39,12 +39,13 @@ describe('PositionService', () => {
       },
     });
     TestBed.configureTestingModule({
-      imports: [MapModule, HttpClientModule, StorageModule, LoggerTestingModule],
+      imports: [MapModule, StorageModule, LoggerTestingModule],
       providers: [
         {
           provider: ConfigProvider,
           useValue: configProviderMock,
         },
+        provideHttpClient(withInterceptorsFromDi()),
       ],
     });
     positionService = TestBed.inject(PositionService);

frontend/app/src/app/modules/profile/id-card.component.ts

@@ -1,14 +1,10 @@
-import {ChangeDetectionStrategy, Component, ElementRef, Input} from '@angular/core';
+import {ChangeDetectionStrategy, Component, Input} from '@angular/core';
 import {SCIdCard} from '@openstapps/core';
+import {FullScreenImageDirective} from '../../util/full-screen-image.directive';
 import {ThingTranslateModule} from '../../translation/thing-translate.module';
 import {AsyncPipe, TitleCasePipe} from '@angular/common';
-import {IntervalIsNowPipe, ToDateIntervalPipe} from '../../util/in-range.pipe';
+import {InRangeNowPipe, ToDateRangePipe} from '../../util/in-range.pipe';
 import {TranslateModule} from '@ngx-translate/core';
-import {AnimationController, ModalController} from '@ionic/angular';
-import {ScreenBrightness} from '@capacitor-community/screen-brightness';
-import {ScreenOrientation} from '@capacitor/screen-orientation';
-import {Capacitor} from '@capacitor/core';
-import {iosDuration, iosEasing, mdDuration, mdEasing} from 'src/app/animation/easings';
 
 @Component({
   selector: 'stapps-id-card',
@@ -16,10 +12,12 @@ import {iosDuration, iosEasing, mdDuration, mdEasing} from 'src/app/animation/ea
   styleUrls: ['id-card.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
+  hostDirectives: [FullScreenImageDirective],
   imports: [
+    FullScreenImageDirective,
     ThingTranslateModule,
-    IntervalIsNowPipe,
-    ToDateIntervalPipe,
+    InRangeNowPipe,
+    ToDateRangePipe,
     AsyncPipe,
     TranslateModule,
     TitleCasePipe,
@@ -27,126 +25,4 @@ import {iosDuration, iosEasing, mdDuration, mdEasing} from 'src/app/animation/ea
 })
 export class IdCardComponent {
   @Input({required: true}) item: SCIdCard;
-
-  constructor(
-    private modalController: ModalController,
-    private animationController: AnimationController,
-    private elementRef: ElementRef,
-  ) {}
-
-  async presentFullscreen() {
-    const top = await this.modalController.getTop();
-    const mode = document.querySelector('ion-app')!.getAttribute('mode');
-    if (top) return;
-
-    if (window.innerWidth >= 768) return;
-
-    if (Capacitor.isNativePlatform()) {
-      const orientation = await ScreenOrientation.orientation();
-      ScreenOrientation.lock({orientation: 'portrait'});
-      if (orientation.type.startsWith('landscape')) {
-        await new Promise(resolve => setTimeout(resolve, 500));
-      }
-    }
-
-    const img: HTMLImageElement = this.elementRef.nativeElement.querySelector('img')!;
-
-    const safeArea = (location: string) =>
-      Number(img.computedStyleMap().get(`--ion-safe-area-${location}`)!.toString().replace(/px$/, ''));
-    const safeAreaTop = safeArea('top');
-    const safeAreaBottom = safeArea('bottom');
-    const safeAreaLeft = safeArea('left');
-    const safeAreaRight = safeArea('right');
-
-    const windowWidth = window.innerWidth - safeAreaLeft - safeAreaRight;
-    const windowHeight = window.innerHeight - safeAreaTop - safeAreaBottom;
-
-    const isLandscape = windowWidth > windowHeight;
-    const nativeBounds = img.getBoundingClientRect();
-    const imageAspect = nativeBounds.width / nativeBounds.height;
-    const imgWidth = Math.min(windowHeight, windowWidth * imageAspect);
-    const imgHeight = imgWidth / imageAspect;
-    const fullscreenWidth = isLandscape ? imgHeight : imgWidth;
-    const fullscreenHeight = isLandscape ? imgWidth : imgHeight;
-
-    const scale = fullscreenWidth / windowWidth;
-    const animation = (modal: HTMLElement, leave = false) => {
-      const root = modal.shadowRoot!;
-
-      const sourceAnimation = this.animationController
-        .create()
-        .addElement(this.elementRef.nativeElement)
-        .fromTo('opacity', 0, 0);
-      const backdrop =
-        'linear-gradient(to bottom,' +
-        'transparent 16px,' +
-        'rgba(0, 0, 0, 0.3) 20%,' +
-        'rgba(0, 0, 0, 0.3) 80%,' +
-        'transparent 100%)';
-      const wrapperAnimation = this.animationController
-        .create()
-        .beforeStyles({'--background': 'transparent', 'margin': '0'})
-        .addElement(root.querySelector('.modal-wrapper')!)
-        .fromTo('transform', 'scale(1)', 'scale(1)')
-        .fromTo('opacity', '1', '1');
-      const backdropAnimation = this.animationController
-        .create()
-        .beforeStyles({background: backdrop, filter: 'blur(16px)'})
-        .addElement(root.querySelector('ion-backdrop')!)
-        .fromTo('opacity', leave ? 1 : 0, leave ? 0 : 1);
-
-      const small =
-        `translate(${nativeBounds.left - safeAreaLeft}px, ${nativeBounds.top - safeAreaTop}px) ` +
-        `scale(${nativeBounds.width / windowWidth}) ` +
-        `rotate(0) `;
-      const large =
-        `translate(${windowWidth - (windowWidth - fullscreenHeight) / 2}px, ${
-          (windowHeight - fullscreenWidth) / 2
-        }px)` +
-        `scale(${scale}) ` +
-        `rotate(${isLandscape ? 0 : 90}deg) `;
-      const cardAnimation = this.animationController
-        .create()
-        .addElement(modal.querySelector('stapps-id-card')!)
-        .beforeStyles({
-          'transform-origin': 'top left',
-          'filter': 'drop-shadow(0 0 16px rgba(0, 0, 0, 0.1))',
-        })
-        .fromTo('transform', leave ? large : small, leave ? small : large);
-
-      return this.animationController
-        .create()
-        .addElement(modal)
-        .easing(mode === 'ios' ? iosEasing : mdEasing)
-        .duration(2 * (mode === 'ios' ? iosDuration : mdDuration))
-        .addAnimation([wrapperAnimation, backdropAnimation, cardAnimation, sourceAnimation]);
-    };
-
-    const modal = await this.modalController.create({
-      component: IdCardComponent,
-      backdropDismiss: true,
-      mode: 'md',
-      componentProps: {
-        item: this.item,
-      },
-      presentingElement: this.elementRef.nativeElement,
-      enterAnimation: base => animation(base),
-      leaveAnimation: base => animation(base, true),
-    });
-
-    const dismiss = () => modal.dismiss();
-    window.addEventListener('click', dismiss);
-    modal.addEventListener('didDismiss', () => window.removeEventListener('click', dismiss));
-
-    if (Capacitor.isNativePlatform()) {
-      const brightness = (await ScreenBrightness.getBrightness()).brightness;
-      ScreenBrightness.setBrightness({brightness: 1});
-      modal.addEventListener('didDismiss', () => {
-        ScreenOrientation.unlock();
-        ScreenBrightness.setBrightness({brightness: brightness === 1 ? 0.5 : brightness});
-      });
-    }
-
-    await modal.present();
-  }
 }

frontend/app/src/app/modules/profile/id-card.html

@@ -1,9 +1,4 @@
-<img
-  [src]="item.image"
-  [alt]="'name' | thingTranslate: item"
-  draggable="false"
-  (click)="presentFullscreen()"
-/>
-@if (item.validity && (item.validity | rangeToDateInterval | dfnsIntervalIsNow | async) === false) {
+<img [src]="item.image" [alt]="'name' | thingTranslate: item" draggable="false" />
+@if (item.validity && (item.validity | toDateRange | isInRangeNow | async) === false) {
   <div class="expired">{{ 'profile.userInfo.expired' | translate | titlecase }}</div>
 }

frontend/app/src/app/modules/profile/id-card.scss

@@ -3,6 +3,11 @@
   overflow: hidden;
 }
 
+:host:fullscreen {
+  margin: 0;
+  padding: 0;
+}
+
 img {
   border-radius: 3mm;
 }

frontend/app/src/app/modules/profile/id-cards.component.ts

@@ -19,6 +19,7 @@ import {IonicModule} from '@ionic/angular';
 import {AsyncPipe, TitleCasePipe} from '@angular/common';
 import {ThingTranslateModule} from '../../translation/thing-translate.module';
 import {UtilModule} from '../../util/util.module';
+import {FullScreenImageDirective} from '../../util/full-screen-image.directive';
 import {IdCardComponent} from './id-card.component';
 import {TranslateModule} from '@ngx-translate/core';
 import {Observable} from 'rxjs';
@@ -35,6 +36,7 @@ import {Observable} from 'rxjs';
     AsyncPipe,
     ThingTranslateModule,
     UtilModule,
+    FullScreenImageDirective,
     IdCardComponent,
     TranslateModule,
     TitleCasePipe,

frontend/app/src/app/modules/profile/id-cards.provider.ts

@@ -1,11 +1,10 @@
 import {Injectable} from '@angular/core';
 import {SCIdCard, SCThingOriginType, SCThingType, SCUserConfiguration} from '@openstapps/core';
-import {from, of, Observable} from 'rxjs';
+import {from, Observable, of} from 'rxjs';
 import {AuthHelperService} from '../auth/auth-helper.service';
-import {mergeMap, concatWith, filter, map, startWith, catchError, tap} from 'rxjs/operators';
+import {mergeMap, filter, map, startWith} from 'rxjs/operators';
 import {ConfigProvider} from '../config/config.provider';
 import {HttpClient} from '@angular/common/http';
-import {EncryptedStorageProvider} from '../storage/encrypted-storage.provider';
 
 @Injectable({providedIn: 'root'})
 export class IdCardsProvider {
@@ -13,27 +12,18 @@ export class IdCardsProvider {
     private authHelper: AuthHelperService,
     private config: ConfigProvider,
     private httpClient: HttpClient,
-    private encryptedStorageProvider: EncryptedStorageProvider,
   ) {}
 
   getIdCards(): Observable<SCIdCard[]> {
     const feature = this.config.config.app.features.extern?.['idCards'];
     const auth = this.authHelper.getProvider(feature?.authProvider ?? 'default');
-    const storedIdCards = from(
-      this.encryptedStorageProvider.get<SCIdCard[]>('id-cards') as Promise<SCIdCard[]>,
-    ).pipe(filter(it => it !== undefined));
 
     return auth.isAuthenticated$.pipe(
       mergeMap(isAuthenticated =>
         isAuthenticated
           ? feature
-            ? storedIdCards.pipe(
-                concatWith(
-                  from(auth.getValidToken()).pipe(
-                    mergeMap(token => this.fetchIdCards(feature.url, token.accessToken)),
-                    catchError(() => storedIdCards),
-                  ),
-                ),
+            ? from(auth.getValidToken()).pipe(
+                mergeMap(token => this.fetchIdCards(feature.url, token.accessToken)),
               )
             : auth.user$.pipe(
                 filter(user => user !== undefined),
@@ -41,20 +31,19 @@ export class IdCardsProvider {
                 mergeMap(user => this.fetchFallbackIdCards(user)),
                 startWith([]),
               )
-          : of([]).pipe(tap({next: () => this.encryptedStorageProvider.delete('id-cards')})),
+          : // TODO: find a better solution here (async pipe stuff...)
+            of([]),
       ),
     );
   }
 
   private fetchIdCards(url: string, token: string): Observable<SCIdCard[]> {
-    return this.httpClient
-      .get<SCIdCard[]>(url, {
-        headers: {
-          Authorization: `Bearer ${token}`,
-        },
-        responseType: 'json',
-      })
-      .pipe(tap({next: idCards => this.encryptedStorageProvider.set('id-cards', idCards)}));
+    return this.httpClient.get<SCIdCard[]>(url, {
+      headers: {
+        Authorization: `Bearer ${token}`,
+      },
+      responseType: 'json',
+    });
   }
 
   private fetchFallbackIdCards(user: SCUserConfiguration): Observable<SCIdCard[]> {

frontend/app/src/app/modules/profile/id-cards.spec.ts

@@ -4,7 +4,6 @@ import {HttpClient} from '@angular/common/http';
 import {AuthHelperService} from '../auth/auth-helper.service';
 import {BehaviorSubject, firstValueFrom, of} from 'rxjs';
 import {SCAuthorizationProviderType} from '@openstapps/core';
-import {EncryptedStorageProvider} from '../storage/encrypted-storage.provider';
 
 class FakeAuth {
   isAuthenticated$ = new BehaviorSubject(false);
@@ -17,7 +16,6 @@ describe('IdCards', () => {
   let configProvider: ConfigProvider;
   let httpClient: HttpClient;
   let authHelper: AuthHelperService;
-  let encryptedStorageProvider: EncryptedStorageProvider;
   let fakeAuth: FakeAuth;
 
   beforeEach(() => {
@@ -29,14 +27,10 @@ describe('IdCards', () => {
     fakeAuth = new FakeAuth();
     authHelper = jasmine.createSpyObj('AuthHelperService', ['getProvider']);
     authHelper.getProvider = jasmine.createSpy().and.returnValue(fakeAuth);
-    encryptedStorageProvider = jasmine.createSpyObj('EncryptedStorageProvider', ['get', 'set', 'delete']);
-    encryptedStorageProvider.get = jasmine.createSpy().and.resolveTo();
-    encryptedStorageProvider.set = jasmine.createSpy().and.resolveTo();
-    encryptedStorageProvider.delete = jasmine.createSpy().and.resolveTo();
   });
 
   it('should emit undefined if not logged in', async () => {
-    const provider = new IdCardsProvider(authHelper, configProvider, httpClient, encryptedStorageProvider);
+    const provider = new IdCardsProvider(authHelper, configProvider, httpClient);
     expect(await firstValueFrom(provider.getIdCards())).toEqual([]);
     expect(authHelper.getProvider).toHaveBeenCalledOnceWith('fakeAuth' as SCAuthorizationProviderType);
   });
@@ -45,7 +39,7 @@ describe('IdCards', () => {
     fakeAuth.isAuthenticated$.next(true);
     httpClient.get = jasmine.createSpy().and.returnValue(of(['abc']));
     fakeAuth.getValidToken = jasmine.createSpy().and.resolveTo({accessToken: 'fake-token'});
-    const provider = new IdCardsProvider(authHelper, configProvider, httpClient, encryptedStorageProvider);
+    const provider = new IdCardsProvider(authHelper, configProvider, httpClient);
     expect(await firstValueFrom(provider.getIdCards())).toEqual(['abc' as never]);
     expect(authHelper.getProvider).toHaveBeenCalledOnceWith('fakeAuth' as SCAuthorizationProviderType);
     // eslint-disable-next-line unicorn/no-null
@@ -58,7 +52,7 @@ describe('IdCards', () => {
   });
 
   it('should react to logins', async () => {
-    const provider = new IdCardsProvider(authHelper, configProvider, httpClient, encryptedStorageProvider);
+    const provider = new IdCardsProvider(authHelper, configProvider, httpClient);
     const observable = provider.getIdCards();
     expect(await firstValueFrom(observable)).toEqual([]);
     httpClient.get = jasmine.createSpy().and.returnValue(of(['abc']));

frontend/app/src/app/modules/profile/page/profile-page.spec.ts

@@ -15,7 +15,7 @@
 
 import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {HttpClientTestingModule} from '@angular/common/http/testing';
+import {provideHttpClientTesting} from '@angular/common/http/testing';
 import {RouterTestingModule} from '@angular/router/testing';
 import {AuthModule} from '../../auth/auth.module';
 import {ProfilePageComponent} from './profile-page.component';
@@ -27,6 +27,7 @@ import {ScheduleProvider} from '../../calendar/schedule.provider';
 import {DataProvider} from '../../data/data.provider';
 import {StAppsWebHttpClient} from '../../data/stapps-web-http-client.provider';
 import {SimpleBrowser} from '../../../util/browser.factory';
+import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
 
 describe('ProfilePage', () => {
   let component: ProfilePageComponent;
@@ -47,7 +48,8 @@ describe('ProfilePage', () => {
 
     TestBed.configureTestingModule({
       declarations: [ProfilePageComponent],
-      imports: [HttpClientTestingModule, RouterTestingModule, AuthModule, TranslateModule.forRoot()],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
+      imports: [RouterTestingModule, AuthModule, TranslateModule.forRoot()],
       providers: [
         {provide: ConfigProvider, useValue: configProvider},
         {provide: StorageProvider, useValue: storageProvider},
@@ -55,8 +57,9 @@ describe('ProfilePage', () => {
         {provide: SimpleBrowser, useValue: simpleBrowser},
         ScheduleProvider,
         DataProvider,
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   });
 

frontend/app/src/app/modules/storage/encrypted-storage.provider.ts

@@ -1,92 +0,0 @@
-import {Injectable} from '@angular/core';
-import {StorageProvider} from './storage.provider';
-import {Capacitor} from '@capacitor/core';
-import {SecureStoragePlugin} from 'capacitor-secure-storage-plugin';
-
-@Injectable({providedIn: 'root'})
-export class EncryptedStorageProvider {
-  constructor(private storageProvider: StorageProvider) {}
-
-  /**
-   * Retrieve a large value from an encrypted storage
-   * Also returns undefined if a secure context is not available (i.e. web).
-   * @param key Unique identifier of the wanted resource in storage
-   * @returns The value of the resource, if found
-   */
-  async get<T>(key: string): Promise<T | undefined> {
-    if (!Capacitor.isNativePlatform()) return undefined;
-
-    try {
-      const jwt = JSON.parse((await SecureStoragePlugin.get({key: `stapps:key:${key}`})).value);
-      const aesKey = await crypto.subtle.importKey('jwk', jwt, {name: 'AES-GCM'}, true, [
-        'encrypt',
-        'decrypt',
-      ]);
-      const iv = await this.storageProvider.get<ArrayBuffer>(`encrypted:${key}:iv`);
-
-      const encryptedIdCards = await this.storageProvider.get<ArrayBuffer>(`encrypted:${key}`);
-      const decrypted = await crypto.subtle.decrypt({name: 'AES-GCM', iv}, aesKey, encryptedIdCards);
-
-      const decompressionStream = new DecompressionStream('gzip');
-      const writer = decompressionStream.writable.getWriter();
-      writer.write(decrypted);
-      writer.close();
-
-      const decompressed = await new Response(decompressionStream.readable).arrayBuffer();
-      return JSON.parse(new TextDecoder().decode(decompressed));
-    } catch (error) {
-      console.warn(error);
-      return undefined;
-    }
-  }
-
-  /**
-   * Store a large value in an encrypted storage
-   * Does nothing if a secure context is not available (i.e. web).
-   * @param key Unique identifier of the resource in storage
-   * @param value The value to store
-   * @returns A promise that resolves when the value is stored
-   */
-  async set<T>(key: string, value: T): Promise<void> {
-    if (!Capacitor.isNativePlatform()) return undefined;
-
-    try {
-      const compressionStream = new CompressionStream('gzip');
-      const writer = compressionStream.writable.getWriter();
-      writer.write(new TextEncoder().encode(JSON.stringify(value)));
-      writer.close();
-      const encoded = await new Response(compressionStream.readable).arrayBuffer();
-
-      const iv = crypto.getRandomValues(new Uint8Array(16));
-      const aesKey = await crypto.subtle.generateKey({name: 'AES-GCM', length: 256}, true, [
-        'encrypt',
-        'decrypt',
-      ]);
-
-      await Promise.all([
-        SecureStoragePlugin.set({
-          key: `stapps:key:${key}`,
-          value: JSON.stringify(await crypto.subtle.exportKey('jwk', aesKey)),
-        }),
-        this.storageProvider.put(`encrypted:${key}:iv`, iv),
-      ]);
-
-      this.storageProvider.put<ArrayBuffer>(
-        `encrypted:${key}`,
-        await crypto.subtle.encrypt({name: 'AES-GCM', iv}, aesKey, encoded),
-      );
-    } catch (error) {
-      alert(error);
-    }
-  }
-
-  async delete(key: string): Promise<void> {
-    if (!Capacitor.isNativePlatform()) return;
-
-    await Promise.all([
-      SecureStoragePlugin.remove({key: `stapps:key:${key}`}),
-      this.storageProvider.delete(`encrypted:${key}:iv`),
-      this.storageProvider.delete(`encrypted:${key}`),
-    ]);
-  }
-}

frontend/app/src/app/util/in-range.pipe.ts

@@ -1,7 +1,7 @@
 import {Pipe, PipeTransform} from '@angular/core';
 import {SCRange, isInRange, SCISO8601DateRange} from '@openstapps/core';
-import {NormalizedInterval, differenceInMilliseconds, interval, isEqual} from 'date-fns';
-import {EMPTY, Observable, SchedulerLike, asyncScheduler, concat, defer, map, of, timer} from 'rxjs';
+import {merge, Observable, timer} from 'rxjs';
+import {distinctUntilChanged, map, startWith} from 'rxjs/operators';
 
 @Pipe({
   name: 'isInRange',
@@ -14,49 +14,28 @@ export class InRangePipe implements PipeTransform {
   }
 }
 
-export const MIN_DATE = new Date(0);
-export const MAX_DATE = new Date(1e15);
-
 @Pipe({
-  name: 'rangeToDateInterval',
+  name: 'toDateRange',
   pure: true,
   standalone: true,
 })
-export class ToDateIntervalPipe implements PipeTransform {
-  transform(value: SCISO8601DateRange): NormalizedInterval {
-    return interval(new Date(value.gte ?? value.gt ?? MIN_DATE), new Date(value.lte ?? value.lt ?? MAX_DATE));
+export class ToDateRangePipe implements PipeTransform {
+  transform(value: SCISO8601DateRange): SCRange<Date> {
+    return Object.fromEntries(Object.entries(value).map(([key, value]) => [key, new Date(value)]));
   }
 }
 
-/**
- * Returns an Observable that will change its value when the current date is within the given interval.
- */
-export function isWithinIntervalObservable(
-  value: NormalizedInterval,
-  scheduler: SchedulerLike = asyncScheduler,
-): Observable<boolean> {
-  return defer(() => {
-    const now = scheduler.now();
-    const activate = differenceInMilliseconds(value.start, now);
-    const deactivate = differenceInMilliseconds(value.end, now);
-
-    return concat(
-      of(activate <= 0 && deactivate > 0),
-      activate <= 0 ? EMPTY : timer(value.start, scheduler).pipe(map(() => true)),
-      isEqual(value.end, MAX_DATE) || deactivate <= 0
-        ? EMPTY
-        : timer(value.end, scheduler).pipe(map(() => false)),
+@Pipe({
+  name: 'isInRangeNow',
+  pure: true,
+  standalone: true,
+})
+export class InRangeNowPipe implements PipeTransform {
+  transform(value: SCRange<Date>): Observable<boolean> {
+    return merge(timer(value.lte || value.lt || 0), timer(value.gte || value.gt || 0)).pipe(
+      startWith(0),
+      map(() => isInRange(new Date(), value)),
+      distinctUntilChanged(),
     );
-  });
-}
-
-@Pipe({
-  name: 'dfnsIntervalIsNow',
-  pure: true,
-  standalone: true,
-})
-export class IntervalIsNowPipe implements PipeTransform {
-  transform(value: NormalizedInterval): Observable<boolean> {
-    return isWithinIntervalObservable(value);
   }
 }

frontend/app/src/app/util/in-range.spec.ts

@@ -1,42 +0,0 @@
-import {TestScheduler} from 'rxjs/testing';
-import {MAX_DATE, MIN_DATE, isWithinIntervalObservable} from './in-range.pipe';
-import {interval} from 'date-fns';
-
-/**
- * Test macro
- */
-function test(range: [number | undefined, number | undefined], subscribe: string, expected: string) {
-  const testScheduler = new TestScheduler((actual, expected) => {
-    expect(actual).withContext(actual.map(JSON.stringify).join('\n')).toEqual(expected);
-  });
-
-  it(`should emit "${expected}" when "${subscribe}" for range ${range[0] ?? ''}..${range[1] ?? ''}`, () => {
-    testScheduler.run(({expectObservable}) => {
-      expectObservable(
-        isWithinIntervalObservable(
-          interval(new Date(range[0] ?? MIN_DATE), new Date(range[1] ?? MAX_DATE)),
-          testScheduler,
-        ),
-        subscribe,
-      ).toBe(expected, {t: true, f: false});
-    });
-  });
-}
-
-describe('isWithinIntervalObservable', () => {
-  test([500, undefined], '1s ^', '1s (t|)');
-  test([1000, undefined], '500ms ^', '500ms f 499ms (t|)');
-
-  test([undefined, 500], '1s ^', '1s (f|)');
-  test([undefined, 1000], '500ms ^', '500ms t 499ms (f|)');
-
-  test([1000, 2000], '500ms ^', '500ms f 499ms t 999ms (f|)');
-
-  test([500, 1000], '1500ms ^', '1500ms (f|)');
-  test([500, 1000], '1s ^', '1000ms (f|)');
-  test([500, 1000], '999ms ^', '999ms t (f|)');
-  test([500, 1000], '500ms ^', '500ms t 499ms (f|)');
-  test([500, 1000], '499ms ^', '499ms f t 499ms (f|)');
-
-  test([500, 1000], '^ 750ms !', 'f 499ms t');
-});

frontend/app/src/assets/i18n/de.json

@@ -336,15 +336,11 @@
             "title": "Titel",
             "about": "Mehr Informationen",
             "label": "Signatur",
-            "starttime": "Vorgemerkt am",
             "endtime": "Abzuholen bis",
-            "storage": "Abholtheke",
-            "queue": "Position in der Warteschlange"
+            "storage": "Abholbereit"
           },
           "holds": "Bestellungen",
-          "reservations": "Vormerkungen",
-          "ordered": "Bestellt",
-          "ready": "Abholbereit"
+          "reservations": "Vormerkungen"
         },
         "checked_out": {
           "title": "Deine Ausleihen",
@@ -352,7 +348,7 @@
             "title": "Titel",
             "about": "Mehr Informationen",
             "label": "Signatur",
-            "duedate": "Leihfristende",
+            "endtime": "Leihfristende",
             "renewals": "Verlängerungen"
           }
         },

frontend/app/src/assets/i18n/en.json

@@ -336,15 +336,11 @@
             "title": "Title",
             "about": "More information",
             "label": "Shelfmark",
-            "starttime": "Reserved on",
             "endtime": "Available for pickup until",
-            "storage": "Pickup counter",
-            "queue": "Position in the queue"
+            "storage": "Available for pickup"
           },
           "holds": "orders",
-          "reservations": "reservations",
-          "ordered": "Ordered",
-          "ready": "Ready for pickup"
+          "reservations": "reservations"
         },
         "checked_out": {
           "title": "checked out items",
@@ -352,7 +348,7 @@
             "title": "Title",
             "about": "More information",
             "label": "Label",
-            "duedate": "Due date",
+            "endtime": "Due date",
             "renewals": "Renewals"
           }
         },

frontend/app/src/environments/environment.production.ts

@@ -21,7 +21,7 @@ export const environment = {
   backend_url: 'https://mobile.server.uni-frankfurt.de',
   app_host: 'mobile.app.uni-frankfurt.de',
   custom_url_scheme: 'de.anyschool.app',
-  backend_version: '3.3.0',
+  backend_version: '3.1.0',
   production: true,
 };
 

frontend/app/src/environments/environment.ts

@@ -21,7 +21,7 @@ export const environment = {
   backend_url: 'https://mobile.server.uni-frankfurt.de',
   app_host: 'mobile.app.uni-frankfurt.de',
   custom_url_scheme: 'de.anyschool.app',
-  backend_version: '999.0.0',
+  backend_version: '3.1.0',
   production: false,
 };
 

images/app-builder/Dockerfile

@@ -8,7 +8,8 @@ LABEL version="2.0.0" \
 ### Configure versions to install
 ENV	ANDROID_APIS="android-34" \
   ANDROID_BUILD_TOOLS_VERSION="34.0.0" \
-  NPM_VERSION="^10.0.0" \
+  NODE_VERSION="22.x" \
+  NPM_VERSION="^9.0.0" \
   IONIC_VERSION="^6.0.0" \
   CORDOVA_RES_VERSION="latest" \
   ### Configure download URLs
@@ -19,7 +20,6 @@ ENV	ANDROID_APIS="android-34" \
   ANDROID_SDK_ROOT="/opt/android-sdk" \
   ### Installation files
   SCRIPTS_DIRECTORY="scripts" \
-  NODE_SETUP_SCRIPT="node_setup.sh" \
   TMP_PROJECT_NAME="tmp-project"
 
 ### Set $PATH
@@ -96,25 +96,25 @@ RUN	curl $ANDROID_SDK_TOOLS_DOWNLOAD_URL > /tmp/android-sdk.zip && \
   sdkmanager "platforms;$ANDROID_APIS" "build-tools;$ANDROID_BUILD_TOOLS_VERSION"
 
 ### Copy scripts directory into the tmp folder, so it's available to the following commands
-COPY $SCRIPTS_DIRECTORY/$NODE_SETUP_SCRIPT /tmp/
 
-RUN	bash /tmp/$NODE_SETUP_SCRIPT && apt-get install -y nodejs && \
+RUN	curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION} | bash && \
+  apt-get install -y nodejs && \
   ### Install wanted npm version
   npm install -g --unsafe-perm npm@$NPM_VERSION && \
   ### Install needed global npm packages
   npm install -g --unsafe-perm @ionic/cli@$IONIC_VERSION cordova-res@$CORDOVA_RES_VERSION
 
 RUN cd / && ionic start $TMP_PROJECT_NAME blank --type=angular --capacitor --no-git --no-interactive && \
-    cd $TMP_PROJECT_NAME && ionic capacitor add android && export NG_CLI_ANALYTICS=ci && ionic capacitor build android --no-open && \
-    cd android && ./gradlew assembleDebug && \
-    cd / && rm -rf $TMP_PROJECT_NAME
+  cd $TMP_PROJECT_NAME && ionic capacitor add android && export NG_CLI_ANALYTICS=ci && ionic capacitor build android --no-open && \
+  cd android && ./gradlew assembleDebug && \
+  cd / && rm -rf $TMP_PROJECT_NAME
 
 
 ### Compatibility with musl libc
 RUN ln -s /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1
 
 ### PNPM
-RUN corepack enable && corepack prepare pnpm@latest-8 --activate
+RUN corepack enable
 
 ### Set working directory
 WORKDIR /app

images/app-builder/scripts/node_setup.sh

@@ -1,108 +0,0 @@
-#!/bin/bash
-
-# Logger Function
-log() {
-  local message="$1"
-  local type="$2"
-  local timestamp=$(date '+%Y-%m-%d %H:%M:%S')
-  local color
-  local endcolor="\033[0m"
-
-  case "$type" in
-    "info") color="\033[38;5;79m" ;;
-    "success") color="\033[1;32m" ;;
-    "error") color="\033[1;31m" ;;
-    *) color="\033[1;34m" ;;
-  esac
-
-  echo -e "${color}${timestamp} - ${message}${endcolor}"
-}
-
-# Error handler function
-handle_error() {
-  local exit_code=$1
-  local error_message="$2"
-  log "Error: $error_message (Exit Code: $exit_code)" "error"
-  exit $exit_code
-}
-
-# Function to check for command availability
-command_exists() {
-  command -v "$1" &> /dev/null
-}
-
-check_os() {
-    if ! [ -f "/etc/debian_version" ]; then
-        echo "Error: This script is only supported on Debian-based systems."
-        exit 1
-    fi
-}
-
-# Function to Install the script pre-requisites
-install_pre_reqs() {
-    log "Installing pre-requisites" "info"
-
-    # Run 'apt-get update'
-    if ! apt-get update -y; then
-        handle_error "$?" "Failed to run 'apt-get update'"
-    fi
-
-    # Run 'apt-get install'
-    if ! apt-get install -y apt-transport-https ca-certificates curl gnupg; then
-        handle_error "$?" "Failed to install packages"
-    fi
-
-    if ! mkdir -p /usr/share/keyrings; then
-      handle_error "$?" "Makes sure the path /usr/share/keyrings exist or run ' mkdir -p /usr/share/keyrings' with sudo"
-    fi
-
-    rm -f /usr/share/keyrings/nodesource.gpg || true
-    rm -f /etc/apt/sources.list.d/nodesource.list || true
-
-    # Run 'curl' and 'gpg'
-    if ! curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg; then
-      handle_error "$?" "Failed to download and import the NodeSource signing key"
-    fi
-}
-
-# Function to configure the Repo
-configure_repo() {
-    local node_version=$1
-
-    arch=$(dpkg --print-architecture)
-    if [ "$arch" != "amd64" ] && [ "$arch" != "arm64" ] && [ "$arch" != "armhf" ]; then
-      handle_error "1" "Unsupported architecture: $arch. Only amd64, arm64, and armhf are supported."
-    fi
-
-    echo "deb [arch=$arch signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$node_version nodistro main" | tee /etc/apt/sources.list.d/nodesource.list > /dev/null
-
-    # N|solid Config
-    echo "Package: nsolid" | tee /etc/apt/preferences.d/nsolid > /dev/null
-    echo "Pin: origin deb.nodesource.com" | tee -a /etc/apt/preferences.d/nsolid > /dev/null
-    echo "Pin-Priority: 600" | tee -a /etc/apt/preferences.d/nsolid > /dev/null
-
-    # Nodejs Config
-    echo "Package: nodejs" | tee /etc/apt/preferences.d/nodejs > /dev/null
-    echo "Pin: origin deb.nodesource.com" | tee -a /etc/apt/preferences.d/nodejs > /dev/null
-    echo "Pin-Priority: 600" | tee -a /etc/apt/preferences.d/nodejs > /dev/null
-
-    # Run 'apt-get update'
-    if ! apt-get update -y; then
-        handle_error "$?" "Failed to run 'apt-get update'"
-    else
-        log "Repository configured successfully."
-        log "To install Node.js, run: apt-get install nodejs -y" "info"
-        log "You can use N|solid Runtime as a node.js alternative" "info"
-        log "To install N|solid Runtime, run: apt-get install nsolid -y \n" "success"
-    fi
-}
-
-# Define Node.js version
-NODE_VERSION="18.x"
-
-# Check OS
-check_os
-
-# Main execution
-install_pre_reqs || handle_error $? "Failed installing pre-requisites"
-configure_repo "$NODE_VERSION" || handle_error $? "Failed configuring repository"

images/app-cypress/Dockerfile

@@ -1,5 +1,5 @@
 ### Set base image
-FROM cypress/base:18.16.1
+FROM cypress/base:22.0.0
 
 USER root
 
@@ -83,6 +83,9 @@ RUN apt-get update && \
 # Add a link to the browser that allows Cypress to find it
 RUN ln -s /usr/bin/microsoft-edge /usr/bin/edge
 
+### PNPM
+RUN corepack enable
+
 # versions of local tools
 RUN echo  " node version:    $(node -v) \n" \
   "npm version:     $(npm -v) \n" \

images/node-base/Dockerfile

@@ -1,7 +1,9 @@
-FROM node:18-alpine3.18
+FROM node:22-alpine
 
 RUN apk update && apk add git curl jq && mkdir -p /opt
 
+RUN corepack enable
+
 COPY --chown=root:root wait-for.sh /opt/wait-for
 
 RUN chmod +x /opt/wait-for && ln -s /opt/wait-for /usr/local/bin/wait-for

images/node-builder/Dockerfile

@@ -1,7 +1,7 @@
-FROM node:18-alpine3.18
+FROM node:22-alpine
 
 RUN apk update && apk add git jq curl python3 build-base
 
-RUN npm install turbo pnpm --global
+RUN corepack enable
 
 CMD []

package.json

@@ -2,9 +2,10 @@
   "name": "@openstapps/openstapps",
   "private": true,
   "engines": {
-    "node": "^18.19.1",
-    "pnpm": "^8.15.4"
+    "node": "^22.0.0",
+    "pnpm": "^8.15.5"
   },
+  "packageManager": "pnpm@8.15.5",
   "scripts": {
     "build": "dotenv -c -- turbo run build",
     "build:full": "dotenv -c -- turbo run syncpack build lint format --summarize",
@@ -13,12 +14,11 @@
     "deploy": "dotenv -c -- turbo run deploy --concurrency=1",
     "dev": "dotenv -c -- turbo run dev",
     "docs": "dotenv -c -- turbo run docs && typedoc && mkdir docs/api && cp packages/core/lib/api-doc.html docs/api/index.html && cp packages/core/lib/openapi.json docs/api/openapi.json && cp -r packages/core/lib/schema docs/api/schema",
-    "docs:serve": "http-server docs -p 8080 -o",
     "format": "dotenv -c -- turbo run format",
     "format:fix": "dotenv -c -- turbo run format:fix",
     "lint": "dotenv -c -- turbo run lint",
     "lint:fix": "dotenv -c -- turbo run lint:fix",
-    "publish-packages": "pnpm changeset version && pnpm syncpack:fix && pnpm install && pnpm format:fix && git add . && git commit -m \"docs: update changelogs for release\" -m \"ci: publish release\" && git push && pnpm changeset tag && git push --follow-tags",
+    "publish-packages": "pnpm changeset version && pnpm syncpack:fix && pnpm install && git add . && git commit -m \"docs: update changelogs for release\n\nci: publish release\" && git push && pnpm changeset tag && git push --follow-tags",
     "syncpack": "syncpack list-mismatches && syncpack lint-semver-ranges --types dev,peer,prod",
     "syncpack:fix": "syncpack format && syncpack fix-mismatches",
     "test": "trap 'node coverage.mjs' EXIT && dotenv -c -- turbo run test",
@@ -31,16 +31,15 @@
   "devDependencies": {
     "@changesets/changelog-git": "0.1.14",
     "@changesets/cli": "2.26.1",
-    "cobertura-merge": "1.0.4",
+    "merge-cobertura": "1.0.1",
     "deepmerge": "4.3.1",
     "dotenv-cli": "7.2.1",
     "glob": "10.3.10",
-    "http-server": "14.1.1",
     "junit-report-merger": "6.0.3",
     "prettier": "3.1.1",
     "syncpack": "12.3.0",
-    "turbo": "1.10.16",
-    "turbo-ignore": "1.10.16",
+    "turbo": "1.13.3",
+    "turbo-ignore": "1.13.3",
     "typedoc": "0.25.12",
     "typescript": "5.4.2"
   }

packages/api-cli/CHANGELOG.md

@@ -1,35 +1,12 @@
 # @openstapps/api-cli
 
-## 3.3.2
-
-### Patch Changes
-
-- @openstapps/core@3.3.2
-- @openstapps/core-tools@3.3.2
-- @openstapps/api@3.3.2
-
-## 3.3.0
-
-### Minor Changes
-
-- 688bc5f2: v3.3.0 changes
-
-### Patch Changes
-
-- Updated dependencies [688bc5f2]
-  - @openstapps/api@3.3.0
-  - @openstapps/core@3.3.0
-  - @openstapps/eslint-config@3.0.0
-  - @openstapps/core-tools@3.3.0
-  - @openstapps/logger@3.0.0
-
 ## 3.2.0
 
 ### Patch Changes
 
 - Updated dependencies [912ae422]
-  - @openstapps/core@3.2.0
-  - @openstapps/api@3.2.0
+  - @openstapps/core@4.0.0
+  - @openstapps/api@4.0.0
   - @openstapps/core-tools@3.0.0
   - @openstapps/logger@3.0.0
 

packages/api-cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/api-cli",
   "description": "CLI client for @openstapps/api",
-  "version": "3.3.2",
+  "version": "3.2.0",
   "type": "module",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/api.git",
@@ -43,7 +43,7 @@
     "@types/cli-progress": "3.11.0",
     "@types/express": "4.17.17",
     "@types/fs-extra": "9.0.13",
-    "@types/json-schema": "7.0.11",
+    "@types/json-schema": "7.0.15",
     "@types/junit-report-builder": "3.0.0",
     "@types/mocha": "10.0.1",
     "@types/node": "18.15.3",

packages/api-plugin/CHANGELOG.md

@@ -1,30 +1,12 @@
 # @openstapps/api-plugin
 
-## 3.3.2
-
-### Patch Changes
-
-- @openstapps/core@3.3.2
-- @openstapps/core-tools@3.3.2
-- @openstapps/api@3.3.2
-
-## 3.3.0
-
-### Patch Changes
-
-- Updated dependencies [688bc5f2]
-  - @openstapps/api@3.3.0
-  - @openstapps/core@3.3.0
-  - @openstapps/core-tools@3.3.0
-  - @openstapps/logger@3.0.0
-
 ## 3.2.0
 
 ### Patch Changes
 
 - Updated dependencies [912ae422]
-  - @openstapps/core@3.2.0
-  - @openstapps/api@3.2.0
+  - @openstapps/core@4.0.0
+  - @openstapps/api@4.0.0
   - @openstapps/core-tools@3.0.0
   - @openstapps/logger@3.0.0
 

packages/api-plugin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/api-plugin",
   "description": "Node.js library to interact with the StApps backend service",
-  "version": "3.3.2",
+  "version": "3.2.0",
   "type": "module",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/api.git",
@@ -38,7 +38,7 @@
     "@openstapps/logger": "workspace:*",
     "@types/body-parser": "1.19.2",
     "@types/express": "4.17.17",
-    "@types/json-schema": "7.0.11",
+    "@types/json-schema": "7.0.15",
     "@types/morgan": "1.9.4",
     "body-parser": "1.20.2",
     "express": "4.18.2",

packages/api/CHANGELOG.md

@@ -1,28 +1,11 @@
 # @openstapps/api
 
-## 3.3.2
-
-### Patch Changes
-
-- @openstapps/core@3.3.2
-
-## 3.3.0
-
-### Minor Changes
-
-- 688bc5f2: v3.3.0 changes
-
-### Patch Changes
-
-- Updated dependencies [688bc5f2]
-  - @openstapps/core@3.3.0
-
 ## 3.2.0
 
 ### Patch Changes
 
 - Updated dependencies [912ae422]
-  - @openstapps/core@3.2.0
+  - @openstapps/core@4.0.0
 
 ## 3.1.1
 

packages/api/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/api",
   "description": "Node.js library to interact with the StApps backend service",
-  "version": "3.3.2",
+  "version": "3.2.0",
   "type": "module",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/api.git",

packages/core-tools/CHANGELOG.md

@@ -1,21 +1,5 @@
 # @openstapps/core-tools
 
-## 3.3.2
-
-### Patch Changes
-
-- Updated dependencies [802a7a3f]
-  - @openstapps/easy-ast@3.3.2
-
-## 3.3.0
-
-### Patch Changes
-
-- Updated dependencies [688bc5f2]
-  - @openstapps/easy-ast@3.3.0
-  - @openstapps/collection-utils@3.0.0
-  - @openstapps/logger@3.0.0
-
 ## 3.0.0
 
 ### Major Changes

packages/core-tools/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/core-tools",
   "description": "Tools to convert and validate StAppsCore",
-  "version": "3.3.2",
+  "version": "3.0.0",
   "type": "module",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/core-tools.git",
@@ -62,7 +62,7 @@
     "mustache": "4.2.0",
     "openapi-types": "12.1.0",
     "plantuml-encoder": "1.4.0",
-    "re2": "1.18.2",
+    "re2": "1.21.0",
     "toposort": "2.0.2",
     "ts-json-schema-generator": "1.2.0"
   },
@@ -73,7 +73,7 @@
     "@types/chai": "4.3.5",
     "@types/fs-extra": "9.0.13",
     "@types/glob": "8.1.0",
-    "@types/json-schema": "7.0.11",
+    "@types/json-schema": "7.0.15",
     "@types/mocha": "10.0.1",
     "@types/mustache": "4.2.2",
     "@types/node": "18.15.3",

packages/core/CHANGELOG.md

@@ -1,21 +1,5 @@
 # @openstapps/core
 
-## 3.3.2
-
-### Patch Changes
-
-- @openstapps/core-tools@3.3.2
-
-## 3.3.0
-
-### Minor Changes
-
-- 688bc5f2: v3.3.0 changes
-
-### Patch Changes
-
-- @openstapps/core-tools@3.3.0
-
 ## 3.2.0
 
 ### Minor Changes

packages/core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/core",
   "description": "StAppsCore - Generalized model of data",
-  "version": "3.3.2",
+  "version": "3.2.0",
   "type": "module",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/core.git",
@@ -60,7 +60,7 @@
     "@openstapps/tsconfig": "workspace:*",
     "@types/chai": "4.3.5",
     "@types/json-patch": "0.0.30",
-    "@types/json-schema": "7.0.11",
+    "@types/json-schema": "7.0.15",
     "@types/mocha": "10.0.1",
     "@types/node": "18.15.3",
     "c8": "7.14.0",

packages/easy-ast/CHANGELOG.md

@@ -1,22 +1,5 @@
 # @openstapps/easy-ast
 
-## 3.3.2
-
-### Patch Changes
-
-- 802a7a3f: Fixed docs generation
-
-## 3.3.0
-
-### Minor Changes
-
-- 688bc5f2: v3.3.0 changes
-
-### Patch Changes
-
-- @openstapps/collection-utils@3.0.0
-- @openstapps/logger@3.0.0
-
 ## 3.0.0
 
 ### Major Changes

packages/easy-ast/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/easy-ast",
   "description": "Tool to easily handle TypeScript AST",
-  "version": "3.3.2",
+  "version": "3.0.0",
   "type": "module",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/core-tools.git",

packages/easy-ast/test/project/alias-like.ast-test.ts

@@ -17,8 +17,10 @@ import {EasyAstSpecType} from '../easy-ast-spec-type.js';
 import {LightweightDefinitionKind} from '../../src/index.js';
 import {TypeFlags} from 'typescript';
 
+// @ts-expect-error unused type
 type TestTypeAlias = number | string;
 
+// @ts-expect-error unused type
 enum TestEnum {
   Foo,
   Bar,

packages/easy-ast/test/project/array-like.ast-test.ts

@@ -18,9 +18,13 @@ import {LightweightDefinitionKind} from '../../src/index.js';
 
 interface Random {}
 
+// @ts-expect-error unused type
 type TestArrayGeneric = Array<string>;
+// @ts-expect-error unused type
 type TestArrayLiteral = number[];
+// @ts-expect-error unused type
 type TestArrayReferenceGeneric = Array<Random>;
+// @ts-expect-error unused type
 type TestArrayReferenceLiteral = Random[];
 
 export const testConfig: EasyAstSpecType = {

packages/easy-ast/test/project/class-like.ast-test.ts

@@ -16,10 +16,12 @@
 import {EasyAstSpecType} from '../easy-ast-spec-type.js';
 import {LightweightDefinitionKind} from '../../src/index.js';
 
+// @ts-expect-error unused type
 interface TestInterface {
   foo: number;
 }
 
+// @ts-expect-error unused type
 class TestClass {
   bar: string = 'test';
 }

packages/easy-ast/test/project/comment.ast-test.ts

@@ -22,8 +22,10 @@ import {LightweightDefinitionKind} from '../../src/index.js';
  * Class description
  *
  * More description
+ *
  * @classTag classParameter1 classParameter2
  */
+// @ts-expect-error unused type
 interface TestInterface {
   /**
    * Property comment
@@ -31,6 +33,7 @@ interface TestInterface {
    * Property description
    *
    * More description
+   *
    * @propertyTag propertyParameter1 propertyParameter2
    */
   foo: string;
@@ -42,8 +45,10 @@ interface TestInterface {
  * Class description
  *
  * More description
+ *
  * @classTag classParameter1 classParameter2
  */
+// @ts-expect-error unused type
 class TestClass {
   /**
    * Property comment
@@ -51,6 +56,7 @@ class TestClass {
    * Property description
    *
    * More description
+   *
    * @propertyTag propertyParameter1 propertyParameter2
    */
   foo = 1;
@@ -62,8 +68,10 @@ class TestClass {
  * Enum description
  *
  * More description
+ *
  * @enumTag enumParameter1
  */
+// @ts-expect-error unused type
 enum TestAlias {}
 
 export const testConfig: EasyAstSpecType = {

packages/easy-ast/test/project/default-generics.ast-test.ts

@@ -20,6 +20,7 @@ interface Test1<T = number> {
   foo: T;
 }
 
+// @ts-expect-error unused type
 interface Test2 {
   bar: Test1;
 }

packages/easy-ast/test/project/enum-specified-value.ast-test.ts

@@ -17,11 +17,13 @@ import {EasyAstSpecType} from '../easy-ast-spec-type.js';
 import {LightweightDefinitionKind} from '../../src/index.js';
 import {TypeFlags} from 'typescript';
 
+// @ts-expect-error unused type
 enum TestAuto {
   Foo,
   Bar,
 }
 
+// @ts-expect-error unused type
 enum TestSpecified {
   YES = 'yes',
   NO = 'no',

packages/easy-ast/test/project/generics.ast-test.ts

@@ -18,6 +18,7 @@ import {LightweightDefinitionKind} from '../../src/index.js';
 
 interface $Random {}
 
+// @ts-expect-error unused type
 interface Generics {
   baz: Foo<number, $Random>;
 }

packages/easy-ast/test/project/index-signature.ast-test.ts

@@ -18,10 +18,12 @@ import {LightweightDefinitionKind} from '../../src/index.js';
 
 interface $Random {}
 
+// @ts-expect-error unused
 interface IndexSignatureObject {
   [key: string]: $Random;
 }
 
+// @ts-expect-error unused
 interface IndexSignaturePrimitive {
   [key: string]: number;
 }

packages/easy-ast/test/project/ineritance.ast-test.ts

@@ -26,6 +26,7 @@ interface $BaseInterface2 {
 
 class $BaseClass {}
 
+// @ts-expect-error unused
 class InheritingClass extends $BaseClass implements $BaseInterface<number>, $BaseInterface2 {
   bar: string = '';