WIP

refactor: fix map controlls
refactor: id-cards related test
2026-10-04 16:52:12 +00:00 · 2026-10-02 19:52:32 +02:00 · 2026-10-01 18:10:57 +02:00 · 2026-10-01 16:44:56 +02:00 · 2026-10-01 16:44:51 +02:00 · 2026-10-01 10:53:00 +02:00
398 changed files with 8914 additions and 11413 deletions
@@ -29,19 +29,6 @@ const menus = [
          },
        },
      },
-      {
-        icon: 'local_library',
-        route: '/hebis-search',
-        title: 'library catalog',
-        translations: {
-          de: {
-            title: 'Bibliothekskatalog',
-          },
-          en: {
-            title: 'library catalog',
-          },
-        },
-      },
      {
        icon: 'inventory_2',
        route: '/catalog',
@@ -137,20 +124,6 @@ const menus = [
          },
        },
      },
-      {
-        authProvider: 'paia',
-        icon: 'badge',
-        route: '/library-account',
-        title: 'library account',
-        translations: {
-          de: {
-            title: 'Bibliothekskonto',
-          },
-          en: {
-            title: 'library account',
-          },
-        },
-      },
      {
        icon: 'settings',
        route: '/settings',
@@ -13,42 +13,23 @@ const config = {
    default: {
      client: {
        clientId: '1cac3f99-33fa-4234-8438-979f07e0cdab',
-        scopes: '',
-        url: 'https://cas.rz.uni-frankfurt.de/cas/oauth2.0',
+        scopes: 'openid profile email offline_access',
+        url: 'https://idp.ub.uni-frankfurt.de/idp/profile/oidc',
      },
      endpoints: {
-        authorization: 'https://cas.rz.uni-frankfurt.de/cas/oauth2.0/authorize',
-        endSession: 'https://cas.rz.uni-frankfurt.de/cas/logout',
+        authorization: 'https://idp.ub.uni-frankfurt.de/idp/profile/oidc/authorize',
+        endSession: 'https://idp.ub.uni-frankfurt.de/idp/profile/oidc/end-session',
        mapping: {
-          id: '$.id',
-          email: '$.attributes.mailPrimaryAddress',
-          familyName: '$.attributes.sn',
-          givenName: '$.attributes.givenName',
-          name: '$.attributes.givenName',
-          role: '$.attributes.eduPersonPrimaryAffiliation',
-          studentId: '$.attributes.employeeNumber',
-        },
-        token: 'https://cas.rz.uni-frankfurt.de/cas/oauth2.0/accessToken',
-        userinfo: 'https://cas.rz.uni-frankfurt.de/cas/oauth2.0/profile',
-      },
-    },
-    paia: {
-      client: {
-        clientId: '',
-        scopes: '',
-        url: 'https://hds.hebis.de/Shibboleth.sso/UBFFM?target=https://hds.hebis.de/ubffm/paia_login_stub.php',
-      },
-      endpoints: {
-        authorization:
-          'https://hds.hebis.de/Shibboleth.sso/UBFFM?target=https://hds.hebis.de/ubffm/paia_login_stub.php',
-        endSession: 'https://ubffm.hds.hebis.de/Shibboleth.sso/Logout',
-        mapping: {
-          id: '$.email',
+          id: '$.preferred_username',
+          email: '$.mailPrimaryAddress',
+          familyName: '$.family_name',
+          givenName: '$.given_name',
          name: '$.name',
-          role: '$.type',
+          role: '$.eduPersonPrimaryAffiliation',
+          studentId: '$.employeeNumber',
        },
-        token: 'https://hds.hebis.de/paia/auth/login',
-        userinfo: 'https://hds.hebis.de/paia/core',
+        token: 'https://idp.ub.uni-frankfurt.de/idp/profile/oidc/token',
+        userinfo: 'https://idp.ub.uni-frankfurt.de/idp/profile/oidc/userinfo',
      },
    },
  },
@@ -60,16 +41,6 @@ const config = {
          authProvider: 'default',
          url: 'https://his-self-service.rz.uni-frankfurt.de',
        },
-        daia: {
-          url: 'https://daia.hebis.de/DAIA2/UB_Frankfurt',
-        },
-        hebisProxy: {
-          url: 'https://proxy.ub.uni-frankfurt.de/login?qurl=',
-        },
-        paia: {
-          authProvider: 'paia',
-          url: 'https://hds.hebis.de/paia/core',
-        },
        /** TODO: idCards: {
          authProvider: 'default',
          url: 'TODO',
@@ -36,7 +36,7 @@
    "format:fix": "prettier --write . --ignore-path ../../.gitignore",
    "lint": "tsc --noEmit && eslint --ext .ts src/",
    "lint:fix": "eslint --fix --ext .ts src/",
-    "start": "cross-env NODE_CONFIG_ENV=elasticsearch ALLOW_NO_TRANSPORT=true node app.js",
+    "start": "cross-env NODE_CONFIG_ENV=elasticsearch ALLOW_NO_TRANSPORT=true NODE_APP_INSTANCE=\"f-u\" node app.js",
    "start:debug": "cross-env STAPPS_LOG_LEVEL=31 NODE_CONFIG_ENV=elasticsearch ALLOW_NO_TRANSPORT=true node app.js",
    "test": "pnpm run test:unit",
    "test:integration": "sh integration-test.sh",
@@ -53,7 +53,7 @@
    "@types/geojson": "1.0.6",
    "@types/node": "22.15.31",
    "@types/node-cron": "3.0.7",
-    "@types/nodemailer": "6.4.7",
+    "@types/nodemailer": "8.0.2",
    "@types/promise-queue": "2.2.0",
    "@types/uuid": "8.3.4",
    "body-parser": "1.20.3",
@@ -69,7 +69,7 @@
    "nock": "13.3.1",
    "node-cache": "5.1.2",
    "node-cron": "3.0.2",
-    "nodemailer": "6.9.9",
+    "nodemailer": "8.0.11",
    "prom-client": "14.1.1",
    "promise-queue": "2.2.5",
    "uuid": "8.3.2"
@@ -100,7 +100,7 @@
    "supertest": "6.3.3",
    "ts-node": "10.9.2",
    "tsup": "8.5.0",
-    "typescript": "5.4.2"
+    "typescript": "5.9.3"
  },
  "tsup": {
    "entry": [
@@ -15,7 +15,7 @@
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
 import {Logger, SMTP} from '@openstapps/logger';
-import {MailOptions} from 'nodemailer/lib/sendmail-transport';
+import {SendMailOptions} from 'nodemailer';
 import Queue from 'promise-queue';
 /**
 * A queue that can send mails in serial
@@ -36,7 +36,7 @@ export class MailQueue {
   * the transport gets ready this mails are getting pushed in to
   * the normal queue.
   */
-  dryQueue: MailOptions[];
+  dryQueue: SendMailOptions[];

  /**
   * A queue that saves mails, that are being sent in series
@@ -68,7 +68,7 @@ export class MailQueue {
   * Adds a mail into the queue so it gets send when the queue is ready
   * @param mail Information required for sending a mail
   */
-  private async addToQueue(mail: MailOptions) {
+  private async addToQueue(mail: SendMailOptions) {
    return this.queue.add<string>(() => this.transport.sendMail(mail));
  }

@@ -99,7 +99,7 @@ export class MailQueue {
   * Push a mail into the queue so it gets send when the queue is ready
   * @param mail Information required for sending a mail
   */
-  public async push(mail: MailOptions) {
+  public async push(mail: SendMailOptions) {
    if (this.transport.isVerified()) {
      await this.addToQueue(mail);
    } else {
@@ -19,7 +19,7 @@ import sinon from 'sinon';
 import {MailQueue} from '../../src/notification/mail-queue.js';
 import {expect} from 'chai';
 import Queue from 'promise-queue';
-import {MailOptions} from 'nodemailer/lib/sendmail-transport';
+import {SendMailOptions} from 'nodemailer';
 import {getTransport, TRANSPORT_SEND_RESPONSE} from '../common.js';

 describe('MailQueue', async function () {
@@ -54,7 +54,7 @@ describe('MailQueue', async function () {
    const transport = getTransport(false);
    // @ts-expect-error not assignable
    const mailQueue = new MailQueue(transport);
-    const mail: MailOptions = {from: 'Foo', subject: 'Foo Subject'};
+    const mail: SendMailOptions = {from: 'Foo', subject: 'Foo Subject'};
    for (let i = 0; i < numberOfMails; i++) {
      await mailQueue.push(mail);
    }
@@ -70,7 +70,7 @@ describe('MailQueue', async function () {
    const queueAddStub = sandbox.stub(Queue.prototype, 'add');
    // @ts-expect-error not assignable
    const mailQueue = new MailQueue(getTransport(false));
-    const mail: MailOptions = {};
+    const mail: SendMailOptions = {};
    mailQueue.push(mail);

    expect(queueAddStub.called).to.be.false;
@@ -81,7 +81,7 @@ describe('MailQueue', async function () {
    const transport = getTransport(false);
    // @ts-expect-error not assignable
    const mailQueue = new MailQueue(transport);
-    const mail: MailOptions = {from: 'Foo', subject: 'Foo Subject'};
+    const mail: SendMailOptions = {from: 'Foo', subject: 'Foo Subject'};
    // fake that transport is verified
    transport.isVerified = () => true;
    mailQueue.push(mail);
@@ -97,7 +97,7 @@ describe('MailQueue', async function () {
    const transport = getTransport(false);
    // @ts-expect-error not assignable
    const mailQueue = new MailQueue(transport);
-    const mail: MailOptions = {from: 'Foo', subject: 'Foo Subject'};
+    const mail: SendMailOptions = {from: 'Foo', subject: 'Foo Subject'};
    // fake that transport is verified
    transport.isVerified = () => true;
    await mailQueue.push(mail);
@@ -51,7 +51,7 @@
    "is-cidr": "4.0.2",
    "mustache": "4.2.0",
    "semver": "7.6.0",
-    "typescript": "5.4.2"
+    "typescript": "5.9.3"
  },
  "devDependencies": {
    "@openstapps/api-cli": "workspace:*",
@@ -22,7 +22,7 @@ const config = {
        'plugin:unicorn/recommended',
        'prettier',
      ],
-      plugins: ['eslint-plugin-unicorn', 'eslint-plugin-jsdoc'],
+      plugins: ['eslint-plugin-unicorn', 'eslint-plugin-jsdoc', '@stylistic/eslint-plugin'],
      settings: {
        jsdoc: {
          mode: 'typescript',
@@ -76,7 +76,7 @@ const config = {
            ],
          },
        ],
-
+        '@stylistic/lines-between-class-members': ['error', 'always'],
        '@typescript-eslint/explicit-module-boundary-types': 'off',
        '@typescript-eslint/no-unused-vars': [
          'error',
@@ -85,7 +85,6 @@ const config = {
            argsIgnorePattern: '^_',
          },
        ],
-        '@typescript-eslint/lines-between-class-members': ['error', 'always'],
        '@typescript-eslint/no-explicit-any': 'error',
        '@typescript-eslint/no-non-null-assertion': 'off',
      },
@@ -19,11 +19,12 @@
    "@openstapps/tsconfig": "workspace:*",
    "@types/node": "22.15.31",
    "eslint": "8.57.0",
-    "typescript": "5.4.2"
+    "typescript": "5.9.3"
  },
  "peerDependencies": {
-    "@typescript-eslint/eslint-plugin": "7.11.0",
-    "@typescript-eslint/parser": "7.11.0",
+    "@stylistic/eslint-plugin": "5.10.0",
+    "@typescript-eslint/eslint-plugin": "8.39.1",
+    "@typescript-eslint/parser": "8.39.1",
    "eslint": "8.57.0",
    "eslint-config-prettier": "9.1.0",
    "eslint-plugin-jsdoc": "48.2.1",
@@ -9,7 +9,8 @@ const config = {
  trailingComma: 'all',
  bracketSpacing: false,
  arrowParens: 'avoid',
-  endOfLine: 'lf'
+  endOfLine: 'lf',
+  htmlWhitespaceSensitivity: 'strict'
 }

 module.exports = config;
@@ -64,7 +64,7 @@
    "mocha-junit-reporter": "2.2.0",
    "ts-node": "10.9.2",
    "tsup": "8.5.0",
-    "typescript": "5.4.2"
+    "typescript": "5.9.3"
  },
  "tsup": {
    "entry": [
@@ -55,7 +55,7 @@
    "nock": "13.3.1",
    "ts-node": "10.9.2",
    "tsup": "8.5.0",
-    "typescript": "5.4.2"
+    "typescript": "5.9.3"
  },
  "tsup": {
    "entry": [
@@ -44,7 +44,7 @@
    "@types/express": "4.17.17",
    "@types/node": "22.15.31",
    "tsup": "8.5.0",
-    "typescript": "5.4.2"
+    "typescript": "5.9.3"
  },
  "tsup": {
    "entry": [
@@ -19,7 +19,7 @@
        "plugin:unicorn/recommended",
        "prettier"
      ],
-      "plugins": ["eslint-plugin-unicorn", "eslint-plugin-jsdoc"],
+      "plugins": ["eslint-plugin-unicorn", "eslint-plugin-jsdoc", "@stylistic/eslint-plugin"],
      "settings": {
        "jsdoc": {
          "mode": "typescript"
@@ -63,9 +63,10 @@
            "argsIgnorePattern": "^_"
          }
        ],
-        "@typescript-eslint/lines-between-class-members": ["error", "always"],
+        "@stylistic/lines-between-class-members": ["error", "always"],
        "@typescript-eslint/no-explicit-any": "error",
-        "@angular-eslint/use-lifecycle-interface": "error"
+        "@angular-eslint/use-lifecycle-interface": "error",
+        "@angular-eslint/prefer-standalone": "off"
      }
    },
    {
@@ -40,6 +40,16 @@
                "glob": "CHANGELOG.md",
                "input": ".",
                "output": "assets"
+              },
+              {
+                "glob": "maplibre-gl-worker.mjs",
+                "input": "node_modules/maplibre-gl/dist",
+                "output": "/"
+              },
+              {
+                "glob": "maplibre-gl-shared.mjs",
+                "input": "node_modules/maplibre-gl/dist",
+                "output": "/"
              }
            ],
            "styles": [
@@ -195,6 +205,30 @@
    },
    "@ionic/angular-toolkit:page": {
      "styleext": "scss"
+    },
+    "@schematics/angular:component": {
+      "type": "component"
+    },
+    "@schematics/angular:directive": {
+      "type": "directive"
+    },
+    "@schematics/angular:service": {
+      "type": "service"
+    },
+    "@schematics/angular:guard": {
+      "typeSeparator": "."
+    },
+    "@schematics/angular:interceptor": {
+      "typeSeparator": "."
+    },
+    "@schematics/angular:module": {
+      "typeSeparator": "."
+    },
+    "@schematics/angular:pipe": {
+      "typeSeparator": "."
+    },
+    "@schematics/angular:resolver": {
+      "typeSeparator": "."
    }
  }
 }
@@ -1,7 +1,7 @@
 import {CapacitorConfig} from '@capacitor/cli';

 const config: CapacitorConfig = {
-  appId: 'de.anyschool.app',
+  appId: 'de.unifrankfurt.app',
  appName: 'StApps',
  webDir: 'www/browser',
  cordova: {
@@ -175,16 +175,6 @@
        "hisometry": {
          "authProvider": "default",
          "url": "https://his-self-service.rz.uni-frankfurt.de"
-        },
-        "daia": {
-          "url": "https://daia.hebis.de/DAIA2/UB_Frankfurt"
-        },
-        "hebisProxy": {
-          "url": "https://proxy.ub.uni-frankfurt.de/login?qurl="
-        },
-        "paia": {
-          "authProvider": "paia",
-          "url": "https://hds.hebis.de/paia/core"
        }
      },
      "plugins": {
@@ -193,9 +183,6 @@
        },
        "feedback": {
          "urlPath": "/feedback"
-        },
-        "hebis-plugin": {
-          "urlPath": "/hebissearch"
        }
      }
    },
@@ -229,19 +216,6 @@
              }
            }
          },
-          {
-            "icon": "local_library",
-            "route": "/hebis-search",
-            "title": "library catalog",
-            "translations": {
-              "de": {
-                "title": "Bibliothekskatalog"
-              },
-              "en": {
-                "title": "library catalog"
-              }
-            }
-          },
          {
            "icon": "inventory_2",
            "route": "/catalog",
@@ -324,20 +298,6 @@
              }
            }
          },
-          {
-            "authProvider": "paia",
-            "icon": "badge",
-            "route": "/library-account",
-            "title": "library account",
-            "translations": {
-              "de": {
-                "title": "Bibliothekskonto"
-              },
-              "en": {
-                "title": "library account"
-              }
-            }
-          },
          {
            "icon": "settings",
            "route": "/settings",
@@ -473,24 +433,6 @@
        "token": "https://cas.rz.uni-frankfurt.de/cas/oauth2.0/accessToken",
        "userinfo": "https://cas.rz.uni-frankfurt.de/cas/oauth2.0/profile"
      }
-    },
-    "paia": {
-      "client": {
-        "clientId": "",
-        "scopes": "",
-        "url": "https://hds.hebis.de/Shibboleth.sso/UBFFM?target=https://hds.hebis.de/ubffm/paia_login_stub.php"
-      },
-      "endpoints": {
-        "authorization": "https://hds.hebis.de/Shibboleth.sso/UBFFM?target=https://hds.hebis.de/ubffm/paia_login_stub.php",
-        "endSession": "https://ubffm.hds.hebis.de/Shibboleth.sso/Logout",
-        "mapping": {
-          "id": "$.email",
-          "name": "$.name",
-          "role": "$.type"
-        },
-        "token": "https://hds.hebis.de/paia/auth/login",
-        "userinfo": "https://hds.hebis.de/paia/core"
-      }
    }
  },
  "backend": {
@@ -41,8 +41,8 @@ describe('favorites', function () {
          });
        cy.get('stapps-favorite-button').click();
        cy.get('stapps-favorite-button > ion-button > ion-icon')
-          .invoke('attr', 'ng-reflect-fill')
-          .should('eq', 'true');
+          .invoke('attr', 'class')
+          .should('eq', 'selected');
      });
    cy.visit('/favorites');
    cy.get('stapps-data-list-item').within(() => {
@@ -29,7 +29,7 @@ def capacitor_pods
  pod 'CapacitorShare', :path => '../../../../node_modules/.pnpm/@capacitor+share@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/share'
  pod 'CapacitorSplashScreen', :path => '../../../../node_modules/.pnpm/@capacitor+splash-screen@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/splash-screen'
  pod 'TransistorsoftCapacitorBackgroundFetch', :path => '../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@8.0.0_@capacitor+core@8.2.0/node_modules/@transistorsoft/capacitor-background-fetch'
-  pod 'CapacitorSecureStoragePlugin', :path => '../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.12.0_@capacitor+core@8.2.0/node_modules/capacitor-secure-storage-plugin'
+  pod 'CapacitorSecureStoragePlugin', :path => '../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.13.0_@capacitor+core@8.2.0/node_modules/capacitor-secure-storage-plugin'
  pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
 end

@@ -41,116 +41,116 @@
    "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}\")",
    "run:android": "ionic capacitor run android --livereload --external",
    "start": "ionic serve",
-    "start:external": "ionic serve --external",
+    "start:external": "ionic serve --external --ssl=true",
    "start:prod": "ionic serve --prod",
    "start:virtual-host": "ionic serve --public-host=mobile.app.uni-frankfurt.de --ssl=true --open=false",
    "test": "ng test --code-coverage",
    "test:integration": "sh integration-test.sh"
  },
  "dependencies": {
-    "@angular/animations": "18.2.13",
-    "@angular/cdk": "18.2.13",
-    "@angular/common": "18.2.13",
-    "@angular/core": "18.2.13",
-    "@angular/forms": "18.2.13",
-    "@angular/platform-browser": "18.2.13",
-    "@angular/router": "18.2.13",
+    "@angular/animations": "20.3.31",
+    "@angular/cdk": "20.2.14",
+    "@angular/common": "20.3.31",
+    "@angular/core": "20.3.31",
+    "@angular/forms": "20.3.31",
+    "@angular/platform-browser": "20.3.31",
+    "@angular/router": "20.3.31",
    "@awesome-cordova-plugins/calendar": "8.1.0",
    "@awesome-cordova-plugins/core": "8.1.0",
    "@capacitor-community/in-app-review": "8.0.0",
    "@capacitor-community/screen-brightness": "8.0.0",
    "@capacitor/app": "8.0.1",
-    "@capacitor/browser": "8.0.2",
+    "@capacitor/browser": "8.0.4",
    "@capacitor/clipboard": "8.0.1",
    "@capacitor/core": "8.2.0",
-    "@capacitor/device": "8.0.1",
+    "@capacitor/device": "8.0.3",
    "@capacitor/dialog": "8.0.1",
-    "@capacitor/filesystem": "8.1.2",
+    "@capacitor/filesystem": "8.1.3",
    "@capacitor/geolocation": "8.1.0",
-    "@capacitor/haptics": "8.0.1",
-    "@capacitor/keyboard": "8.0.1",
+    "@capacitor/haptics": "8.0.2",
+    "@capacitor/keyboard": "8.0.5",
    "@capacitor/local-notifications": "8.0.2",
    "@capacitor/network": "8.0.1",
    "@capacitor/preferences": "8.0.1",
    "@capacitor/screen-orientation": "8.0.1",
    "@capacitor/share": "8.0.1",
-    "@capacitor/splash-screen": "8.0.1",
-    "@ionic/angular": "8.7.16",
-    "@ionic/angular-server": "8.7.16",
+    "@capacitor/splash-screen": "8.0.2",
+    "@ionic/angular": "8.8.19",
+    "@ionic/angular-server": "8.8.19",
    "@ionic/storage-angular": "4.0.0",
-    "@maplibre/ngx-maplibre-gl": "17.4.1",
+    "@maplibre/ngx-maplibre-gl": "22.1.0",
    "@ngx-translate/core": "15.0.0",
    "@ngx-translate/http-loader": "8.0.0",
-    "@openid/appauth": "1.3.2",
+    "@openid/appauth": "1.4.0",
    "@openstapps/api": "workspace:*",
    "@openstapps/collection-utils": "workspace:*",
    "@openstapps/core": "workspace:*",
    "@transistorsoft/capacitor-background-fetch": "8.0.0",
-    "@types/dom-view-transitions": "1.0.4",
-    "capacitor-secure-storage-plugin": "0.12.0",
+    "@types/dom-view-transitions": "1.0.6",
+    "capacitor-secure-storage-plugin": "0.13.0",
    "cordova-plugin-calendar": "5.1.6",
    "date-fns": "3.6.0",
    "deepmerge": "4.3.1",
-    "form-data": "4.0.4",
+    "form-data": "4.0.6",
    "geojson": "0.5.0",
-    "ionic-appauth": "2.1.0",
    "ionicons": "8.0.13",
    "jsonpath-plus": "10.3.0",
-    "maplibre-gl": "4.0.2",
+    "maplibre-gl": "6.4.1",
    "material-symbols": "0.17.1",
    "moment": "2.30.1",
    "ngx-date-fns": "11.0.0",
    "ngx-logger": "5.0.12",
-    "ngx-markdown": "17.2.1",
+    "ngx-markdown": "18.1.0",
    "ngx-moment": "6.0.2",
    "opening_hours": "3.8.0",
    "pmtiles": "3.0.3",
    "prettier": "3.1.1",
-    "rxjs": "7.8.1",
+    "rxjs": "7.8.2",
    "semver": "7.6.0",
    "swiper": "8.4.5",
    "tslib": "2.6.2",
-    "zone.js": "0.14.10"
+    "zone.js": "0.16.2"
  },
  "devDependencies": {
-    "@angular-devkit/architect": "0.1802.20",
-    "@angular-devkit/build-angular": "18.2.20",
-    "@angular-devkit/core": "18.2.20",
-    "@angular-devkit/schematics": "18.2.20",
-    "@angular-eslint/builder": "18.4.3",
-    "@angular-eslint/eslint-plugin": "18.4.3",
-    "@angular-eslint/eslint-plugin-template": "18.4.3",
-    "@angular-eslint/schematics": "18.4.1",
-    "@angular-eslint/template-parser": "18.4.3",
-    "@angular/cli": "18.2.20",
-    "@angular/compiler": "18.2.13",
-    "@angular/compiler-cli": "18.2.13",
-    "@angular/language-server": "18.2.0",
-    "@angular/language-service": "18.2.13",
-    "@angular/platform-browser-dynamic": "18.2.13",
+    "@angular-devkit/architect": "0.2003.37",
+    "@angular-devkit/build-angular": "20.3.37",
+    "@angular-devkit/core": "20.3.37",
+    "@angular-devkit/schematics": "20.3.37",
+    "@angular-eslint/builder": "20.7.0",
+    "@angular-eslint/eslint-plugin": "20.7.0",
+    "@angular-eslint/eslint-plugin-template": "20.7.0",
+    "@angular-eslint/schematics": "20.7.0",
+    "@angular-eslint/template-parser": "20.7.0",
+    "@angular/cli": "20.3.37",
+    "@angular/compiler": "20.3.31",
+    "@angular/compiler-cli": "20.3.31",
+    "@angular/language-server": "20.3.0",
+    "@angular/language-service": "20.3.31",
+    "@angular/platform-browser-dynamic": "20.3.31",
    "@capacitor/android": "8.2.0",
    "@capacitor/assets": "3.0.5",
    "@capacitor/cli": "8.2.0",
    "@capacitor/ios": "8.2.0",
-    "@compodoc/compodoc": "1.1.23",
+    "@compodoc/compodoc": "1.2.1",
    "@cypress/schematic": "4.1.1",
    "@ionic/angular-toolkit": "12.3.0",
    "@ionic/cli": "7.2.1",
    "@openstapps/prettier-config": "workspace:*",
    "@openstapps/tsconfig": "workspace:*",
-    "@types/fontkit": "2.0.7",
+    "@stylistic/eslint-plugin": "5.10.0",
+    "@types/fontkit": "2.0.9",
    "@types/geojson": "1.0.6",
    "@types/glob": "8.1.0",
    "@types/jasmine": "5.1.4",
    "@types/jasminewd2": "2.0.13",
    "@types/jsonpath": "0.2.0",
-    "@types/karma": "6.3.8",
+    "@types/karma": "6.3.9",
    "@types/karma-coverage": "2.0.3",
    "@types/karma-jasmine": "4.0.5",
    "@types/node": "22.15.31",
    "@types/semver": "7.5.8",
-    "@typescript-eslint/eslint-plugin": "7.11.0",
-    "@typescript-eslint/parser": "7.11.0",
+    "@typescript-eslint/eslint-plugin": "8.39.1",
+    "@typescript-eslint/parser": "8.39.1",
    "cordova-res": "0.15.4",
    "cypress": "15.0.0",
    "eslint": "8.57.0",
@@ -158,28 +158,28 @@
    "eslint-plugin-prettier": "5.1.3",
    "eslint-plugin-unicorn": "51.0.1",
    "fast-deep-equal": "3.1.3",
-    "fontkit": "2.0.2",
+    "fontkit": "2.0.4",
    "glob": "10.5.0",
    "http-server": "14.1.1",
    "is-docker": "2.2.1",
    "jasmine-core": "5.1.2",
    "jasmine-spec-reporter": "7.0.0",
    "junit-report-merger": "6.0.3",
-    "karma": "6.4.3",
+    "karma": "6.4.4",
    "karma-chrome-launcher": "3.2.0",
    "karma-coverage": "2.2.1",
    "karma-jasmine": "5.1.0",
    "karma-junit-reporter": "2.0.1",
    "karma-mocha-reporter": "2.2.5",
    "license-checker": "25.0.1",
-    "stylelint": "16.3.1",
-    "stylelint-config-clean-order": "5.4.1",
+    "stylelint": "17.14.1",
+    "stylelint-config-clean-order": "10.0.0",
    "stylelint-config-prettier-scss": "1.0.0",
-    "stylelint-config-recommended-scss": "14.0.0",
-    "stylelint-config-standard-scss": "13.0.0",
+    "stylelint-config-recommended-scss": "17.0.1",
+    "stylelint-config-standard-scss": "17.0.0",
    "surge": "0.23.1",
    "ts-node": "10.9.2",
-    "typescript": "5.4.2"
+    "typescript": "5.9.3"
  },
  "cordova": {
    "plugins": {},
@@ -13,7 +13,7 @@
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
 import {HttpClient} from '@angular/common/http';
-import {Injectable} from '@angular/core';
+import {Injectable, inject} from '@angular/core';
 import {
  SCAcademicEvent,
  SCArticle,
@@ -395,7 +395,9 @@ export class SampleThings {
   */
  http: HttpClient;

-  constructor(http: HttpClient) {
+  constructor() {
+    const http = inject(HttpClient);
+
    this.http = http;
  }

@@ -13,7 +13,7 @@
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */

-import {Injectable} from '@angular/core';
+import {Injectable, inject} from '@angular/core';
 import {HttpRequest, HttpHandler, HttpEvent, HttpInterceptor, HttpErrorResponse} from '@angular/common/http';
 import {Observable, throwError} from 'rxjs';
 import {NGXLogger} from 'ngx-logger';
@@ -21,7 +21,7 @@ import {catchError} from 'rxjs/operators';

@Injectable()
 export class ServiceHandlerInterceptor implements HttpInterceptor {
-  constructor(private readonly logger: NGXLogger) {}
+  private readonly logger = inject(NGXLogger);

  intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
    return next.handle(request).pipe(
@@ -26,6 +26,7 @@ const routes: Routes = [{path: '', redirectTo: '/overview', pathMatch: 'full'}];
    RouterModule.forRoot(routes, {
      preloadingStrategy: PreloadAllModules,
      errorHandler: error => {
+        console.error(error);
        // Handle unknown routes, at the moment this can only be done via window.location
        if (error.message.includes('Cannot match any routes')) {
          window.location.href = '/overview';
@@ -72,6 +72,7 @@ describe('AppComponent', () => {
    configProvider.getAnyValue = jasmine.createSpy().and.callFake(function () {
      return sampleAuthConfiguration;
    });
+    inAppReviewProvider = jasmine.createSpyObj('InAppReviewProvider', ['init']);
    ngxLogger = jasmine.createSpyObj('NGXLogger', ['log', 'error', 'warn']);
    storageProvider = jasmine.createSpyObj('StorageProvider', ['init', 'get', 'has', 'put']);
    simpleBrowser = jasmine.createSpyObj('SimpleBrowser', ['open']);
@@ -108,11 +109,5 @@ describe('AppComponent', () => {
  it('should initialize the app', async () => {
    TestBed.createComponent(AppComponent);
    expect(platformSpy.ready).toHaveBeenCalled();
-    // await platformReadySpy;
-
-    // TODO: https://capacitorjs.com/docs/guides/mocking-plugins
-    // expect(splashScreenSpy.hide).toHaveBeenCalled();
  });
-
-  // TODO: add more tests!
 });
@@ -12,19 +12,20 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-import {AfterContentInit, Component, NgZone} from '@angular/core';
+import {AfterContentInit, Component, NgZone, inject} from '@angular/core';
 import {Router} from '@angular/router';
 import {App, URLOpenListenerEvent} from '@capacitor/app';
 import {Platform, ToastController} from '@ionic/angular/standalone';
 import {SettingsProvider} from './modules/settings/settings.provider';
 import {InAppReviewProvider} from './modules/settings/in-app-review/in-app-review.provider';
-import {AuthHelperService} from './modules/auth/auth-helper.service';
+import {AuthProvider} from "./modules/auth/auth.provider";
 import {environment} from '../environments/environment';
 import {Capacitor} from '@capacitor/core';
 import {ScheduleSyncService} from './modules/background/schedule/schedule-sync.service';
 import {Keyboard, KeyboardResize} from '@capacitor/keyboard';
 import {AppVersionService} from './modules/about/app-version.service';
 import {SplashScreen} from '@capacitor/splash-screen';
+import {AuthHelperService} from "./modules/auth/auth-helper.service";

 /**
 * TODO
@@ -32,8 +33,29 @@ import {SplashScreen} from '@capacitor/splash-screen';
@Component({
  selector: 'app-root',
  templateUrl: 'app.component.html',
+  standalone: false,
 })
 export class AppComponent implements AfterContentInit {
+  private readonly platform = inject(Platform);
+
+  private readonly settingsProvider = inject(SettingsProvider);
+
+  private readonly inAppReviewProvider = inject(InAppReviewProvider);
+
+  private readonly router = inject(Router);
+
+  private readonly zone = inject(NgZone);
+
+  private readonly authProvider = inject(AuthProvider);
+
+  private readonly authHelper = inject(AuthHelperService);
+
+  private readonly toastController = inject(ToastController);
+
+  private readonly scheduleSyncService = inject(ScheduleSyncService);
+
+  private readonly versionService = inject(AppVersionService);
+
  /**
   * TODO
   */
@@ -53,17 +75,7 @@ export class AppComponent implements AfterContentInit {
   */
  ommitedEventSources = ['ion-input', 'ion-searchbar'];

-  constructor(
-    private readonly platform: Platform,
-    private readonly settingsProvider: SettingsProvider,
-    private readonly inAppReviewProvider: InAppReviewProvider,
-    private readonly router: Router,
-    private readonly zone: NgZone,
-    private readonly authHelper: AuthHelperService,
-    private readonly toastController: ToastController,
-    private readonly scheduleSyncService: ScheduleSyncService,
-    private readonly versionService: AppVersionService,
-  ) {
+  constructor() {
    void this.initializeApp();
  }

@@ -120,12 +132,8 @@ export class AppComponent implements AfterContentInit {
  }

  private async authNotificationsInit() {
-    this.authHelper
-      .getProvider('default')
-      .events$.subscribe(action => this.showMessage(this.authHelper.getAuthMessage('default', action)));
-    this.authHelper
-      .getProvider('paia')
-      .events$.subscribe(action => this.showMessage(this.authHelper.getAuthMessage('paia', action)));
+    this.authProvider
+      .events$.subscribe(action => this.showMessage(this.authHelper.getAuthMessage(action)));
  }

  private async showMessage(message?: string) {
@@ -15,7 +15,7 @@
 import {CommonModule, LocationStrategy, PathLocationStrategy, registerLocaleData} from '@angular/common';
 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 {APP_INITIALIZER, NgModule, inject} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
 import {RouteReuseStrategy} from '@angular/router';
 import {IonicRouteStrategy, Platform, provideIonicAngular, IonApp} from '@ionic/angular/standalone';
@@ -33,7 +33,6 @@ import {CatalogModule} from './modules/catalog/catalog.module';
 import {ConfigProvider} from './modules/config/config.provider';
 import {DashboardModule} from './modules/dashboard/dashboard.module';
 import {DataModule} from './modules/data/data.module';
-import {HebisModule} from './modules/hebis/hebis.module';
 import {MapModule} from './modules/map/map.module';
 import {MenuModule} from './modules/menu/menu.module';
 import {NewsModule} from './modules/news/news.module';
@@ -53,14 +52,11 @@ import {FeedbackModule} from './modules/feedback/feedback.module';
 import {DebugDataCollectorService} from './modules/data/debug-data-collector.service';
 import {AuthModule} from './modules/auth/auth.module';
 import {BackgroundModule} from './modules/background/background.module';
-import {LibraryModule} from './modules/library/library.module';
 import {StorageProvider} from './modules/storage/storage.provider';
 import {AssessmentsModule} from './modules/assessments/assessments.module';
 import {ServiceHandlerInterceptor} from './_helpers/service-handler.interceptor';
 import {RoutingStackService} from './util/routing-stack.service';
 import {SCLanguageCode, SCSettingValue} from '@openstapps/core';
-import {DefaultAuthService} from './modules/auth/default-auth.service';
-import {PAIAAuthService} from './modules/auth/paia/paia-auth.service';
 import {NavigationModule} from './modules/menu/navigation/navigation.module';
 import {browserFactory, SimpleBrowser} from './util/browser.factory';
 import {getDateFnsLocale} from './translation/dfns-locale';
@@ -68,8 +64,9 @@ import {setDefaultOptions} from 'date-fns';
 import {DateFnsConfigurationService} from 'ngx-date-fns';
 import {Capacitor} from '@capacitor/core';
 import {SplashScreen} from '@capacitor/splash-screen';
-import maplibregl from 'maplibre-gl';
+import * as maplibregl from 'maplibre-gl';
 import {Protocol} from 'pmtiles';
+import {AuthProvider} from "./modules/auth/auth.provider";

 registerLocaleData(localeDe);

@@ -85,12 +82,12 @@ export function initializerFactory(
  configProvider: ConfigProvider,
  translateService: TranslateService,
  _routingStackService: RoutingStackService,
-  defaultAuthService: DefaultAuthService,
-  paiaAuthService: PAIAAuthService,
+  authProvider: AuthProvider,
  dateFnsConfigurationService: DateFnsConfigurationService,
 ) {
  return async () => {
    try {
+      maplibregl.setWorkerUrl(new URL('maplibre-gl-worker.mjs', document.baseURI).href);
      maplibregl.addProtocol('pmtiles', new Protocol().tile);
      initLogger(logger);
      await storageProvider.init();
@@ -114,8 +111,7 @@ export function initializerFactory(
        setDefaultOptions({locale: dateFnsLocale});
        dateFnsConfigurationService.setLocale(dateFnsLocale);

-        await defaultAuthService.init();
-        await paiaAuthService.init();
+        await authProvider.init();
      } catch (error) {
        logger.warn(error);
      }
@@ -154,10 +150,8 @@ export function createTranslateLoader(http: HttpClient) {
    CommonModule,
    DashboardModule,
    DataModule,
-    HebisModule,
    JobModule,
    FavoritesModule,
-    LibraryModule,
    ProfilePageModule,
    FeedbackModule,
    MapModule,
@@ -207,8 +201,7 @@ export function createTranslateLoader(http: HttpClient) {
        ConfigProvider,
        TranslateService,
        RoutingStackService,
-        DefaultAuthService,
-        PAIAAuthService,
+        AuthProvider,
        DateFnsConfigurationService,
      ],
      useFactory: initializerFactory,
@@ -223,5 +216,5 @@ export function createTranslateLoader(http: HttpClient) {
  ],
 })
 export class AppModule {
-  constructor(public debugDataCollectorService: DebugDataCollectorService) {}
+  debugDataCollectorService = inject(DebugDataCollectorService);
 }
@@ -21,6 +21,7 @@ import {ConfigProvider} from '../config/config.provider';
  templateUrl: 'about-changelog.html',
  styleUrls: ['about-changelog.scss', './about-page/about-page.scss', 'release-notes-markdown.scss'],
  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: false,
 })
 export class AboutChangelogComponent {
  config = inject(ConfigProvider);
@@ -20,6 +20,7 @@ import {License} from './about-licenses.component';
  selector: 'about-license-modal',
  templateUrl: 'about-license-modal.html',
  styleUrls: ['about-license-modal.scss'],
+  standalone: false,
 })
 export class AboutLicenseModalComponent {
  @Input() license: License;
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-import {Component, OnInit} from '@angular/core';
+import {Component, OnInit, inject} from '@angular/core';
 import {ModalController} from '@ionic/angular/standalone';
 import {AboutLicenseModalComponent} from './about-license-modal.component';
 import licensesFile from 'src/assets/about/licenses.json';
@@ -32,11 +32,12 @@ export interface License {
  selector: 'about-changelog',
  templateUrl: 'about-licenses.html',
  styleUrls: ['about-licenses.scss', './about-page/about-page.scss'],
+  standalone: false,
 })
 export class AboutLicensesComponent implements OnInit {
-  licenses: License[];
+  private modalController = inject(ModalController);

-  constructor(private modalController: ModalController) {}
+  licenses: License[];

  ngOnInit() {
    this.licenses = this.loadLicenses();
@@ -19,6 +19,7 @@ import {SCAboutPageContent} from '@openstapps/core';
  selector: 'about-page-content',
  templateUrl: 'about-page-content.html',
  styleUrls: ['about-page-content.scss'],
+  standalone: false,
 })
 export class AboutPageContentComponent {
  @Input() content: SCAboutPageContent;
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-import {Component, OnInit} from '@angular/core';
+import {Component, OnInit, inject} from '@angular/core';
 import {ActivatedRoute} from '@angular/router';
 import {SCAboutPage, SCAppConfiguration} from '@openstapps/core';
 import {ConfigProvider} from '../../config/config.provider';
@@ -25,8 +25,13 @@ import {Capacitor} from '@capacitor/core';
  selector: 'about-page',
  templateUrl: 'about-page.html',
  styleUrls: ['about-page.scss'],
+  standalone: false,
 })
 export class AboutPageComponent implements OnInit {
+  private readonly route = inject(ActivatedRoute);
+
+  private readonly configProvider = inject(ConfigProvider);
+
  content: SCAboutPage;

  name = config.appName;
@@ -35,11 +40,6 @@ export class AboutPageComponent implements OnInit {

  version: string;

-  constructor(
-    private readonly route: ActivatedRoute,
-    private readonly configProvider: ConfigProvider,
-  ) {}
-
  async ngOnInit() {
    const route = this.route.snapshot.url.map(it => it.path).join('/');
    this.content =
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-@import '../../../../theme/util/mixins';
+@use '../../../../theme/util/mixins';

 ion-text {
  margin-inline: var(--spacing-md);
@@ -64,7 +64,7 @@ ion-text {
  .about-changelog,
  .licenses-content,
  .page-content {
-    @include border-radius-in-parallax(var(--border-radius-default));
+    @include mixins.border-radius-in-parallax(var(--border-radius-default));

    display: flex;
    flex-direction: column;
@@ -76,7 +76,7 @@ ion-text {
    background: var(--ion-item-background);

    & > * {
-      @include border-radius-in-parallax(var(--border-radius-default));
+      @include mixins.border-radius-in-parallax(var(--border-radius-default));

      position: relative;
      overflow: hidden;
@@ -21,6 +21,7 @@ import {ConfigProvider} from '../config/config.provider';
  templateUrl: 'about-release-notes.html',
  styleUrls: ['about-release-notes.scss', './about-page/about-page.scss', 'release-notes-markdown.scss'],
  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: false,
 })
 export class AboutReleaseNotesComponent {
  config = inject(ConfigProvider);
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-@import '../../../theme/util/mixins';
+@use '../../../theme/util/mixins';

 ion-button {
  --color: var(--ion-color-primary-contrast);
@@ -22,7 +22,7 @@ ion-button {
 }

 .release-notes {
-  @include border-radius-in-parallax(var(--border-radius-default));
+  @include mixins.border-radius-in-parallax(var(--border-radius-default));

  display: block;
  margin: var(--spacing-md);
@@ -1,4 +1,4 @@
-import {Injectable} from '@angular/core';
+import {Injectable, inject} from '@angular/core';
 import {StorageProvider} from '../storage/storage.provider';
 import {ConfigProvider} from '../config/config.provider';
 import {ModalController} from '@ionic/angular/standalone';
@@ -12,11 +12,11 @@ export const RELEASE_NOTES_SHOWN_KEY = 'release_notes_shown';

@Injectable({providedIn: 'root'})
 export class AppVersionService {
-  constructor(
-    private storage: StorageProvider,
-    private config: ConfigProvider,
-    private modalController: ModalController,
-  ) {}
+  private storage = inject(StorageProvider);
+
+  private config = inject(ConfigProvider);
+
+  private modalController = inject(ModalController);

  /**
   * Get the latest release notes that have not been presented yet
@@ -20,7 +20,7 @@
  }

  blockquote {
-    background: var(--ion-item-background);
    border-left: 0.25em solid var(--ion-color-medium);
+    background: var(--ion-item-background);
  }
 }
@@ -1,4 +1,4 @@
-import {ChangeDetectionStrategy, Component, Input} from '@angular/core';
+import {ChangeDetectionStrategy, Component, Input, inject} from '@angular/core';
 import {SCAppVersionInfo} from '@openstapps/core';
 import {MarkdownModule} from 'ngx-markdown';
 import {ThingTranslateModule} from '../../translation/thing-translate.module';
@@ -17,7 +17,6 @@ import {UtilModule} from '../../util/util.module';
  selector: 'stapps-release-notes',
  templateUrl: 'release-notes.html',
  styleUrls: ['release-notes.scss', 'release-notes-markdown.scss'],
-  standalone: true,
  changeDetection: ChangeDetectionStrategy.OnPush,
  imports: [
    UtilModule,
@@ -32,7 +31,7 @@ import {UtilModule} from '../../util/util.module';
  ],
 })
 export class ReleaseNotesComponent {
-  @Input() versionInfos: SCAppVersionInfo[];
+  readonly modalController = inject(ModalController);

-  constructor(readonly modalController: ModalController) {}
+  @Input() versionInfos: SCAppVersionInfo[];
 }
@@ -1,11 +1,11 @@
-@import '../../../theme/util/mixins';
+@use '../../../theme/util/mixins';

 ion-title {
  padding-block: var(--spacing-md);
 }

 .content-card {
-  @include border-radius-in-parallax(var(--border-radius-default));
+  @include mixins.border-radius-in-parallax(var(--border-radius-default));

  display: block;
  margin: var(--spacing-md);
@@ -12,12 +12,12 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-import {Injectable} from '@angular/core';
+import {Injectable, inject} from '@angular/core';
 import {ConfigProvider} from '../config/config.provider';
 import {SCAssessment, SCUuid} from '@openstapps/core';
-import {DefaultAuthService} from '../auth/default-auth.service';
 import {HttpClient} from '@angular/common/http';
 import {uniqBy, keyBy} from '@openstapps/collection-utils';
+import {AuthProvider} from "../auth/auth.provider";

 /**
 *
@@ -51,6 +51,12 @@ export function toAssessmentMap(data: SCAssessment[]): Record<SCUuid, SCAssessme
  providedIn: 'root',
 })
 export class AssessmentsProvider {
+  readonly configProvider = inject(ConfigProvider);
+
+  readonly authProvider = inject(AuthProvider);
+
+  readonly http = inject(HttpClient);
+
  assessmentPath = 'assessments';

  // usually this wouldn't be necessary, but the assessment service
@@ -64,12 +70,6 @@ export class AssessmentsProvider {
  // 15 minutes
  cacheMaxAge = 15 * 60 * 1000;

-  constructor(
-    readonly configProvider: ConfigProvider,
-    readonly defaultAuth: DefaultAuthService,
-    readonly http: HttpClient,
-  ) {}
-
  async getAssessment(uid: SCUuid, accessToken?: string | null, forceFetch = false): Promise<SCAssessment> {
    await this.getAssessments(accessToken, forceFetch);

@@ -97,7 +97,7 @@ export class AssessmentsProvider {
    this.cache = this.http
      .get<{data: SCAssessment[]}>(`${url}/${this.assessmentPath}`, {
        headers: {
-          Authorization: `Bearer ${accessToken ?? (await this.defaultAuth.getValidToken()).accessToken}`,
+          Authorization: `Bearer ${accessToken ?? (await this.authProvider.getValidToken()).accessToken}`,
        },
      })
      .toPromise()
@@ -26,17 +26,20 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
  selector: 'assessments-detail',
  templateUrl: 'assessments-detail.html',
  styleUrls: ['assessments-detail.scss'],
+  standalone: false,
 })
 export class AssessmentsDetailComponent implements OnInit {
-  destroy$ = inject(DestroyRef);
+  readonly route = inject(ActivatedRoute);

-  constructor(
-    readonly route: ActivatedRoute,
-    readonly assessmentsProvider: AssessmentsProvider,
-    readonly dataRoutingService: DataRoutingService,
-    readonly navController: NavController,
-    readonly activatedRoute: ActivatedRoute,
-  ) {}
+  readonly assessmentsProvider = inject(AssessmentsProvider);
+
+  readonly dataRoutingService = inject(DataRoutingService);
+
+  readonly navController = inject(NavController);
+
+  readonly activatedRoute = inject(ActivatedRoute);
+
+  destroy$ = inject(DestroyRef);

  @Input() dataPathAutoRouting = true;

@@ -21,6 +21,7 @@ import {Observable} from 'rxjs';
  selector: 'assessments-data-list',
  templateUrl: './assessments-data-list.html',
  styleUrls: ['./assessments-data-list.scss'],
+  standalone: false,
 })
 export class AssessmentsDataListComponent {
  /**
@@ -20,6 +20,7 @@ import {SCThings} from '@openstapps/core';
  selector: 'assessments-list-item',
  templateUrl: 'assessments-list-item.html',
  styleUrls: ['assessments-list-item.scss'],
+  standalone: false,
 })
 export class AssessmentsListItemComponent {
  /**
@@ -23,8 +23,15 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
  selector: 'assessments-simple-data-list',
  templateUrl: 'assessments-simple-data-list.html',
  styleUrls: ['assessments-simple-data-list.scss'],
+  standalone: false,
 })
 export class AssessmentsSimpleDataListComponent implements OnInit {
+  readonly dataRoutingService = inject(DataRoutingService);
+
+  readonly router = inject(Router);
+
+  readonly activatedRoute = inject(ActivatedRoute);
+
  /**
   * All SCThings to display
   */
@@ -46,12 +53,6 @@ export class AssessmentsSimpleDataListComponent implements OnInit {

  destroy$ = inject(DestroyRef);

-  constructor(
-    readonly dataRoutingService: DataRoutingService,
-    readonly router: Router,
-    readonly activatedRoute: ActivatedRoute,
-  ) {}
-
  ngOnInit() {
    this.dataRoutingService
      .itemSelectListener()
@@ -20,6 +20,7 @@ import {SCThings} from '@openstapps/core';
  selector: 'assessments-tree-list',
  templateUrl: 'assessments-tree-list.html',
  styleUrls: ['assessments-tree-list.scss'],
+  standalone: false,
 })
 export class AssessmentsTreeListComponent {
  @Input() items?: Promise<SCThings[] | undefined>;
@@ -29,8 +29,21 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
  templateUrl: 'assessments-page.html',
  styleUrls: ['assessments-page.scss'],
  animations: [materialSharedAxisX],
+  standalone: false,
 })
 export class AssessmentsPageComponent implements OnInit, AfterViewInit {
+  readonly logger = inject(NGXLogger);
+
+  readonly assessmentsProvider = inject(AssessmentsProvider);
+
+  readonly dataProvider = inject(DataProvider);
+
+  readonly activatedRoute = inject(ActivatedRoute);
+
+  readonly dataRoutingService = inject(DataRoutingService);
+
+  readonly router = inject(Router);
+
  assessments: Promise<
    Record<
      string,
@@ -49,15 +62,6 @@ export class AssessmentsPageComponent implements OnInit, AfterViewInit {

  destroy$ = inject(DestroyRef);

-  constructor(
-    readonly logger: NGXLogger,
-    readonly assessmentsProvider: AssessmentsProvider,
-    readonly dataProvider: DataProvider,
-    readonly activatedRoute: ActivatedRoute,
-    readonly dataRoutingService: DataRoutingService,
-    readonly router: Router,
-  ) {}
-
  ngAfterViewInit() {
    this.segmentView.value = this.sharedAxisChoreographer.currentValue;
  }
@@ -20,6 +20,7 @@ import {SCAssessment} from '@openstapps/core';
  selector: 'assessment-base-info',
  templateUrl: 'assessment-base-info.html',
  styleUrls: ['assessment-base-info.scss'],
+  standalone: false,
 })
 export class AssessmentBaseInfoComponent {
  _item: SCAssessment;
@@ -20,6 +20,7 @@ import {SCAssessment} from '@openstapps/core';
  selector: 'assessment-detail',
  templateUrl: 'assessment-detail.html',
  styleUrls: ['assessment-detail.scss'],
+  standalone: false,
 })
 export class AssessmentDetailComponent {
  @Input() item: SCAssessment;
@@ -20,6 +20,7 @@ import {SCAssessment} from '@openstapps/core';
  selector: 'stapps-assessment-list-item',
  templateUrl: './assessment-list-item.html',
  styleUrls: ['./assessment-list-item.scss'],
+  standalone: false,
 })
 export class AssessmentListItemComponent {
  @Input() item: SCAssessment;
@@ -20,6 +20,7 @@ import {SCAssessment, SCCourseOfStudyWithoutReferences} from '@openstapps/core';
  selector: 'course-of-study-assessment',
  templateUrl: 'course-of-study-assessment.html',
  styleUrls: ['course-of-study-assessment.scss'],
+  standalone: false,
 })
 export class CourseOfStudyAssessmentComponent {
  @Input() courseOfStudy?: SCCourseOfStudyWithoutReferences | null;
@@ -12,41 +12,66 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-import {Component} from '@angular/core';
-import {NavController} from '@ionic/angular/standalone';
+import {Component, inject} from '@angular/core';
 import {Router} from '@angular/router';
-import {AuthActions, IAuthAction} from 'ionic-appauth';
-import {AuthHelperService} from '../../auth-helper.service';
 import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
-import {Observable} from 'rxjs';
-import {IPAIAAuthAction} from '../../paia/paia-auth-action';
-import {DefaultAuthService} from '../../default-auth.service';
+import {NavController} from '@ionic/angular/standalone';
+
+import {
+  AuthActions,
+  AuthProvider,
+  IAuthAction,
+} from '../../auth.provider';
+import {AuthHelperService} from '../../auth-helper.service';

@Component({
  templateUrl: 'auth-callback-page.component.html',
  styleUrls: ['auth-callback-page.component.scss'],
+  standalone: false,
 })
 export class AuthCallbackPageComponent {
-  constructor(
-    private navCtrl: NavController,
-    private router: Router,
-    private authHelper: AuthHelperService,
-    private auth: DefaultAuthService,
-  ) {
-    const events: Observable<IPAIAAuthAction | IAuthAction> = this.auth.events$;
+  private navCtrl = inject(NavController);

-    events.pipe(takeUntilDestroyed()).subscribe((action: IAuthAction) => this.postCallback(action));
-    this.auth.authorizationCallback(window.location.origin + this.router.url);
+  private router = inject(Router);
+
+  private authHelper = inject(AuthHelperService);
+
+  private authProvider = inject(AuthProvider);
+
+  constructor() {
+    this.authProvider.events$
+      .pipe(takeUntilDestroyed())
+      .subscribe(action => {
+        void this.postCallback(action);
+      });
+
+    this.authProvider.authorizationCallback(
+      window.location.href,
+    );
  }

-  async postCallback(action: IAuthAction) {
-    if (action.action === AuthActions.SignInSuccess) {
-      const originPath = await this.authHelper.getOriginPath();
-      this.navCtrl.navigateRoot(originPath ?? 'profile');
-      this.authHelper.deleteOriginPath();
+  private async postCallback(
+    action: IAuthAction,
+  ): Promise<void> {
+    switch (action.action) {
+      case AuthActions.SignInSuccess: {
+        const originPath =
+          await this.authHelper.getOriginPath();
+
+        await this.authHelper.deleteOriginPath();
+
+        await this.navCtrl.navigateRoot(
+          originPath ?? 'profile',
+        );
+
+        break;
+      }
+
+      case AuthActions.SignInFailed: {
+        await this.navCtrl.navigateRoot('profile');
+
+        break;
      }
-    if (action.action === AuthActions.SignInFailed) {
-      this.navCtrl.navigateRoot('profile');
    }
  }
 }
@@ -13,19 +13,18 @@
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */

-import {Injectable} from '@angular/core';
+import {Injectable, inject} from '@angular/core';
 import {CanActivate, NavigationExtras, Router, RouterStateSnapshot} from '@angular/router';
 import {ActivatedProtectedRouteSnapshot} from './protected.routes';
-import {AuthHelperService} from './auth-helper.service';
+import {AuthProvider} from "./auth.provider";

@Injectable({
  providedIn: 'root',
 })
 export class AuthGuardService implements CanActivate {
-  constructor(
-    private authHelper: AuthHelperService,
-    private router: Router,
-  ) {}
+  private authProvider = inject(AuthProvider);
+
+  private router = inject(Router);

  public async canActivate(route: ActivatedProtectedRouteSnapshot, _state: RouterStateSnapshot) {
    if (route.queryParamMap.get('token')) {
@@ -33,16 +32,16 @@ export class AuthGuardService implements CanActivate {
    }

    try {
-      await this.authHelper.getProvider(route.data.authProvider).getValidToken();
+      await this.authProvider.getValidToken();
    } catch {
-      const originNavigation = this.router.getCurrentNavigation();
+      const originNavigation = this.router.currentNavigation();
      let extras: NavigationExtras = {};
      if (originNavigation) {
        const url = originNavigation.extractedUrl.toString();
        extras = {queryParams: {origin_path: url}};
      }
      this.router.navigate(['profile'], extras);
-      await this.authHelper.getProvider(route.data.authProvider).signIn();
+      await this.authProvider.signIn();

      return false;
    }
@@ -1,124 +1,251 @@
-/*
- * Copyright (C) 2023 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <https://www.gnu.org/licenses/>.
- */
-import {TestBed} from '@angular/core/testing';
+import {AuthActions, AuthProvider} from './auth.provider';
 import {AuthHelperService} from './auth-helper.service';
-import {ConfigProvider} from '../config/config.provider';
-import {StorageProvider} from '../storage/storage.provider';
-import {DefaultAuthService} from './default-auth.service';
-import {Browser} from 'ionic-appauth';
-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 {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
-import {SimpleBrowser} from '../../util/browser.factory';
-import {LoggerTestingModule} from 'ngx-logger/testing';
+
+const AUTH_ORIGIN_PATH = 'stapps.auth.origin_path';
+const AUTH_MESSAGE_PREFIX = 'auth.messages.default';
+const END_SESSION_ENDPOINT = 'https://idp.example.org/logout';
+
+const USER_MAPPING = {
+  id: '$.sub',
+  givenName: '$.given_name',
+  familyName: '$.family_name',
+  email: '$.attributes.mail',
+  role: '$.role',
+};
+
+interface TestAlertButton {
+  text: string;
+  role?: string;
+  cssClass?: string;
+  handler?: () => Promise<void> | void;
+}

 describe('AuthHelperService', () => {
-  let authHelperService: AuthHelperService;
-  const storageProviderSpy = jasmine.createSpyObj('StorageProvider', ['init', 'get', 'has', 'put', 'search']);
-  const translateServiceSpy = jasmine.createSpyObj('TranslateService', ['setDefaultLang', 'use']);
-  const defaultAuthServiceMock = jasmine.createSpyObj('DefaultAuthService', ['init', 'setupConfiguration']);
-  const paiaAuthServiceMock = jasmine.createSpyObj('PAIAAuthService', ['init', 'setupConfiguration']);
-  const authHelperServiceMock = jasmine.createSpyObj('AuthHelperService', ['constructor']);
-  const simpleBrowserMock = jasmine.createSpyObj('SimpleBrowser', ['open']);
-  const configProvider = jasmine.createSpyObj('ConfigProvider', {
-    getAnyValue: {
-      default: {
-        endpoints: {
-          mapping: {
-            id: '$.id',
-            email: '$.attributes.mailPrimaryAddress',
-            givenName: '$.attributes.givenName',
-            familyName: '$.attributes.sn',
-            name: '$.attributes.sn',
-            role: '$.attributes.eduPersonPrimaryAffiliation',
-            studentId: '$.attributes.employeeNumber',
-          },
-        },
-      },
-    },
-  });
+  let service: AuthHelperService;
+
+  let translateService: jasmine.SpyObj<{instant(key: string): string}>;
+  let configProvider: jasmine.SpyObj<{getAnyValue(key: string): unknown}>;
+  let storageProvider: jasmine.SpyObj<{
+    get<T>(key: string): Promise<T>;
+    put(key: string, value: unknown): Promise<unknown>;
+    delete(key: string): Promise<unknown>;
+  }>;
+  let authProvider: jasmine.SpyObj<Pick<AuthProvider, 'getEndSessionEndpoint'>>;
+  let browser: jasmine.SpyObj<{open(url: string): Promise<void>}>;
+  let alertController: jasmine.SpyObj<{create(options: unknown): Promise<unknown>}>;
+  let alert: jasmine.SpyObj<{present(): Promise<void>}>;
+
+  function createService(authConfig: unknown = {default: {endpoints: {mapping: USER_MAPPING}}}) {
+    configProvider.getAnyValue.and.returnValue(authConfig);
+
+    return new AuthHelperService(
+      translateService as any,
+      configProvider as any,
+      storageProvider as any,
+      authProvider as any,
+      browser as any,
+      alertController as any,
+    );
+  }
+
+  /** Options passed to the most recent AlertController.create() call. */
+  function lastAlertOptions(): {header: string; message: string; buttons: TestAlertButton[]} {
+    return alertController.create.calls.mostRecent().args[0] as any;
+  }
+
+  function alertButton(role: string): TestAlertButton {
+    const button = lastAlertOptions().buttons.find(b => b.role === role);
+    if (!button) {
+      throw new Error(`No alert button with role "${role}"`);
+    }
+    return button;
+  }

  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [LoggerTestingModule],
-      providers: [
-        StAppsWebHttpClient,
-        {
-          provide: TranslateService,
-          useValue: translateServiceSpy,
-        },
-        {
-          provide: StorageProvider,
-          useValue: storageProviderSpy,
-        },
-        {
-          provider: DefaultAuthService,
-          useValue: defaultAuthServiceMock,
-        },
-        {
-          provider: PAIAAuthService,
-          useValue: paiaAuthServiceMock,
-        },
-        {
-          provide: ConfigProvider,
-          useValue: configProvider,
-        },
-        Browser,
-        StorageBackend,
-        Requestor,
-        {
-          provider: AuthHelperService,
-          useValue: authHelperServiceMock,
-        },
-        {
-          provide: SimpleBrowser,
-          useValue: simpleBrowserMock,
-        },
-        provideHttpClient(withInterceptorsFromDi()),
-      ],
+    translateService = jasmine.createSpyObj('TranslateService', ['instant']);
+    translateService.instant.and.callFake((key: string) => `translated:${key}`);
+
+    configProvider = jasmine.createSpyObj('ConfigProvider', ['getAnyValue']);
+
+    storageProvider = jasmine.createSpyObj('StorageProvider', ['get', 'put', 'delete']);
+    storageProvider.put.and.resolveTo();
+    storageProvider.delete.and.resolveTo();
+
+    authProvider = jasmine.createSpyObj('AuthProvider', ['getEndSessionEndpoint']);
+    authProvider.getEndSessionEndpoint.and.resolveTo(END_SESSION_ENDPOINT);
+
+    browser = jasmine.createSpyObj('SimpleBrowser', ['open']);
+    browser.open.and.resolveTo();
+
+    alert = jasmine.createSpyObj('HTMLIonAlertElement', ['present']);
+    alert.present.and.resolveTo();
+
+    alertController = jasmine.createSpyObj('AlertController', ['create']);
+    alertController.create.and.resolveTo(alert);
+
+    service = createService();
+  });
+
+  describe('userConfigurationMap', () => {
+    it('reads the user mapping from the default auth provider', () => {
+      expect(configProvider.getAnyValue).toHaveBeenCalledWith('auth');
+      expect(service.userConfigurationMap).toEqual(USER_MAPPING as any);
+    });
+
+    it('falls back to an empty mapping when no default auth provider is configured', () => {
+      service = createService({});
+
+      expect(service.userConfigurationMap).toEqual({} as any);
+    });
+  });
+
+  describe('getAuthMessage', () => {
+    it('returns the translated message for SignInSuccess', () => {
+      expect(service.getAuthMessage({action: AuthActions.SignInSuccess})).toBe(
+        `translated:${AUTH_MESSAGE_PREFIX}.logged_in_success`,
+      );
+    });
+
+    it('returns the translated message for SignOutSuccess', () => {
+      expect(service.getAuthMessage({action: AuthActions.SignOutSuccess})).toBe(
+        `translated:${AUTH_MESSAGE_PREFIX}.logged_out_success`,
+      );
+    });
+
+    it('returns undefined for all other actions without translating', () => {
+      const otherActions = Object.values(AuthActions).filter(
+        action => action !== AuthActions.SignInSuccess && action !== AuthActions.SignOutSuccess,
+      );
+
+      for (const action of otherActions) {
+        expect(service.getAuthMessage({action})).withContext(action).toBeUndefined();
+      }
+      expect(translateService.instant).not.toHaveBeenCalled();
    });
-    authHelperService = TestBed.inject(AuthHelperService);
  });

  describe('getUserFromUserInfo', () => {
-    it('should provide user configuration from userInfo', async () => {
-      const userConfiguration = authHelperService.getUserFromUserInfo({
-        attributes: {
-          eduPersonPrimaryAffiliation: 'student',
-          employeeNumber: '123456',
-          givenName: 'Erika',
-          mailPrimaryAddress: 'emuster@anyschool.de',
-          oauthClientId: '123-abc-123',
-          sn: 'Musterfrau',
-          uid: 'emuster',
-        },
-        id: 'emuster',
-        client_id: '123-abc-123',
+    it('maps user info fields via the configured JSONPath mapping', () => {
+      const user = service.getUserFromUserInfo({
+        sub: 'user-123',
+        given_name: 'Erika',
+        family_name: 'Mustermann',
+        attributes: {mail: 'erika@example.org'},
+        role: 'employee',
      });

-      expect(userConfiguration).toEqual({
-        id: 'emuster',
+      expect(user).toEqual(
+        jasmine.objectContaining({
+          id: 'user-123',
          givenName: 'Erika',
-        familyName: 'Musterfrau',
-        name: 'Erika Musterfrau',
-        email: 'emuster@anyschool.de',
+          familyName: 'Mustermann',
+          email: 'erika@example.org',
+          role: 'employee',
+        }),
+      );
+    });
+
+    it('builds the name from given name and family name', () => {
+      const user = service.getUserFromUserInfo({
+        sub: 'user-123',
+        given_name: 'Erika',
+        family_name: 'Mustermann',
+        role: 'student',
+      });
+
+      expect(user.name).toBe('Erika Mustermann');
+    });
+
+    it('keeps the default name when the family name is missing', () => {
+      const user = service.getUserFromUserInfo({
+        sub: 'user-123',
+        given_name: 'Erika',
+        role: 'student',
+      });
+
+      expect(user.name).toBe('');
+    });
+
+    it('returns the default user when no mapping is configured', () => {
+      service = createService({});
+
+      expect(service.getUserFromUserInfo({sub: 'user-123'})).toEqual({
+        id: '',
+        name: '',
        role: 'student',
-        studentId: '123456',
      });
    });
  });
+
+  describe('origin path', () => {
+    it('stores the origin path', async () => {
+      await service.setOriginPath('/profile');
+
+      expect(storageProvider.put).toHaveBeenCalledOnceWith(AUTH_ORIGIN_PATH, '/profile');
+    });
+
+    it('returns the stored origin path', async () => {
+      storageProvider.get.and.resolveTo('/profile');
+
+      expect(await service.getOriginPath()).toBe('/profile');
+      expect(storageProvider.get).toHaveBeenCalledOnceWith(AUTH_ORIGIN_PATH);
+    });
+
+    it('returns undefined when reading the origin path fails', async () => {
+      storageProvider.get.and.rejectWith(new Error('Value not found'));
+
+      expect(await service.getOriginPath()).toBeUndefined();
+    });
+
+    it('deletes the origin path', async () => {
+      await service.deleteOriginPath();
+
+      expect(storageProvider.delete).toHaveBeenCalledOnceWith(AUTH_ORIGIN_PATH);
+    });
+  });
+
+  describe('endBrowserSession', () => {
+    it('does nothing when the provider has no end-session endpoint', async () => {
+      authProvider.getEndSessionEndpoint.and.resolveTo(undefined);
+
+      await service.endBrowserSession();
+
+      expect(alertController.create).not.toHaveBeenCalled();
+      expect(browser.open).not.toHaveBeenCalled();
+    });
+
+    it('presents a translated confirmation alert', async () => {
+      await service.endBrowserSession();
+
+      const options = lastAlertOptions();
+      expect(options.header).toBe(`translated:${AUTH_MESSAGE_PREFIX}.log_out_alert.header`);
+      expect(options.message).toBe(`translated:${AUTH_MESSAGE_PREFIX}.log_out_alert.message`);
+      expect(options.buttons.map(b => b.role)).toEqual(['cancel', 'confirm']);
+      expect(alert.present).toHaveBeenCalledTimes(1);
+    });
+
+    it('does not open the end-session endpoint before confirmation', async () => {
+      await service.endBrowserSession();
+
+      expect(browser.open).not.toHaveBeenCalled();
+    });
+
+    it('opens the end-session endpoint when the user confirms', async () => {
+      await service.endBrowserSession();
+
+      await alertButton('confirm').handler?.();
+
+      expect(browser.open).toHaveBeenCalledOnceWith(END_SESSION_ENDPOINT);
+    });
+
+    it('does not open the end-session endpoint when the user cancels', async () => {
+      await service.endBrowserSession();
+
+      const cancelButton = alertButton('cancel');
+      await cancelButton.handler?.();
+
+      expect(cancelButton.handler).toBeUndefined();
+      expect(browser.open).not.toHaveBeenCalled();
+    });
+  });
 });
@@ -13,41 +13,46 @@
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */

-import {Injectable} from '@angular/core';
-import {IPAIAAuthAction} from './paia/paia-auth-action';
-import {AuthActions, IAuthAction} from 'ionic-appauth';
+import {Injectable, inject} from '@angular/core';
+import {AlertController} from '@ionic/angular/standalone';
 import {TranslateService} from '@ngx-translate/core';
-import {JSONPath} from 'jsonpath-plus';
 import {
  SCAuthorizationProvider,
-  SCAuthorizationProviderType,
  SCUserConfiguration,
  SCUserConfigurationMap,
 } from '@openstapps/core';
+import {JSONPath} from 'jsonpath-plus';
+
+import {SimpleBrowser} from '../../util/browser.factory';
 import {ConfigProvider} from '../config/config.provider';
 import {StorageProvider} from '../storage/storage.provider';
-import {DefaultAuthService} from './default-auth.service';
-import {PAIAAuthService} from './paia/paia-auth.service';
-import {SimpleBrowser} from '../../util/browser.factory';
-import {AlertController} from '@ionic/angular/standalone';
+import {
+  AuthActions, AuthProvider,
+  IAuthAction,
+} from './auth.provider';

 const AUTH_ORIGIN_PATH = 'stapps.auth.origin_path';
+const AUTH_MESSAGE_PREFIX = 'auth.messages.default';

@Injectable({
  providedIn: 'root',
 })
 export class AuthHelperService {
+  private authProvider = inject(AuthProvider);
+
+  private translateService = inject(TranslateService);
+
+  private configProvider = inject(ConfigProvider);
+
+  private storageProvider = inject(StorageProvider);
+
+  private browser = inject(SimpleBrowser);
+
+  private alertController = inject(AlertController);
+
  userConfigurationMap: SCUserConfigurationMap;

-  constructor(
-    private translateService: TranslateService,
-    private configProvider: ConfigProvider,
-    private storageProvider: StorageProvider,
-    private defaultAuth: DefaultAuthService,
-    private paiaAuth: PAIAAuthService,
-    private browser: SimpleBrowser,
-    private alertController: AlertController,
-  ) {
+  constructor() {
    this.userConfigurationMap =
      (
        this.configProvider.getAnyValue('auth') as {
@@ -56,92 +61,134 @@ export class AuthHelperService {
      ).default?.endpoints.mapping ?? {};
  }

-  public getAuthMessage(provider: SCAuthorizationProviderType, action: IAuthAction | IPAIAAuthAction) {
-    let message: string | undefined;
+  public getAuthMessage(
+    action: IAuthAction,
+  ): string | undefined {
    switch (action.action) {
-      case AuthActions.SignInSuccess: {
-        message = this.translateService.instant(`auth.messages.${provider}.logged_in_success`);
-        break;
+      case AuthActions.SignInSuccess:
+        return this.translateService.instant(
+          `${AUTH_MESSAGE_PREFIX}.logged_in_success`,
+        );
+
+      case AuthActions.SignOutSuccess:
+        return this.translateService.instant(
+          `${AUTH_MESSAGE_PREFIX}.logged_out_success`,
+        );
+
+      default:
+        return undefined;
    }
-      case AuthActions.SignOutSuccess: {
-        message = this.translateService.instant(`auth.messages.${provider}.logged_out_success`);
-        break;
-      }
-    }
-    return message;
  }

-  getUserFromUserInfo(userInfo: object) {
+  public getUserFromUserInfo(
+    userInfo: object,
+  ): SCUserConfiguration {
    const user: SCUserConfiguration = {
      id: '',
      name: '',
      role: 'student',
    };
+
    for (const key in this.userConfigurationMap) {
-      user[key as keyof SCUserConfiguration] = JSONPath({
-        path: this.userConfigurationMap[key as keyof SCUserConfiguration] as string,
+      const userKey =
+        key as keyof SCUserConfiguration;
+
+      user[userKey] = JSONPath({
+        path:
+          this.userConfigurationMap[
+            userKey
+            ] as string,
        json: userInfo,
      })[0];
    }
-    if (user.givenName && user.givenName.length > 0 && user.familyName && user.familyName.length > 0) {
-      user.name = `${user.givenName} ${user.familyName}`;
+
+    if (
+      user.givenName &&
+      user.familyName
+    ) {
+      user.name =
+        `${user.givenName} ${user.familyName}`;
    }

    return user;
  }

-  async deleteOriginPath() {
-    return this.storageProvider.delete(AUTH_ORIGIN_PATH);
+  public async deleteOriginPath():
+    Promise<void> {
+    await this.storageProvider.delete(
+      AUTH_ORIGIN_PATH,
+    );
  }

-  async setOriginPath(path: string) {
-    return this.storageProvider.put<string>(AUTH_ORIGIN_PATH, path);
+  public async setOriginPath(
+    path: string,
+  ): Promise<void> {
+    await this.storageProvider.put(
+      AUTH_ORIGIN_PATH,
+      path,
+    );
  }

-  async getOriginPath() {
-    let originPath: string;
+  public async getOriginPath():
+    Promise<string | undefined> {
    try {
-      originPath = await this.storageProvider.get<string>(AUTH_ORIGIN_PATH);
+      return await this.storageProvider.get<string>(
+        AUTH_ORIGIN_PATH,
+      );
    } catch {
+      return undefined;
+    }
+  }
+
+  public async endBrowserSession():
+    Promise<void> {
+    const endSessionEndpoint =
+      await this.authProvider
+        .getEndSessionEndpoint();
+
+    if (!endSessionEndpoint) {
      return;
    }
-    return originPath;
-  }

-  getProvider<B extends SCAuthorizationProviderType>(
-    providerType: B,
-  ): B extends 'paia' ? PAIAAuthService : DefaultAuthService;
-  /**
-   * Provides appropriate auth service instance based on type (string) parameter
-   */
-  getProvider(providerType: SCAuthorizationProviderType): DefaultAuthService | PAIAAuthService {
-    return providerType === 'paia'
-      ? (this.paiaAuth as PAIAAuthService)
-      : (this.defaultAuth as DefaultAuthService);
-  }
+    const alert =
+      await this.alertController.create({
+        header:
+          this.translateService.instant(
+            `${AUTH_MESSAGE_PREFIX}.log_out_alert.header`,
+          ),

-  /**
-   * Ends browser session by opening endSessionEndpoint URL of the provider
-   * @param providerType Type of the provider (e.g. 'default' or 'paia')
-   */
-  async endBrowserSession(providerType: SCAuthorizationProviderType) {
-    const endSessionEndpoint = (await this.getProvider(providerType).configuration).endSessionEndpoint;
+        message:
+          this.translateService.instant(
+            `${AUTH_MESSAGE_PREFIX}.log_out_alert.message`,
+          ),

-    if (endSessionEndpoint) {
-      const alert: HTMLIonAlertElement = await this.alertController.create({
-        header: this.translateService.instant(`auth.messages.${providerType}.log_out_alert.header`),
-        message: this.translateService.instant(`auth.messages.${providerType}.log_out_alert.message`),
        buttons: [
          {
-            text: this.translateService.instant('no'),
+            text:
+              this.translateService.instant(
+                'no',
+              ),
+
+            role: 'cancel',
            cssClass: 'default',
          },
          {
-            text: this.translateService.instant('yes'),
+            text:
+              this.translateService.instant(
+                'yes',
+              ),
+
            role: 'confirm',
            cssClass: 'preferred',
-            handler: () => {
-              this.browser.open(new URL(endSessionEndpoint).href);
+
+            handler: async () => {
+              /*
+               * Only now, after explicit confirmation,
+               * open the IdP end-session endpoint.
+               */
+              await this.browser.open(
+                endSessionEndpoint,
+              );
            },
          },
        ],
@@ -150,4 +197,3 @@ export class AuthHelperService {
    await alert.present();
  }
 }
-}
@@ -12,15 +12,5 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-import {SCAuthorizationProviderType} from '@openstapps/core';

-export const authPaths: {
-  [key in SCAuthorizationProviderType]: {redirect_path: string};
-} = {
-  default: {
-    redirect_path: 'auth/callback',
-  },
-  paia: {
-    redirect_path: 'auth/paia/callback',
-  },
-};
+export const AUTH_REDIRECT_PATH = 'auth/callback';
@@ -15,21 +15,14 @@

 import {RouterModule, Routes} from '@angular/router';
 import {NgModule} from '@angular/core';
-import {authPaths} from './auth-paths';
+import {AUTH_REDIRECT_PATH} from './auth-paths';
 import {AuthCallbackPageComponent} from './auth-callback/page/auth-callback-page.component';
-import {DefaultAuthService} from './default-auth.service';
-import {PAIAAuthService} from './paia/paia-auth.service';

 const authRoutes: Routes = [
  {
-    path: authPaths.default.redirect_path,
+    path: AUTH_REDIRECT_PATH,
    component: AuthCallbackPageComponent,
  },
-  {
-    path: authPaths.paia.redirect_path,
-    component: AuthCallbackPageComponent,
-    providers: [{provide: DefaultAuthService, useExisting: PAIAAuthService}],
-  },
 ];

 /**
@@ -3,15 +3,12 @@ import {CommonModule} from '@angular/common';
 import {Platform} from '@ionic/angular/standalone';
 import {Requestor, StorageBackend} from '@openid/appauth';
 import {storageFactory} from './factories';
-import {Browser} from 'ionic-appauth';
-import {CapacitorBrowser} from 'ionic-appauth/lib/capacitor';
-import {httpFactory} from './factories/http.factory';
+import {requestorFactory} from './factories/requestor.factory';
 import {HttpClient} from '@angular/common/http';
 import {AuthRoutingModule} from './auth-routing.module';
 import {TranslateModule} from '@ngx-translate/core';
 import {AuthCallbackPageComponent} from './auth-callback/page/auth-callback-page.component';
-import {DefaultAuthService} from './default-auth.service';
-import {PAIAAuthService} from './paia/paia-auth.service';
+import {AuthProvider} from "./auth.provider";

@NgModule({
  declarations: [AuthCallbackPageComponent],
@@ -24,15 +21,10 @@ import {PAIAAuthService} from './paia/paia-auth.service';
    },
    {
      provide: Requestor,
-      useFactory: httpFactory,
+      useFactory: requestorFactory,
      deps: [Platform, HttpClient],
    },
-    {
-      provide: Browser,
-      useClass: CapacitorBrowser,
-    },
-    DefaultAuthService,
-    PAIAAuthService,
+    AuthProvider,
  ],
 })
 export class AuthModule {}
@@ -13,69 +13,90 @@
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */

-import {AuthorizationServiceConfigurationJson} from '@openid/appauth';
-import {IAuthConfig} from 'ionic-appauth';
-import {SCAuthorizationProvider, SCAuthorizationProviderType} from '@openstapps/core';
 import {Capacitor} from '@capacitor/core';
-import {authPaths} from './auth-paths';
+import {SCAuthorizationProvider} from '@openstapps/core';
+import {
+  AuthorizationServiceConfiguration,
+} from '@openid/appauth';
+
 import {environment} from '../../../environments/environment';
+import {AUTH_REDIRECT_PATH} from './auth-paths';
+import type {AuthConfig} from './auth.provider';
+
+export interface OidcEndpoints {
+  userinfo?: string;
+  endSession?: string;
+}

 /**
- * Get configuration of an OAuth2 client
+ * Returns the configuration of the OIDC client.
 */
 export function getClientConfig(
-  providerType: SCAuthorizationProviderType,
  authConfig: {
-    default?: SCAuthorizationProvider;
-    paia?: SCAuthorizationProvider;
+    default: SCAuthorizationProvider;
  },
-): IAuthConfig {
-  const providerConfig = authConfig[providerType] as SCAuthorizationProvider;
+): AuthConfig {
+  const provider =
+    authConfig.default;
+
  return {
-    end_session_redirect_url: '',
+    server_host: provider.client.url,
+    client_id: provider.client.clientId,
+    scopes: provider.client.scopes,
+    redirect_url: getRedirectUrl(),
    pkce: true,
-    scopes: providerConfig.client.scopes,
-    server_host: providerConfig.client.url,
-    client_id: providerConfig.client.clientId,
-    redirect_url: getRedirectUrl(authPaths[providerType].redirect_path),
  };
 }

 /**
- * Get configuration about endpoints of an OAuth2 server
+ * Returns the AppAuth OAuth/OIDC service configuration.
 */
-export function getEndpointsConfig(
-  providerType: SCAuthorizationProviderType,
+export function getServiceConfiguration(
  authConfig: {
-    default?: SCAuthorizationProvider;
-    paia?: SCAuthorizationProvider;
+    default: SCAuthorizationProvider;
  },
-): AuthorizationServiceConfigurationJson {
-  const providerConfig = authConfig[providerType] as SCAuthorizationProvider;
+): AuthorizationServiceConfiguration {
+  const endpoints =
+    authConfig.default.endpoints;
+
+  return new AuthorizationServiceConfiguration({
+    authorization_endpoint: endpoints.authorization,
+    token_endpoint: endpoints.token,
+    revocation_endpoint: endpoints.revoke || '',
+  });
+}
+
+/**
+ * Returns the additional OIDC endpoints that AppAuth-JS does not expose
+ * through AuthorizationServiceConfiguration.
+ */
+export function getOidcEndpoints(
+  authConfig: {
+    default: SCAuthorizationProvider;
+  },
+): OidcEndpoints {
+  const endpoints = authConfig.default.endpoints;
+
  return {
-    authorization_endpoint: providerConfig.endpoints.authorization,
-    end_session_endpoint: providerConfig.endpoints.endSession,
-    revocation_endpoint: providerConfig.endpoints.revoke ?? '',
-    token_endpoint: providerConfig.endpoints.token,
-    userinfo_endpoint: providerConfig.endpoints.userinfo,
+    userinfo:
+    endpoints.userinfo,
+
+    endSession:
+    endpoints.endSession,
  };
 }

 /**
- * Return a URL of the app, depending on the platform where it is running
+ * Returns the OIDC redirect URL depending on the current platform.
 */
-function getRedirectUrl(routePath: string): string {
-  let appHost: string;
-  let appSchema: string;
-  if (environment.production) {
-    appSchema = Capacitor.isNativePlatform() ? environment.custom_url_scheme : 'https';
-    appHost = environment.app_host;
-  } else {
-    appSchema = Capacitor.isNativePlatform()
-      ? environment.custom_url_scheme
-      : window.location.protocol.split(':')[0];
+function getRedirectUrl(): string {
+  if (Capacitor.isNativePlatform()) {
+    return `${environment.custom_url_scheme}://${environment.app_host}/${AUTH_REDIRECT_PATH}`;
+  }

-    appHost = Capacitor.isNativePlatform() ? environment.app_host : window.location.host;
+  if (environment.production) {
+    return `https://${environment.app_host}/${AUTH_REDIRECT_PATH}`;
  }
-  return `${appSchema}://${appHost}/${routePath}`;
+
+  return `${window.location.origin}/${AUTH_REDIRECT_PATH}`;
 }
@@ -0,0 +1,239 @@
+import {
+  AppAuthError,
+  AuthorizationServiceConfiguration,
+  StorageBackend,
+  TokenRequestHandler,
+  TokenResponse,
+} from '@openid/appauth';
+import {BehaviorSubject, firstValueFrom} from 'rxjs';
+
+import {AuthProvider, IAuthAction, INVALID_GRANT} from './auth.provider';
+
+const TOKEN_RESPONSE_KEY = 'token_response';
+const TOKEN_LIFETIME = 3600;
+const NOW_MS = Date.parse('2026-01-01T12:00:00Z');
+const NOW = NOW_MS / 1000;
+
+/**
+ * Creates a token with a real lifetime instead of spying on isValid().
+ *
+ * remainingSeconds > 0 → still valid for that long
+ * remainingSeconds < 0 → expired that many seconds ago
+ * refreshToken: null   → token without refresh token
+ */
+function makeToken(
+  opts: {accessToken?: string; refreshToken?: string | null; remainingSeconds?: number} = {},
+): TokenResponse {
+  const remaining = opts.remainingSeconds ?? TOKEN_LIFETIME;
+
+  return new TokenResponse({
+    access_token: opts.accessToken ?? 'access-token',
+    refresh_token: opts.refreshToken === null ? undefined : (opts.refreshToken ?? 'refresh-token'),
+    token_type: 'bearer',
+    expires_in: String(TOKEN_LIFETIME),
+    issued_at: NOW - (TOKEN_LIFETIME - remaining),
+  });
+}
+
+/** Typed access to the private members the tests depend on. */
+interface AuthProviderInternals {
+  storage: StorageBackend;
+  tokenHandler: TokenRequestHandler;
+  tokenSubject: BehaviorSubject<TokenResponse | undefined>;
+  notify(action: IAuthAction): void;
+}
+
+describe('AuthProvider', () => {
+  let provider: AuthProvider;
+  let internals: AuthProviderInternals;
+
+  let storageGetItem: jasmine.Spy;
+  let storageSetItem: jasmine.Spy;
+  let storageRemoveItem: jasmine.Spy;
+  let tokenRequest: jasmine.Spy;
+
+  /** Seeds storage with the given token and loads it through the public API. */
+  async function givenLoadedToken(token: TokenResponse | null): Promise<void> {
+    storageGetItem.and.resolveTo(token ? JSON.stringify(token.toJson()) : null);
+    await provider.loadTokenFromStorage();
+  }
+
+  const isAuthenticated = () => firstValueFrom(provider.isAuthenticated$);
+  const isLoggedIn = () => firstValueFrom(provider.isLoggedIn$);
+
+  beforeEach(() => {
+    jasmine.clock().install();
+    jasmine.clock().mockDate(new Date(NOW_MS));
+
+    const platform = {is: () => false} as any;
+    const configProvider = {} as any;
+
+    provider = new AuthProvider(platform, configProvider);
+    internals = provider as unknown as AuthProviderInternals;
+
+    (provider as any).authConfigValue = {
+      server_host: 'https://idp.example.org',
+      client_id: 'test-client',
+      redirect_url: 'https://app.example.org/callback',
+      scopes: 'openid profile',
+      pkce: true,
+    };
+
+    (provider as any).localConfiguration = new AuthorizationServiceConfiguration({
+      authorization_endpoint: 'https://idp.example.org/authorize',
+      token_endpoint: 'https://idp.example.org/token',
+      revocation_endpoint: 'https://idp.example.org/revoke',
+    });
+
+    // Never touch real storage or the network.
+    storageGetItem = spyOn(internals.storage, 'getItem').and.resolveTo(null);
+    storageSetItem = spyOn(internals.storage, 'setItem').and.resolveTo();
+    storageRemoveItem = spyOn(internals.storage, 'removeItem').and.resolveTo();
+    tokenRequest = spyOn(internals.tokenHandler, 'performTokenRequest').and.rejectWith(
+      new Error('Unexpected token request'),
+    );
+  });
+
+  afterEach(() => {
+    jasmine.clock().uninstall();
+  });
+
+  describe('isAuthenticated$', () => {
+    it('should provide false through isAuthenticated$ when there is no token response', async () => {
+      // Start authenticated so the test cannot pass on the initial value alone.
+      await givenLoadedToken(makeToken());
+      expect(await isAuthenticated()).toBeTrue();
+
+      await givenLoadedToken(null);
+
+      expect(internals.tokenSubject.value).toBeUndefined();
+      expect(await isAuthenticated()).toBeFalse();
+    });
+
+    it('should provide true through isAuthenticated$ when access token is valid', async () => {
+      await givenLoadedToken(makeToken());
+
+      expect(await isAuthenticated()).toBeTrue();
+    });
+
+    it('should provide false through isAuthenticated$ when access token is invalid', async () => {
+      await givenLoadedToken(makeToken({remainingSeconds: -TOKEN_LIFETIME}));
+
+      expect(await isAuthenticated()).toBeFalse();
+      // Still logged in: a refresh token is available.
+      expect(await isLoggedIn()).toBeTrue();
+    });
+
+    it('should provide true through isAuthenticated$ after an expired token was refreshed', async () => {
+      await givenLoadedToken(makeToken({remainingSeconds: -60}));
+      expect(await isAuthenticated()).toBeFalse();
+
+      tokenRequest.and.resolveTo(makeToken({accessToken: 'new-access-token'}));
+      await provider.getValidToken();
+
+      expect(await isAuthenticated()).toBeTrue();
+    });
+  });
+
+  describe('getValidToken', () => {
+    it('returns the current token without refreshing when it is valid', async () => {
+      await givenLoadedToken(makeToken({accessToken: 'current-access-token'}));
+
+      const token = await provider.getValidToken();
+
+      expect(tokenRequest).not.toHaveBeenCalled();
+      expect(token.accessToken).toBe('current-access-token');
+    });
+
+    it('refreshes the token when the access token is expired', async () => {
+      await givenLoadedToken(makeToken({remainingSeconds: -60}));
+      tokenRequest.and.resolveTo(
+        makeToken({accessToken: 'new-access-token', refreshToken: 'new-refresh-token'}),
+      );
+
+      const token = await provider.getValidToken();
+
+      expect(tokenRequest).toHaveBeenCalledTimes(1);
+      expect(token.accessToken).toBe('new-access-token');
+      expect(token.refreshToken).toBe('new-refresh-token');
+      expect(storageSetItem).toHaveBeenCalledOnceWith(TOKEN_RESPONSE_KEY, jasmine.any(String));
+    });
+
+    it('refreshes the token when the access token expires within the buffer', async () => {
+      // 5 minutes left, default buffer requires more than 10.
+      await givenLoadedToken(makeToken({remainingSeconds: 5 * 60}));
+      tokenRequest.and.resolveTo(makeToken({accessToken: 'new-access-token'}));
+
+      const token = await provider.getValidToken();
+
+      expect(tokenRequest).toHaveBeenCalledTimes(1);
+      expect(token.accessToken).toBe('new-access-token');
+    });
+
+    it('keeps the previous refresh token when the refresh response contains none', async () => {
+      await givenLoadedToken(makeToken({remainingSeconds: -60, refreshToken: 'old-refresh-token'}));
+      tokenRequest.and.resolveTo(makeToken({accessToken: 'new-access-token', refreshToken: null}));
+
+      const token = await provider.getValidToken();
+
+      expect(token.accessToken).toBe('new-access-token');
+      expect(token.refreshToken).toBe('old-refresh-token');
+    });
+
+    it('rejects without a request when the token is expired and has no refresh token', async () => {
+      await givenLoadedToken(makeToken({remainingSeconds: -60, refreshToken: null}));
+
+      await expectAsync(provider.getValidToken()).toBeRejectedWithError(/No Refresh Token Available/);
+      expect(tokenRequest).not.toHaveBeenCalled();
+    });
+
+    describe('when refresh fails with invalid_grant', () => {
+      const refreshError = new AppAuthError(INVALID_GRANT);
+
+      beforeEach(async () => {
+        await givenLoadedToken(makeToken({remainingSeconds: -60, refreshToken: 'invalid-refresh-token'}));
+        expect(await isLoggedIn()).toBeTrue();
+
+        tokenRequest.and.rejectWith(refreshError);
+
+        await expectAsync(provider.getValidToken()).toBeRejectedWith(refreshError);
+      });
+
+      it('changes isLoggedIn to false', async () => {
+        expect(await isLoggedIn()).toBeFalse();
+      });
+
+      it('removes the token from storage', () => {
+        expect(storageRemoveItem).toHaveBeenCalledOnceWith(TOKEN_RESPONSE_KEY);
+      });
+
+      it('clears the current token', () => {
+        expect(internals.tokenSubject.value).toBeUndefined();
+      });
+    });
+
+    describe('when refresh fails with a temporary error', () => {
+      // An AppAuthError that is not invalid_grant, e.g. a network failure.
+      const refreshError = new AppAuthError('Network Error');
+
+      beforeEach(async () => {
+        await givenLoadedToken(makeToken({remainingSeconds: -60}));
+        tokenRequest.and.rejectWith(refreshError);
+
+        await expectAsync(provider.getValidToken()).toBeRejectedWith(refreshError);
+      });
+
+      it('keeps the user logged in', async () => {
+        expect(await isLoggedIn()).toBeTrue();
+      });
+
+      it('does not remove the token from storage', () => {
+        expect(storageRemoveItem).not.toHaveBeenCalled();
+      });
+
+      it('keeps the current token for a later retry', () => {
+        expect(internals.tokenSubject.value?.refreshToken).toBe('refresh-token');
+      });
+    });
+  });
+});
@@ -1,526 +0,0 @@
-/*
- * Copyright (C) 2023 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <https://www.gnu.org/licenses/>.
- */
-// Temporary use of direct file until the version with bug fix is released
-// https://github.com/wi3land/ionic-appauth/blob/3716f4fc6b5491b0b75e049be0a47a5af8c4da6f/src/auth-service.ts
-// Bug: https://github.com/wi3land/ionic-appauth/issues/154
-import {
-  AuthorizationError,
-  AuthorizationNotifier,
-  AuthorizationRequest,
-  AuthorizationRequestHandler,
-  AuthorizationRequestJson,
-  AuthorizationResponse,
-  AuthorizationServiceConfiguration,
-  BaseTokenRequestHandler,
-  DefaultCrypto,
-  GRANT_TYPE_AUTHORIZATION_CODE,
-  GRANT_TYPE_REFRESH_TOKEN,
-  JQueryRequestor,
-  LocalStorageBackend,
-  Requestor,
-  RevokeTokenRequest,
-  RevokeTokenRequestJson,
-  StorageBackend,
-  StringMap,
-  TokenRequest,
-  TokenRequestHandler,
-  TokenRequestJson,
-  TokenResponse,
-} from '@openid/appauth';
-import {
-  ActionHistoryObserver,
-  AuthActionBuilder,
-  AuthActions,
-  AuthObserver,
-  AUTHORIZATION_RESPONSE_KEY,
-  AuthSubject,
-  BaseAuthObserver,
-  Browser,
-  DefaultBrowser,
-  EndSessionHandler,
-  EndSessionRequest,
-  EndSessionRequestJson,
-  IAuthAction,
-  IAuthConfig,
-  IAuthService,
-  IonicAuthorizationRequestHandler,
-  IonicEndSessionHandler,
-  IonicUserInfoHandler,
-  SessionObserver,
-  UserInfoHandler,
-} from 'ionic-appauth';
-import {BehaviorSubject, Observable} from 'rxjs';
-
-const TOKEN_RESPONSE_KEY = 'token_response';
-const AUTH_EXPIRY_BUFFER = 10 * 60 * -1; // 10 mins in seconds
-
-export abstract class AuthService implements IAuthService {
-  private _configuration?: AuthorizationServiceConfiguration;
-
-  private _authConfig?: IAuthConfig;
-
-  private _authSubject: AuthSubject = new AuthSubject();
-
-  private _actionHistory: ActionHistoryObserver = new ActionHistoryObserver();
-
-  private _session: SessionObserver = new SessionObserver();
-
-  private _authSubjectV2 = new BehaviorSubject<IAuthAction>(AuthActionBuilder.Init());
-
-  private _tokenSubject = new BehaviorSubject<TokenResponse | undefined>(undefined);
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private _userSubject = new BehaviorSubject<any>(undefined);
-
-  private _authenticatedSubject = new BehaviorSubject<boolean>(false);
-
-  private _loggedInSubject = new BehaviorSubject<boolean>(false);
-
-  private _initComplete = new BehaviorSubject<boolean>(false);
-
-  protected tokenHandler: TokenRequestHandler;
-
-  protected userInfoHandler: UserInfoHandler;
-
-  protected requestHandler: AuthorizationRequestHandler;
-
-  protected endSessionHandler: EndSessionHandler;
-
-  constructor(
-    protected browser: Browser = new DefaultBrowser(),
-    protected storage: StorageBackend = new LocalStorageBackend(),
-    protected requestor: Requestor = new JQueryRequestor(),
-  ) {
-    this.tokenHandler = new BaseTokenRequestHandler(requestor);
-    this.userInfoHandler = new IonicUserInfoHandler(requestor);
-    this.requestHandler = new IonicAuthorizationRequestHandler(browser, storage);
-    this.endSessionHandler = new IonicEndSessionHandler(browser);
-  }
-
-  /**
-   * @deprecated independant observers have been replaced by Rxjs
-   * this will be removed in a future release
-   * please use $ suffixed observers in future
-   */
-  get history(): IAuthAction[] {
-    return [...this._actionHistory.history];
-  }
-
-  /**
-   * @deprecated independant observers have been replaced by Rxjs
-   * this will be removed in a future release
-   * please use $ suffixed observers in future
-   */
-  get session() {
-    return this._session.session;
-  }
-
-  get token$(): Observable<TokenResponse | undefined> {
-    return this._tokenSubject.asObservable();
-  }
-
-  get isAuthenticated$(): Observable<boolean> {
-    return this._authenticatedSubject.asObservable();
-  }
-
-  /**
-   * Similar to isAuthenticated$, but will also return true if the token is expired
-   */
-  get isLoggedIn$(): Observable<boolean> {
-    return this._loggedInSubject.asObservable();
-  }
-
-  get initComplete$(): Observable<boolean> {
-    return this._initComplete.asObservable();
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  get user$(): Observable<any> {
-    return this._userSubject.asObservable();
-  }
-
-  get events$(): Observable<IAuthAction> {
-    return this._authSubjectV2.asObservable();
-  }
-
-  get authConfig(): IAuthConfig {
-    if (!this._authConfig) throw new Error('AuthConfig Not Defined');
-
-    return this._authConfig;
-  }
-
-  set authConfig(value: IAuthConfig) {
-    this._authConfig = value;
-  }
-
-  get configuration(): Promise<AuthorizationServiceConfiguration> {
-    if (!this._configuration) {
-      return AuthorizationServiceConfiguration.fetchFromIssuer(
-        this.authConfig.server_host,
-        this.requestor,
-      ).catch(() => {
-        throw new Error('Unable To Obtain Server Configuration');
-      });
-    }
-
-    if (this._configuration == undefined) {
-      throw new Error('Unable To Obtain Server Configuration');
-    } else {
-      return Promise.resolve(this._configuration);
-    }
-  }
-
-  public async init() {
-    this.setupAuthorizationNotifier();
-    this.loadTokenFromStorage();
-    this.addActionObserver(this._actionHistory);
-    this.addActionObserver(this._session);
-  }
-
-  protected notifyActionListers(action: IAuthAction) {
-    /* eslint-disable unicorn/no-useless-undefined */
-    switch (action.action) {
-      case AuthActions.SignInFailed:
-      case AuthActions.SignOutSuccess:
-      case AuthActions.SignOutFailed: {
-        this._tokenSubject.next(undefined);
-        this._userSubject.next(undefined);
-        this._authenticatedSubject.next(false);
-        this._loggedInSubject.next(false);
-        break;
-      }
-      case AuthActions.LoadTokenFromStorageFailed: {
-        this._tokenSubject.next(undefined);
-        this._userSubject.next(undefined);
-        this._authenticatedSubject.next(false);
-        this._loggedInSubject.next(false);
-        this._initComplete.next(true);
-        break;
-      }
-      case AuthActions.SignInSuccess:
-      case AuthActions.RefreshSuccess: {
-        this._tokenSubject.next(action.tokenResponse);
-        this._authenticatedSubject.next(true);
-        this._loggedInSubject.next(true);
-        break;
-      }
-      case AuthActions.LoadTokenFromStorageSuccess: {
-        this._tokenSubject.next(action.tokenResponse);
-        this._authenticatedSubject.next((action.tokenResponse as TokenResponse).isValid(0));
-        this._loggedInSubject.next(true);
-        this._initComplete.next(true);
-        break;
-      }
-      case AuthActions.RevokeTokensSuccess: {
-        this._tokenSubject.next(undefined);
-        break;
-      }
-      case AuthActions.LoadUserInfoSuccess: {
-        this._userSubject.next(action.user);
-        break;
-      }
-      case AuthActions.LoadUserInfoFailed: {
-        this._userSubject.next(undefined);
-        break;
-      }
-    }
-
-    this._authSubjectV2.next(action);
-    this._authSubject.notify(action);
-  }
-
-  protected setupAuthorizationNotifier() {
-    const notifier = new AuthorizationNotifier();
-    this.requestHandler.setAuthorizationNotifier(notifier);
-    notifier.setAuthorizationListener((request, response, error) =>
-      this.onAuthorizationNotification(request, response, error),
-    );
-  }
-
-  protected onAuthorizationNotification(
-    request: AuthorizationRequest,
-    response: AuthorizationResponse | null,
-    error: AuthorizationError | null,
-  ) {
-    const codeVerifier: string | undefined =
-      request.internal != undefined && this.authConfig.pkce ? request.internal.code_verifier : undefined;
-
-    if (response != undefined) {
-      this.requestAccessToken(response.code, codeVerifier);
-    } else if (error == undefined) {
-      throw new Error('Unknown Error With Authentication');
-    } else {
-      throw new Error(error.errorDescription);
-    }
-  }
-
-  protected async internalAuthorizationCallback(url: string) {
-    this.browser.closeWindow();
-    await this.storage.setItem(AUTHORIZATION_RESPONSE_KEY, url);
-    return this.requestHandler.completeAuthorizationRequestIfPossible();
-  }
-
-  protected async internalEndSessionCallback() {
-    this.browser.closeWindow();
-    this._actionHistory.clear();
-    this.notifyActionListers(AuthActionBuilder.SignOutSuccess());
-  }
-
-  protected async performEndSessionRequest(state?: string): Promise<void> {
-    if (this._tokenSubject.value == undefined) {
-      //if user has no token they should not be logged in in the first place
-      this.endSessionCallback();
-    } else {
-      const requestJson: EndSessionRequestJson = {
-        postLogoutRedirectURI: this.authConfig.end_session_redirect_url,
-        idTokenHint: this._tokenSubject.value.idToken || '',
-        state: state || undefined,
-      };
-
-      const request: EndSessionRequest = new EndSessionRequest(requestJson);
-      const returnedUrl: string | undefined = await this.endSessionHandler.performEndSessionRequest(
-        await this.configuration,
-        request,
-      );
-
-      //callback may come from showWindow or via another method
-      if (returnedUrl != undefined) {
-        this.endSessionCallback();
-      }
-    }
-  }
-
-  protected async performAuthorizationRequest(authExtras?: StringMap, state?: string): Promise<void> {
-    const requestJson: AuthorizationRequestJson = {
-      response_type: AuthorizationRequest.RESPONSE_TYPE_CODE,
-      client_id: this.authConfig.client_id,
-      redirect_uri: this.authConfig.redirect_url,
-      scope: this.authConfig.scopes,
-      extras: authExtras,
-      state: state || undefined,
-    };
-
-    const request = new AuthorizationRequest(requestJson, new DefaultCrypto(), this.authConfig.pkce);
-
-    if (this.authConfig.pkce) await request.setupCodeVerifier();
-
-    return this.requestHandler.performAuthorizationRequest(await this.configuration, request);
-  }
-
-  protected async requestAccessToken(code: string, codeVerifier?: string): Promise<void> {
-    const requestJSON: TokenRequestJson = {
-      grant_type: GRANT_TYPE_AUTHORIZATION_CODE,
-      code: code,
-      refresh_token: undefined,
-      redirect_uri: this.authConfig.redirect_url,
-      client_id: this.authConfig.client_id,
-      extras: codeVerifier
-        ? {
-            code_verifier: codeVerifier,
-            client_secret: this.authConfig.client_secret as string,
-          }
-        : {
-            client_secret: this.authConfig.client_secret as string,
-          },
-    };
-
-    const token: TokenResponse = await this.tokenHandler.performTokenRequest(
-      await this.configuration,
-      new TokenRequest(requestJSON),
-    );
-    await this.storage.setItem(TOKEN_RESPONSE_KEY, JSON.stringify(token.toJson()));
-    this.notifyActionListers(AuthActionBuilder.SignInSuccess(token));
-  }
-
-  protected async requestTokenRefresh() {
-    if (!this._tokenSubject.value) {
-      throw new Error('No Token Defined!');
-    }
-
-    const requestJSON: TokenRequestJson = {
-      grant_type: GRANT_TYPE_REFRESH_TOKEN,
-      refresh_token: this._tokenSubject.value?.refreshToken,
-      redirect_uri: this.authConfig.redirect_url,
-      client_id: this.authConfig.client_id,
-    };
-
-    const token: TokenResponse = await this.tokenHandler.performTokenRequest(
-      await this.configuration,
-      new TokenRequest(requestJSON),
-    );
-    if (!token.accessToken) {
-      throw new Error('No Access Token Defined In Refresh Response');
-    }
-    await this.storage.setItem(TOKEN_RESPONSE_KEY, JSON.stringify(token.toJson()));
-    this.notifyActionListers(AuthActionBuilder.RefreshSuccess(token));
-  }
-
-  protected async internalLoadTokenFromStorage() {
-    let token: TokenResponse | undefined;
-    const tokenResponseString: string | null = await this.storage.getItem(TOKEN_RESPONSE_KEY);
-
-    if (tokenResponseString != undefined) {
-      token = new TokenResponse(JSON.parse(tokenResponseString));
-
-      if (token) {
-        return this.notifyActionListers(AuthActionBuilder.LoadTokenFromStorageSuccess(token));
-      }
-    }
-
-    throw new Error('No Token In Storage');
-  }
-
-  protected async requestTokenRevoke() {
-    const revokeRefreshJson: RevokeTokenRequestJson = {
-      token: (this._tokenSubject.value as TokenResponse).refreshToken as string,
-      token_type_hint: 'refresh_token',
-      client_id: this.authConfig.client_id,
-    };
-
-    const revokeAccessJson: RevokeTokenRequestJson = {
-      token: (this._tokenSubject.value as TokenResponse).accessToken,
-      token_type_hint: 'access_token',
-      client_id: this.authConfig.client_id,
-    };
-
-    await this.tokenHandler.performRevokeTokenRequest(
-      await this.configuration,
-      new RevokeTokenRequest(revokeRefreshJson),
-    );
-    await this.tokenHandler.performRevokeTokenRequest(
-      await this.configuration,
-      new RevokeTokenRequest(revokeAccessJson),
-    );
-    await this.storage.removeItem(TOKEN_RESPONSE_KEY);
-    this.notifyActionListers(AuthActionBuilder.RevokeTokensSuccess());
-  }
-
-  protected async internalRequestUserInfo() {
-    if (this._tokenSubject.value) {
-      const userInfo = await this.userInfoHandler.performUserInfoRequest(
-        await this.configuration,
-        this._tokenSubject.value,
-      );
-      this.notifyActionListers(AuthActionBuilder.LoadUserInfoSuccess(userInfo));
-    } else {
-      throw new Error('No Token Available');
-    }
-  }
-
-  public async loadTokenFromStorage() {
-    await this.internalLoadTokenFromStorage().catch(error => {
-      this.notifyActionListers(AuthActionBuilder.LoadTokenFromStorageFailed(error));
-    });
-  }
-
-  public async signIn(authExtras?: StringMap, state?: string) {
-    await this.performAuthorizationRequest(authExtras, state).catch(error => {
-      this.notifyActionListers(AuthActionBuilder.SignInFailed(error));
-    });
-  }
-
-  public async signOut(state?: string, revokeTokens?: boolean) {
-    if (revokeTokens) {
-      await this.revokeTokens();
-    }
-
-    await this.storage.removeItem(TOKEN_RESPONSE_KEY);
-
-    if ((await this.configuration).endSessionEndpoint) {
-      await this.performEndSessionRequest(state).catch(error => {
-        this.notifyActionListers(AuthActionBuilder.SignOutFailed(error));
-      });
-    }
-  }
-
-  public async revokeTokens() {
-    await this.requestTokenRevoke().catch(error => {
-      this.storage.removeItem(TOKEN_RESPONSE_KEY);
-      this.notifyActionListers(AuthActionBuilder.RevokeTokensFailed(error));
-    });
-  }
-
-  public async refreshToken() {
-    await this.requestTokenRefresh().catch(error => {
-      this.notifyActionListers(AuthActionBuilder.RefreshFailed(error));
-    });
-  }
-
-  public async loadUserInfo() {
-    await this.internalRequestUserInfo().catch(error => {
-      this.notifyActionListers(AuthActionBuilder.LoadUserInfoFailed(error));
-    });
-  }
-
-  public authorizationCallback(callbackUrl: string): void {
-    this.internalAuthorizationCallback(callbackUrl).catch(error => {
-      this.notifyActionListers(AuthActionBuilder.SignInFailed(error));
-    });
-  }
-
-  public endSessionCallback(): void {
-    this.internalEndSessionCallback().catch(error => {
-      this.notifyActionListers(AuthActionBuilder.SignOutFailed(error));
-    });
-  }
-
-  public async getValidToken(buffer: number = AUTH_EXPIRY_BUFFER): Promise<TokenResponse> {
-    if (this._tokenSubject.value) {
-      if (this._tokenSubject.value.isValid(buffer)) {
-        return this._tokenSubject.value;
-      } else {
-        await this.refreshToken();
-        if (this._tokenSubject.value) {
-          return this._tokenSubject.value;
-        }
-      }
-    }
-
-    throw new Error('Unable To Obtain Valid Token');
-  }
-
-  /**
-   * @deprecated independant observers have been replaced by Rxjs
-   * this will be removed in a future release
-   * please use $ suffixed observers in future
-   */
-  public addActionListener(function_: (action: IAuthAction) => void): AuthObserver {
-    const observer: AuthObserver = AuthObserver.Create(function_);
-    this.addActionObserver(observer);
-    return observer;
-  }
-
-  /**
-   * @deprecated independant observers have been replaced by Rxjs
-   * this will be removed in a future release
-   * please use $ suffixed observers in future
-   */
-  public addActionObserver(observer: BaseAuthObserver): void {
-    if (this._actionHistory.lastAction) {
-      observer.update(this._actionHistory.lastAction);
-    }
-
-    this._authSubject.attach(observer);
-  }
-
-  /**
-   * @deprecated independant observers have been replaced by Rxjs
-   * this will be removed in a future release
-   * please use $ suffixed observers in future
-   */
-  public removeActionObserver(observer: BaseAuthObserver): void {
-    this._authSubject.detach(observer);
-  }
-}
@@ -0,0 +1,270 @@
+/*
+ * Copyright (C) 2026 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import {Browser} from '@capacitor/browser';
+import {
+  AuthorizationError,
+  AuthorizationErrorJson,
+  AuthorizationRequest,
+  AuthorizationRequestHandler,
+  AuthorizationRequestJson,
+  AuthorizationRequestResponse,
+  AuthorizationResponse,
+  AuthorizationResponseJson,
+  AuthorizationServiceConfiguration,
+  BasicQueryStringUtils,
+  DefaultCrypto,
+  StorageBackend,
+  StringMap,
+} from '@openid/appauth';
+
+const AUTHORIZATION_REQUEST_KEY =
+  'appauth_capacitor_authorization_request';
+
+/**
+ * AppAuth authorization request handler for native Capacitor applications.
+ *
+ * AppAuth-JS handles:
+ * - state generation and validation data
+ * - PKCE code_verifier / code_challenge
+ * - authorization URL construction
+ * - AuthorizationNotifier
+ *
+ * This handler adds the Capacitor-specific parts:
+ * - persist the pending authorization request
+ * - open the authorization URL using @capacitor/browser
+ * - process the callback URL delivered through appUrlOpen
+ */
+export class CapacitorAuthorizationRequestHandler extends AuthorizationRequestHandler {
+  private callbackUrl?: string;
+
+  constructor(private readonly storage: StorageBackend) {
+    super(
+      new BasicQueryStringUtils(),
+      new DefaultCrypto(),
+    );
+  }
+
+  public async performAuthorizationRequest(
+    configuration: AuthorizationServiceConfiguration,
+    request: AuthorizationRequest,
+  ): Promise<void> {
+    /*
+     * Important:
+     *
+     * toJson() calls setupCodeVerifier() internally.
+     * Therefore PKCE is initialized before buildRequestUrl()
+     * constructs the authorization URL.
+     */
+    const requestJson =
+      await request.toJson();
+
+    await this.storage.setItem(
+      AUTHORIZATION_REQUEST_KEY,
+      JSON.stringify(requestJson),
+    );
+
+    const url =
+      this.buildRequestUrl(
+        configuration,
+        request,
+      );
+
+    await Browser.open({url});
+  }
+
+  /**
+   * Completes the authorization flow using the URL received from
+   * Capacitor's App.addListener('appUrlOpen', ...).
+   */
+  public async completeAuthorizationRequestFromUrl(
+    callbackUrl: string,
+  ): Promise<void> {
+    this.callbackUrl = callbackUrl;
+
+    /*
+     * The deep link has returned control to the application.
+     * Close the SFSafariViewController / Custom Tab if it is still open.
+     */
+    try {
+      await Browser.close();
+    } catch {
+      // Browser might already have been closed by the platform.
+    }
+
+    await this.completeAuthorizationRequestIfPossible();
+  }
+
+  protected async completeAuthorizationRequest():
+    Promise<AuthorizationRequestResponse | null> {
+    if (!this.callbackUrl) {
+      return null;
+    }
+
+    const storedRequest =
+      await this.storage.getItem(
+        AUTHORIZATION_REQUEST_KEY,
+      );
+
+    if (!storedRequest) {
+      this.callbackUrl = undefined;
+
+      throw new Error(
+        'No pending authorization request found.',
+      );
+    }
+
+    const requestJson =
+      JSON.parse(
+        storedRequest,
+      ) as AuthorizationRequestJson;
+
+    /*
+     * The serialized request also contains `internal`, including
+     * AppAuth's PKCE code_verifier.
+     */
+    const request =
+      new AuthorizationRequest(requestJson);
+
+    const parameters =
+      this.parseCallbackUrl(
+        this.callbackUrl,
+      );
+
+    const state =
+      parameters['state'];
+
+    /*
+     * Never accept an authorization response for a different request.
+     */
+    if (!state || state !== request.state) {
+      this.callbackUrl = undefined;
+
+      throw new Error(
+        'Authorization response state does not match the authorization request.',
+      );
+    }
+
+    const error =
+      parameters['error'];
+
+    let response:
+      AuthorizationResponse | null = null;
+
+    let authorizationError:
+      AuthorizationError | null = null;
+
+    if (error) {
+      const errorJson:
+        AuthorizationErrorJson = {
+        error,
+
+        error_description:
+          parameters[
+            'error_description'
+            ],
+
+        error_uri:
+          parameters['error_uri'],
+
+        state,
+      };
+
+      authorizationError =
+        new AuthorizationError(
+          errorJson,
+        );
+    } else {
+      const code =
+        parameters['code'];
+
+      if (!code) {
+        this.callbackUrl = undefined;
+
+        throw new Error(
+          'Authorization callback contains neither an authorization code nor an error.',
+        );
+      }
+
+      const responseJson:
+        AuthorizationResponseJson = {
+        code,
+        state,
+      };
+
+      response =
+        new AuthorizationResponse(
+          responseJson,
+        );
+    }
+
+    /*
+     * The response has been successfully associated with the
+     * pending request. It can now be consumed exactly once.
+     */
+    await this.storage.removeItem(
+      AUTHORIZATION_REQUEST_KEY,
+    );
+
+    this.callbackUrl = undefined;
+
+    return {
+      request,
+      response,
+      error: authorizationError,
+    };
+  }
+
+  private parseCallbackUrl(
+    callbackUrl: string,
+  ): StringMap {
+    const result: StringMap = {};
+
+    const url = new URL(callbackUrl);
+
+    /*
+     * Authorization Code Flow normally returns code/state in
+     * the query string:
+     *
+     *   openstapps:/callback?code=...&state=...
+     */
+    url.searchParams.forEach(
+      (value, key) => {
+        result[key] = value;
+      },
+    );
+
+    /*
+     * Also accept parameters in the fragment as a fallback.
+     */
+    if (url.hash.length > 1) {
+      const hash =
+        url.hash.substring(1);
+
+      const hashParameters =
+        new URLSearchParams(hash);
+
+      hashParameters.forEach(
+        (value, key) => {
+          if (!(key in result)) {
+            result[key] = value;
+          }
+        },
+      );
+    }
+
+    return result;
+  }
+}
@@ -13,61 +13,77 @@
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */

-import {Requestor} from '@openid/appauth';
-import {CapacitorHttp, HttpHeaders, HttpResponse} from '@capacitor/core';
-import {XhrSettings} from 'ionic-appauth/lib/cordova';
+import {
+  AppAuthError,
+  Requestor,
+} from '@openid/appauth';
+import {
+  CapacitorHttp,
+  HttpHeaders,
+  HttpOptions,
+} from '@capacitor/core';

-// REQUIRES CAPACITOR PLUGIN
-// @capacitor-community/http
-export class CapacitorRequestor extends Requestor {
-  constructor() {
-    super();
-  }
+type XhrSettings = Parameters<Requestor['xhr']>[0];

+export class CapacitorRequestor implements Requestor {
  public async xhr<T>(settings: XhrSettings): Promise<T> {
-    if (!settings.method) settings.method = 'GET';
-
-    switch (settings.method) {
-      case 'GET': {
-        return this.get(settings.url, settings.headers);
-      }
-      case 'POST': {
-        return this.post(settings.url, settings.data, settings.headers);
-      }
-      case 'PUT': {
-        return this.put(settings.url, settings.data, settings.headers);
-      }
-      case 'DELETE': {
-        return this.delete(settings.url, settings.headers);
-      }
-    }
+    if (!settings.url) {
+      throw new AppAuthError('A URL must be provided.');
    }

-  private async get<T>(url: string, headers: HttpHeaders) {
-    return CapacitorHttp.get({url, headers}).then((response: HttpResponse) => response.data as T);
-  }
+    const method = (settings.method ?? 'GET').toUpperCase();
+    const url = new URL(settings.url);

-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private async post<T>(url: string, data: any, headers: HttpHeaders) {
-    return CapacitorHttp.post({
-      url,
-      data,
-      headers,
-    }).then((response: HttpResponse) => {
-      return response.data as T;
+    let data: unknown;
+
+    if (settings.data) {
+      if (method === 'POST') {
+        data = settings.data;
+      } else {
+        const searchParams = new URLSearchParams(settings.data);
+
+        searchParams.forEach((value, key) => {
+          url.searchParams.append(key, value);
        });
      }
+    }

-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private async put<T>(url: string, data: any, headers: HttpHeaders) {
-    return CapacitorHttp.put({
-      url,
+    const options: HttpOptions = {
+      url: url.toString(),
+      method,
+      headers: this.getHeaders(settings.headers),
      data,
-      headers,
-    }).then((response: HttpResponse) => response.data as T);
+    };
+
+    if (settings.dataType?.toLowerCase() === 'json') {
+      options.responseType = 'json';
    }

-  private async delete<T>(url: string, headers: HttpHeaders) {
-    return CapacitorHttp.delete({url, headers}).then((response: HttpResponse) => response.data as T);
+    const response = await CapacitorHttp.request(options);
+
+    if (response.status < 200 || response.status >= 300) {
+      throw new AppAuthError(
+        `HTTP ${response.status}`,
+        response.data,
+      );
+    }
+
+    return response.data as T;
+  }
+
+  private getHeaders(headers: XhrSettings['headers']): HttpHeaders {
+    const result: HttpHeaders = {};
+
+    if (!headers) {
+      return result;
+    }
+
+    for (const [key, value] of Object.entries(headers)) {
+      if (value !== undefined && value !== null) {
+        result[key] = String(value);
+      }
+    }
+
+    return result;
  }
 }
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2023 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <https://www.gnu.org/licenses/>.
- */
-import {TestBed} from '@angular/core/testing';
-import {ConfigProvider} from '../config/config.provider';
-import {StorageProvider} from '../storage/storage.provider';
-import {DefaultAuthService} from './default-auth.service';
-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 {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
-import {IonicStorage} from 'ionic-appauth/lib';
-import {RouterModule} from '@angular/router';
-import {LoggerTestingModule} from 'ngx-logger/testing';
-
-describe('AuthService', () => {
-  let defaultAuthService: DefaultAuthService;
-  let storageBackendSpy: jasmine.SpyObj<StorageBackend>;
-  const storageProviderSpy = jasmine.createSpyObj('StorageProvider', ['init', 'get', 'has', 'put', 'search']);
-  const translateServiceSpy = jasmine.createSpyObj('TranslateService', ['setDefaultLang', 'use']);
-
-  beforeEach(() => {
-    storageBackendSpy = jasmine.createSpyObj('StorageBackend', ['getItem']);
-
-    TestBed.configureTestingModule({
-      imports: [LoggerTestingModule, RouterModule.forRoot([])],
-      providers: [
-        StAppsWebHttpClient,
-        {
-          provide: TranslateService,
-          useValue: translateServiceSpy,
-        },
-        {
-          provide: StorageProvider,
-          useValue: storageProviderSpy,
-        },
-        IonicStorage,
-        ConfigProvider,
-        Browser,
-        {
-          provide: StorageBackend,
-          useValue: storageBackendSpy,
-        },
-        Requestor,
-        provideHttpClient(withInterceptorsFromDi()),
-      ],
-    });
-    defaultAuthService = TestBed.inject(DefaultAuthService);
-  });
-
-  describe('loadTokenFromStorage', () => {
-    it('should provide false through isAuthenticated$ when there is no token response', async () => {
-      // eslint-disable-next-line unicorn/no-null
-      storageBackendSpy.getItem.and.returnValue(Promise.resolve(null));
-      let loggedInHolder;
-      defaultAuthService.isAuthenticated$.subscribe(loggedIn => {
-        loggedInHolder = loggedIn;
-      });
-      await defaultAuthService.loadTokenFromStorage();
-
-      expect(loggedInHolder).toBeFalse();
-    });
-
-    it('should provide true through isAuthenticated$ when access token is valid', async () => {
-      const validToken = `{"access_token":"AT-XXXX","refresh_token":"RT-XXXX","scope":"","token_type":"bearer","issued_at":${nowInSeconds()},"expires_in":"${
-        8 * 60 * 60
-      }"}`;
-      storageBackendSpy.getItem.and.returnValue(Promise.resolve(validToken));
-      let loggedInHolder;
-      defaultAuthService.isAuthenticated$.subscribe(loggedIn => {
-        loggedInHolder = loggedIn;
-      });
-      await defaultAuthService.loadTokenFromStorage();
-
-      expect(loggedInHolder).toBeTrue();
-    });
-
-    it('should provide false through isAuthenticated$ when access token is invalid', async () => {
-      const invalidToken = `{"access_token":"AT-INVALID-XXXX","refresh_token":"RT-XXXX","scope":"","token_type":"bearer","issued_at":${
-        nowInSeconds() - 9 * 60 * 60
-      },"expires_in":"${8 * 60 * 60}"}`;
-      storageBackendSpy.getItem.and.returnValue(Promise.resolve(invalidToken));
-      let loggedInHolder;
-      defaultAuthService.isAuthenticated$.subscribe(loggedIn => {
-        loggedInHolder = loggedIn;
-      });
-      await defaultAuthService.loadTokenFromStorage();
-
-      expect(loggedInHolder).toBeFalse();
-    });
-  });
-});
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2023 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-import {
-  AuthorizationRequestHandler,
-  AuthorizationServiceConfiguration,
-  JQueryRequestor,
-  LocalStorageBackend,
-  Requestor,
-  StorageBackend,
-  TokenRequestHandler,
-} from '@openid/appauth';
-import {AuthActionBuilder, Browser, DefaultBrowser, EndSessionHandler, UserInfoHandler} from 'ionic-appauth';
-import {ConfigProvider} from '../config/config.provider';
-import {SCAuthorizationProvider} from '@openstapps/core';
-import {getClientConfig, getEndpointsConfig} from './auth.provider.methods';
-import {Injectable} from '@angular/core';
-import {AuthService} from './auth.service';
-
-const TOKEN_RESPONSE_KEY = 'token_response';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class DefaultAuthService extends AuthService {
-  public localConfiguration: AuthorizationServiceConfiguration;
-
-  protected tokenHandler: TokenRequestHandler;
-
-  protected userInfoHandler: UserInfoHandler;
-
-  protected requestHandler: AuthorizationRequestHandler;
-
-  protected endSessionHandler: EndSessionHandler;
-
-  constructor(
-    protected browser: Browser = new DefaultBrowser(),
-    protected storage: StorageBackend = new LocalStorageBackend(),
-    protected requestor: Requestor = new JQueryRequestor(),
-    private readonly configProvider: ConfigProvider,
-  ) {
-    super(browser, storage, requestor);
-  }
-
-  get configuration(): Promise<AuthorizationServiceConfiguration> {
-    if (!this.localConfiguration) throw new Error('Local Configuration Not Defined');
-
-    return Promise.resolve(this.localConfiguration);
-  }
-
-  public async init() {
-    this.setupConfiguration();
-    this.setupAuthorizationNotifier();
-    await this.loadTokenFromStorage();
-  }
-
-  setupConfiguration() {
-    const authConfig = this.configProvider.getAnyValue('auth') as {
-      default: SCAuthorizationProvider;
-    };
-    this.authConfig = getClientConfig('default', authConfig);
-    this.localConfiguration = new AuthorizationServiceConfiguration(
-      getEndpointsConfig('default', authConfig),
-    );
-  }
-
-  public async signOut() {
-    await this.revokeTokens().catch(error => {
-      this.notifyActionListers(AuthActionBuilder.SignOutFailed(error));
-    });
-    this.notifyActionListers(AuthActionBuilder.SignOutSuccess());
-  }
-
-  public async revokeTokens() {
-    // Note: only locally
-    await this.storage.removeItem(TOKEN_RESPONSE_KEY);
-    this.notifyActionListers(AuthActionBuilder.RevokeTokensSuccess());
-  }
-}
@@ -13,11 +13,12 @@
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */

-import {HttpClient} from '@angular/common/http';
 import {Platform} from '@ionic/angular/standalone';
+import {FetchRequestor, Requestor} from '@openid/appauth';
 import {CapacitorRequestor} from '../capacitor-requestor';
-import {NgHttpService} from '../ng-http.service';

-export const httpFactory = (platform: Platform, httpClient: HttpClient) => {
-  return platform.is('capacitor') ? new CapacitorRequestor() : new NgHttpService(httpClient);
+export const requestorFactory = (platform: Platform): Requestor => {
+  return platform.is('capacitor')
+    ? new CapacitorRequestor()
+    : new FetchRequestor();
 };
@@ -14,9 +14,11 @@
 */

 import {Platform} from '@ionic/angular/standalone';
-import {IonicStorage} from 'ionic-appauth/lib';
+import {LocalStorageBackend, StorageBackend} from '@openid/appauth';
 import {SafeCapacitorSecureStorage} from '../../storage/capacitor-secure-storage';

-export const storageFactory = (platform: Platform) => {
-  return platform.is('capacitor') ? new SafeCapacitorSecureStorage() : new IonicStorage();
+export const storageFactory = (platform: Platform): StorageBackend => {
+  return platform.is('capacitor')
+    ? new SafeCapacitorSecureStorage()
+    : new LocalStorageBackend();
 };
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2023 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-import {Injectable} from '@angular/core';
-import {Requestor} from '@openid/appauth';
-import {HttpClient, HttpHeaders} from '@angular/common/http';
-import {XhrSettings} from 'ionic-appauth/lib/cordova';
-import {firstValueFrom, Observable} from 'rxjs';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class NgHttpService implements Requestor {
-  constructor(private http: HttpClient) {}
-
-  public async xhr<T>(settings: XhrSettings): Promise<T> {
-    if (!settings.method) {
-      settings.method = 'GET';
-    }
-
-    let observable: Observable<T>;
-
-    switch (settings.method) {
-      case 'GET': {
-        observable = this.http.get<T>(settings.url, {
-          headers: this.getHeaders(settings.headers),
-        });
-        break;
-      }
-      case 'POST': {
-        observable = this.http.post<T>(settings.url, settings.data, {
-          headers: this.getHeaders(settings.headers),
-        });
-        break;
-      }
-      case 'PUT': {
-        observable = this.http.put<T>(settings.url, settings.data, {
-          headers: this.getHeaders(settings.headers),
-        });
-        break;
-      }
-      case 'DELETE': {
-        observable = this.http.delete<T>(settings.url, {
-          headers: this.getHeaders(settings.headers),
-        });
-        break;
-      }
-    }
-
-    return firstValueFrom(observable);
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private getHeaders(headers: any): HttpHeaders {
-    let httpHeaders: HttpHeaders = new HttpHeaders();
-
-    if (headers !== undefined) {
-      for (const key of Object.keys(headers)) {
-        httpHeaders = httpHeaders.append(key, headers[key]);
-      }
-    }
-
-    return httpHeaders;
-  }
-}
@@ -1,197 +0,0 @@
-/*
- * Copyright (C) 2022 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-import {
-  StorageBackend,
-  BasicQueryStringUtils,
-  DefaultCrypto,
-  AuthorizationServiceConfiguration,
-  AuthorizationRequest,
-  StringMap,
-  AuthorizationError,
-  AuthorizationErrorJson,
-  BUILT_IN_PARAMETERS,
-} from '@openid/appauth';
-import {Browser} from 'ionic-appauth';
-import {PAIAAuthorizationNotifier} from './paia-authorization-notifier';
-import {PAIAAuthorizationRequestResponse} from './authorization-request-response';
-import {PAIAAuthorizationResponse, PAIAAuthorizationResponseJson} from './paia-authorization-response';
-
-/** key for authorization request. */
-const authorizationRequestKey = (handle: string) => {
-  return `${handle}_appauth_authorization_request`;
-};
-
-/** key in local storage which represents the current authorization request. */
-const AUTHORIZATION_REQUEST_HANDLE_KEY = 'appauth_current_authorization_request';
-export const AUTHORIZATION_RESPONSE_KEY = 'auth_response';
-
-export class PAIAAuthorizationRequestHandler {
-  notifier: PAIAAuthorizationNotifier;
-
-  constructor(
-    private browser: Browser,
-    private storage: StorageBackend,
-    public utils = new BasicQueryStringUtils(),
-    protected crypto = new Crypto(),
-    private generateRandom = new DefaultCrypto(),
-  ) {}
-
-  public async performAuthorizationRequest(
-    configuration: AuthorizationServiceConfiguration,
-    request: AuthorizationRequest,
-  ): Promise<void> {
-    const handle = this.generateRandom.generateRandom(10);
-    await this.storage.setItem(AUTHORIZATION_REQUEST_HANDLE_KEY, handle);
-    await this.storage.setItem(authorizationRequestKey(handle), JSON.stringify(await request.toJson()));
-    const url = this.buildRequestUrl(configuration, request);
-    const returnedUrl: string | undefined = await this.browser.showWindow(url, request.redirectUri);
-
-    // callback may come from showWindow or via another method
-    if (returnedUrl !== undefined) {
-      await this.storage.setItem(AUTHORIZATION_RESPONSE_KEY, returnedUrl);
-      await this.completeAuthorizationRequestIfPossible();
-    }
-  }
-
-  protected async completeAuthorizationRequest(): Promise<PAIAAuthorizationRequestResponse> {
-    const handle = await this.storage.getItem(AUTHORIZATION_REQUEST_HANDLE_KEY);
-
-    if (!handle) {
-      throw new Error('Handle Not Available');
-    }
-
-    const request: AuthorizationRequest = this.getAuthorizationRequest(
-      await this.storage.getItem(authorizationRequestKey(handle)),
-    );
-    const queryParameters = this.getQueryParams(await this.storage.getItem(AUTHORIZATION_RESPONSE_KEY));
-    void this.removeItemsFromStorage(handle);
-
-    const state: string | undefined = queryParameters['state'];
-    const error: string | undefined = queryParameters['error'];
-
-    if (state !== request.state) {
-      throw new Error('State Does Not Match');
-    }
-
-    return <PAIAAuthorizationRequestResponse>{
-      request: request, // request
-      response: error ? undefined : this.getAuthorizationResponse(queryParameters),
-      error: error ? this.getAuthorizationError(queryParameters) : undefined,
-    };
-  }
-
-  private getAuthorizationRequest(authRequest: string | null): AuthorizationRequest {
-    if (authRequest == undefined) {
-      throw new Error('No Auth Request Available');
-    }
-
-    return new AuthorizationRequest(JSON.parse(authRequest));
-  }
-
-  private getAuthorizationError(queryParameters: StringMap): AuthorizationError {
-    const authorizationErrorJSON: AuthorizationErrorJson = {
-      error: queryParameters['error'],
-      error_description: queryParameters['error_description'],
-      error_uri: undefined,
-      state: queryParameters['state'],
-    };
-    return new AuthorizationError(authorizationErrorJSON);
-  }
-
-  private getAuthorizationResponse(queryParameters: StringMap): PAIAAuthorizationResponse {
-    const authorizationResponseJSON: PAIAAuthorizationResponseJson = {
-      code: queryParameters['code'],
-      patron: queryParameters['patron'],
-      // TODO: currently PAIA is not providing state
-      state: queryParameters['state'] ?? '',
-    };
-    return new PAIAAuthorizationResponse(authorizationResponseJSON);
-  }
-
-  private async removeItemsFromStorage(handle: string): Promise<void> {
-    await this.storage.removeItem(AUTHORIZATION_REQUEST_HANDLE_KEY);
-    await this.storage.removeItem(authorizationRequestKey(handle));
-    await this.storage.removeItem(AUTHORIZATION_RESPONSE_KEY);
-  }
-
-  private getQueryParams(authResponse: string | null): StringMap {
-    if (authResponse == undefined) {
-      return {};
-    } else {
-      const querySide: string = authResponse.split('#')[0];
-      const parts: string[] = querySide.split('?');
-      if (parts.length !== 2) throw new Error('Invalid auth response string');
-      const hash = parts[1];
-      return this.utils.parseQueryString(hash);
-    }
-  }
-
-  setAuthorizationNotifier(notifier: PAIAAuthorizationNotifier): PAIAAuthorizationRequestHandler {
-    this.notifier = notifier;
-    return this;
-  }
-
-  completeAuthorizationRequestIfPossible(): Promise<void> {
-    // call complete authorization if possible to see there might
-    // be a response that needs to be delivered.
-    console.log(`Checking to see if there is an authorization response to be delivered.`);
-    if (!this.notifier) {
-      console.log(`Notifier is not present on AuthorizationRequest handler.
-            No delivery of result will be possible`);
-    }
-    return this.completeAuthorizationRequest().then(result => {
-      if (!result) {
-        console.log(`No result is available yet.`);
-      }
-      if (result && this.notifier) {
-        this.notifier.onAuthorizationComplete(result.request, result.response, result.error);
-      }
-    });
-  }
-
-  /**
-   * A utility method to be able to build the authorization request URL.
-   */
-  protected buildRequestUrl(configuration: AuthorizationServiceConfiguration, request: AuthorizationRequest) {
-    // build the query string
-    // coerce to any type for convenience
-    const requestMap: StringMap = {
-      redirect_uri: request.redirectUri,
-      client_id: request.clientId,
-      response_type: request.responseType,
-      state: request.state,
-      scope: request.scope,
-    };
-
-    // copy over extras
-    if (request.extras) {
-      for (const extra in request.extras) {
-        if (
-          request.extras.hasOwnProperty(extra) && // check before inserting to requestMap
-          !BUILT_IN_PARAMETERS.includes(extra)
-        ) {
-          requestMap[extra] = request.extras[extra];
-        }
-      }
-    }
-
-    const query = this.utils.stringify(requestMap);
-    const baseUrl = configuration.authorizationEndpoint;
-
-    // required encoding (PAIA specific)
-    return `${baseUrl}?${encodeURIComponent(query)}`;
-  }
-}
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2021 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-import {AuthorizationError, AuthorizationRequest} from '@openid/appauth';
-import {PAIAAuthorizationResponse} from './paia-authorization-response';
-
-/**
- * Represents a structural type holding both authorization request and response.
- */
-export interface PAIAAuthorizationRequestResponse {
-  request: AuthorizationRequest;
-  response: PAIAAuthorizationResponse | null;
-  error: AuthorizationError | null;
-}
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2022 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-import {PAIATokenResponse} from './paia-token-response';
-import {AuthActionBuilder, IAuthAction} from 'ionic-appauth';
-
-export interface IPAIAAuthAction extends IAuthAction {
-  tokenResponse?: PAIATokenResponse;
-}
-
-export class PAIAAuthActionBuilder extends AuthActionBuilder {
-  public static Init(): IPAIAAuthAction {
-    return AuthActionBuilder.Init() as IPAIAAuthAction;
-  }
-
-  public static SignOutSuccess(): IPAIAAuthAction {
-    return AuthActionBuilder.SignOutSuccess() as IPAIAAuthAction;
-  }
-
-  public static SignOutFailed(error: Error): IPAIAAuthAction {
-    return AuthActionBuilder.SignOutFailed(error) as IPAIAAuthAction;
-  }
-
-  public static RefreshSuccess(tokenResponse: PAIATokenResponse): IPAIAAuthAction {
-    return AuthActionBuilder.RefreshSuccess(tokenResponse) as IPAIAAuthAction;
-  }
-
-  public static RefreshFailed(error: Error): IPAIAAuthAction {
-    return AuthActionBuilder.RefreshFailed(error) as IPAIAAuthAction;
-  }
-
-  public static SignInSuccess(tokenResponse: PAIATokenResponse): IPAIAAuthAction {
-    return AuthActionBuilder.SignInSuccess(tokenResponse) as IPAIAAuthAction;
-  }
-
-  public static SignInFailed(error: Error): IPAIAAuthAction {
-    return AuthActionBuilder.SignInFailed(error) as IPAIAAuthAction;
-  }
-
-  public static LoadTokenFromStorageSuccess(tokenResponse: PAIATokenResponse): IPAIAAuthAction {
-    return AuthActionBuilder.LoadTokenFromStorageSuccess(tokenResponse) as IPAIAAuthAction;
-  }
-
-  public static LoadTokenFromStorageFailed(error: Error): IPAIAAuthAction {
-    return AuthActionBuilder.LoadTokenFromStorageFailed(error) as IPAIAAuthAction;
-  }
-
-  public static RevokeTokensSuccess(): IPAIAAuthAction {
-    return AuthActionBuilder.RevokeTokensSuccess() as IPAIAAuthAction;
-  }
-
-  public static RevokeTokensFailed(error: Error): IPAIAAuthAction {
-    return AuthActionBuilder.RevokeTokensFailed(error) as IPAIAAuthAction;
-  }
-
-  public static LoadUserInfoSuccess(user: Error): IPAIAAuthAction {
-    return AuthActionBuilder.LoadUserInfoSuccess(user) as IPAIAAuthAction;
-  }
-
-  public static LoadUserInfoFailed(error: Error): IPAIAAuthAction {
-    return AuthActionBuilder.LoadUserInfoFailed(error) as IPAIAAuthAction;
-  }
-}
@@ -1,365 +0,0 @@
-/*
- * Copyright (C) 2023 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-import {
-  AuthorizationError,
-  AuthorizationRequest,
-  AuthorizationRequestJson,
-  AuthorizationServiceConfiguration,
-  BasicQueryStringUtils,
-  DefaultCrypto,
-  JQueryRequestor,
-  LocalStorageBackend,
-  Requestor,
-  StorageBackend,
-  StringMap,
-  TokenResponse,
-} from '@openid/appauth';
-import {
-  AuthActions,
-  AUTHORIZATION_RESPONSE_KEY,
-  AuthSubject,
-  Browser,
-  DefaultBrowser,
-  EndSessionHandler,
-  IAuthConfig,
-  IonicEndSessionHandler,
-  IonicUserInfoHandler,
-  UserInfoHandler,
-} from 'ionic-appauth';
-import {BehaviorSubject, Observable} from 'rxjs';
-import {PAIATokenRequestHandler} from './token-request-handler';
-import {PAIAAuthorizationRequestHandler} from './authorization-request-handler';
-import {PAIATokenRequest, PAIATokenRequestJson} from './paia-token-request';
-import {PAIAAuthorizationResponse} from './paia-authorization-response';
-import {PAIAAuthorizationNotifier} from './paia-authorization-notifier';
-import {PAIATokenResponse} from './paia-token-response';
-import {IPAIAAuthAction, PAIAAuthActionBuilder} from './paia-auth-action';
-import {SCAuthorizationProvider} from '@openstapps/core';
-import {ConfigProvider} from '../../config/config.provider';
-import {getClientConfig, getEndpointsConfig} from '../auth.provider.methods';
-import {Injectable} from '@angular/core';
-
-const TOKEN_RESPONSE_KEY = 'paia_token_response';
-const AUTH_EXPIRY_BUFFER = 10 * 60 * -1; // 10 minutes in seconds
-
-export interface IAuthService {
-  signIn(authExtras?: StringMap, state?: string): void;
-  signOut(state?: string, revokeTokens?: boolean): void;
-  loadUserInfo(): void;
-  authorizationCallback(callbackUrl: string): void;
-  loadTokenFromStorage(): void;
-  getValidToken(buffer?: number): Promise<PAIATokenResponse>;
-}
-
-@Injectable({
-  providedIn: 'root',
-})
-export class PAIAAuthService {
-  private _authConfig?: IAuthConfig;
-
-  private _authSubject: AuthSubject = new AuthSubject();
-
-  private _authSubjectV2 = new BehaviorSubject<IPAIAAuthAction>(PAIAAuthActionBuilder.Init());
-
-  private _tokenSubject = new BehaviorSubject<PAIATokenResponse | undefined>(undefined);
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private _userSubject = new BehaviorSubject<any>(undefined);
-
-  private _authenticatedSubject = new BehaviorSubject<boolean>(false);
-
-  private _loggedIn = new BehaviorSubject<boolean>(false);
-
-  private _initComplete = new BehaviorSubject<boolean>(false);
-
-  protected tokenHandler: PAIATokenRequestHandler;
-
-  protected userInfoHandler: UserInfoHandler;
-
-  protected requestHandler: PAIAAuthorizationRequestHandler;
-
-  protected endSessionHandler: EndSessionHandler;
-
-  public localConfiguration: AuthorizationServiceConfiguration;
-
-  constructor(
-    protected browser: Browser = new DefaultBrowser(),
-    protected storage: StorageBackend = new LocalStorageBackend(),
-    protected requestor: Requestor = new JQueryRequestor(),
-    private readonly configProvider: ConfigProvider,
-  ) {
-    this.tokenHandler = new PAIATokenRequestHandler(requestor);
-    this.userInfoHandler = new IonicUserInfoHandler(requestor);
-    this.requestHandler = new PAIAAuthorizationRequestHandler(
-      browser,
-      storage,
-      new BasicQueryStringUtils(),
-      crypto,
-    );
-    this.endSessionHandler = new IonicEndSessionHandler(browser);
-  }
-
-  get token$(): Observable<PAIATokenResponse | undefined> {
-    return this._tokenSubject.asObservable();
-  }
-
-  get isAuthenticated$(): Observable<boolean> {
-    return this._authenticatedSubject.asObservable();
-  }
-
-  /**
-   * Similar to isAuthenticated$, but will also return true if the token is expired
-   */
-  get isLoggedIn$(): Observable<boolean> {
-    return this._loggedIn.asObservable();
-  }
-
-  get initComplete$(): Observable<boolean> {
-    return this._initComplete.asObservable();
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  get user$(): Observable<any> {
-    return this._userSubject.asObservable();
-  }
-
-  get events$(): Observable<IPAIAAuthAction> {
-    return this._authSubjectV2.asObservable();
-  }
-
-  get authConfig(): IAuthConfig {
-    if (!this._authConfig) throw new Error('AuthConfig Not Defined');
-
-    return this._authConfig;
-  }
-
-  set authConfig(value: IAuthConfig) {
-    this._authConfig = value;
-  }
-
-  get configuration(): Promise<AuthorizationServiceConfiguration> {
-    if (!this.localConfiguration) throw new Error('Local Configuration Not Defined');
-
-    return Promise.resolve(this.localConfiguration);
-  }
-
-  public async init() {
-    this.setupConfiguration();
-    this.setupAuthorizationNotifier();
-    await this.loadTokenFromStorage();
-  }
-
-  setupConfiguration() {
-    const authConfig = this.configProvider.getAnyValue('auth') as {
-      paia: SCAuthorizationProvider;
-    };
-    this.authConfig = getClientConfig('paia', authConfig);
-    this.localConfiguration = new AuthorizationServiceConfiguration(getEndpointsConfig('paia', authConfig));
-  }
-
-  protected notifyActionListers(action: IPAIAAuthAction) {
-    /* eslint-disable unicorn/no-useless-undefined */
-    switch (action.action) {
-      case AuthActions.SignInFailed:
-      case AuthActions.SignOutSuccess:
-      case AuthActions.SignOutFailed: {
-        this._tokenSubject.next(undefined);
-        this._userSubject.next(undefined);
-        this._authenticatedSubject.next(false);
-        this._loggedIn.next(false);
-        break;
-      }
-      case AuthActions.LoadTokenFromStorageFailed: {
-        this._tokenSubject.next(undefined);
-        this._userSubject.next(undefined);
-        this._authenticatedSubject.next(false);
-        this._loggedIn.next(false);
-        this._initComplete.next(true);
-        break;
-      }
-      case AuthActions.SignInSuccess: {
-        this._tokenSubject.next(action.tokenResponse);
-        this._authenticatedSubject.next(true);
-        this._loggedIn.next(true);
-        break;
-      }
-      case AuthActions.LoadTokenFromStorageSuccess: {
-        this._tokenSubject.next(action.tokenResponse);
-        this._authenticatedSubject.next((action.tokenResponse as TokenResponse).isValid(0));
-        this._loggedIn.next(true);
-        this._initComplete.next(true);
-        break;
-      }
-      case AuthActions.RevokeTokensSuccess: {
-        this._tokenSubject.next(undefined);
-        break;
-      }
-      case AuthActions.LoadUserInfoSuccess: {
-        this._userSubject.next(action.user);
-        break;
-      }
-      case AuthActions.LoadUserInfoFailed: {
-        this._userSubject.next(undefined);
-        break;
-      }
-    }
-
-    this._authSubjectV2.next(action);
-    this._authSubject.notify(action);
-  }
-
-  protected setupAuthorizationNotifier() {
-    const notifier = new PAIAAuthorizationNotifier();
-    this.requestHandler.setAuthorizationNotifier(notifier);
-    notifier.setAuthorizationListener((request, response, error) =>
-      this.onAuthorizationNotification(request, response, error),
-    );
-  }
-
-  protected onAuthorizationNotification(
-    request: AuthorizationRequest,
-    response: PAIAAuthorizationResponse | null,
-    error: AuthorizationError | null,
-  ) {
-    const codeVerifier: string | undefined =
-      request.internal != undefined && this.authConfig.pkce ? request.internal.code_verifier : undefined;
-
-    if (response != undefined) {
-      this.requestAccessToken(response.code, response.patron, codeVerifier);
-    } else if (error == undefined) {
-      throw new Error('Unknown Error With Authentication');
-    } else {
-      throw new Error(error.errorDescription);
-    }
-  }
-
-  protected async internalAuthorizationCallback(url: string) {
-    this.browser.closeWindow();
-    await this.storage.setItem(AUTHORIZATION_RESPONSE_KEY, url);
-    return this.requestHandler.completeAuthorizationRequestIfPossible();
-  }
-
-  protected async performAuthorizationRequest(authExtras?: StringMap, state?: string): Promise<void> {
-    const requestJson: AuthorizationRequestJson = {
-      response_type: AuthorizationRequest.RESPONSE_TYPE_CODE,
-      client_id: this.authConfig.client_id,
-      redirect_uri: this.authConfig.redirect_url,
-      scope: this.authConfig.scopes,
-      extras: authExtras,
-      state: state || undefined,
-    };
-
-    const request = new AuthorizationRequest(requestJson, new DefaultCrypto(), this.authConfig.pkce);
-
-    if (this.authConfig.pkce) await request.setupCodeVerifier();
-
-    return this.requestHandler.performAuthorizationRequest(await this.configuration, request);
-  }
-
-  protected async requestAccessToken(code: string, patron: string, codeVerifier?: string): Promise<void> {
-    const requestJSON: PAIATokenRequestJson = {
-      code: code,
-      patron: patron,
-      extras: codeVerifier
-        ? {
-            code_verifier: codeVerifier,
-          }
-        : {},
-    };
-
-    const token: PAIATokenResponse = await this.tokenHandler.performTokenRequest(
-      await this.configuration,
-      new PAIATokenRequest(requestJSON),
-    );
-    await this.storage.setItem(TOKEN_RESPONSE_KEY, JSON.stringify(token.toJson()));
-    this.notifyActionListers(PAIAAuthActionBuilder.SignInSuccess(token));
-  }
-
-  public async revokeTokens() {
-    // Note: only locally
-    await this.storage.removeItem(TOKEN_RESPONSE_KEY);
-    this.notifyActionListers(PAIAAuthActionBuilder.RevokeTokensSuccess());
-  }
-
-  public async signOut() {
-    await this.revokeTokens().catch(error =>
-      this.notifyActionListers(PAIAAuthActionBuilder.SignOutFailed(error)),
-    );
-    this.notifyActionListers(PAIAAuthActionBuilder.SignOutSuccess());
-  }
-
-  protected async internalLoadTokenFromStorage() {
-    let token: PAIATokenResponse | undefined;
-    const tokenResponseString: string | null = await this.storage.getItem(TOKEN_RESPONSE_KEY);
-
-    if (tokenResponseString != undefined) {
-      token = new PAIATokenResponse(JSON.parse(tokenResponseString));
-
-      if (token) {
-        return this.notifyActionListers(PAIAAuthActionBuilder.LoadTokenFromStorageSuccess(token));
-      }
-    }
-
-    throw new Error('No Token In Storage');
-  }
-
-  protected async internalRequestUserInfo() {
-    if (this._tokenSubject.value) {
-      const userInfo = await this.userInfoHandler.performUserInfoRequest(
-        await this.configuration,
-        this._tokenSubject.value,
-      );
-      this.notifyActionListers(PAIAAuthActionBuilder.LoadUserInfoSuccess(userInfo));
-    } else {
-      throw new Error('No Token Available');
-    }
-  }
-
-  public async loadTokenFromStorage() {
-    await this.internalLoadTokenFromStorage().catch(error => {
-      this.notifyActionListers(PAIAAuthActionBuilder.LoadTokenFromStorageFailed(error));
-    });
-  }
-
-  public async signIn(authExtras?: StringMap, state?: string) {
-    await this.performAuthorizationRequest(authExtras, state).catch(error => {
-      this.notifyActionListers(PAIAAuthActionBuilder.SignInFailed(error));
-    });
-  }
-
-  public async loadUserInfo() {
-    await this.internalRequestUserInfo().catch(error => {
-      this.notifyActionListers(PAIAAuthActionBuilder.LoadUserInfoFailed(error));
-    });
-  }
-
-  public authorizationCallback(callbackUrl: string): void {
-    this.internalAuthorizationCallback(callbackUrl).catch(error => {
-      this.notifyActionListers(PAIAAuthActionBuilder.SignInFailed(error));
-    });
-  }
-
-  public async getValidToken(buffer: number = AUTH_EXPIRY_BUFFER): Promise<PAIATokenResponse> {
-    if (this._tokenSubject.value && this._tokenSubject.value.isValid(buffer)) {
-      return this._tokenSubject.value;
-    }
-
-    const error = new Error('Unable To Obtain Valid Token');
-    this.notifyActionListers(PAIAAuthActionBuilder.SignInFailed(error));
-
-    throw error;
-  }
-}
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2021 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-import {AuthorizationError, AuthorizationRequest} from '@openid/appauth';
-import {PAIAAuthorizationResponse} from './paia-authorization-response';
-
-export type PAIAAuthorizationListener = (
-  request: AuthorizationRequest,
-  response: PAIAAuthorizationResponse | null,
-  error: AuthorizationError | null,
-) => void;
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <https://www.gnu.org/licenses/>.
- */
-import {PAIAAuthorizationListener} from './paia-authorization-listener';
-import {AuthorizationError, AuthorizationRequest} from '@openid/appauth';
-import {PAIAAuthorizationResponse} from './paia-authorization-response';
-
-export class PAIAAuthorizationNotifier {
-  // eslint-disable-next-line unicorn/no-null
-  private listener: PAIAAuthorizationListener | null = null;
-
-  setAuthorizationListener(listener: PAIAAuthorizationListener) {
-    this.listener = listener;
-  }
-
-  /**
-   * The authorization complete callback.
-   */
-  onAuthorizationComplete(
-    request: AuthorizationRequest,
-    response: PAIAAuthorizationResponse | null,
-    error: AuthorizationError | null,
-  ): void {
-    if (this.listener) {
-      // complete authorization request
-      this.listener(request, response, error);
-    }
-  }
-}
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2021 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-export interface PAIAAuthorizationResponseJson {
-  code: string;
-  state: string;
-  patron: string;
-}
-
-export class PAIAAuthorizationResponse {
-  code: string;
-
-  state: string;
-
-  patron: string;
-
-  constructor(response: PAIAAuthorizationResponseJson) {
-    this.code = response.code;
-    this.state = response.state;
-    this.patron = response.patron;
-  }
-
-  toJson(): PAIAAuthorizationResponseJson {
-    return {code: this.code, state: this.state, patron: this.patron};
-  }
-}
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2021 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <https://www.gnu.org/licenses/>.
- */
-import {StringMap} from '@openid/appauth';
-
-// TODO: add documentation
-export interface PAIATokenRequestJson {
-  code: string;
-  patron: string;
-  extras?: StringMap;
-}
-
-export class PAIATokenRequest {
-  code: string;
-
-  patron: string;
-
-  extras?: StringMap;
-
-  constructor(request: PAIATokenRequestJson) {
-    this.code = request.code;
-    this.patron = request.patron;
-    this.extras = request.extras;
-  }
-
-  /**
-   * Serializes a TokenRequest to a JavaScript object.
-   */
-  toJson(): PAIATokenRequestJson {
-    return {
-      code: this.code,
-      patron: this.patron,
-      extras: this.extras,
-    };
-  }
-
-  toStringMap(): StringMap {
-    const map: StringMap = {
-      patron: this.patron,
-      code: this.code,
-    };
-
-    // copy over extras
-    if (this.extras) {
-      for (const extra in this.extras) {
-        if (this.extras.hasOwnProperty(extra) && !map.hasOwnProperty(extra)) {
-          // check before inserting to requestMap
-          map[extra] = this.extras[extra];
-        }
-      }
-    }
-    return map;
-  }
-}
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2021 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-import {TokenResponse, TokenResponseJson} from '@openid/appauth';
-import {nowInSeconds} from '@openid/appauth';
-
-const AUTH_EXPIRY_BUFFER = 10 * 60 * -1; // 10 mins in seconds
-
-export interface PAIATokenResponseJson extends TokenResponseJson {
-  patron: string;
-}
-
-export class PAIATokenResponse extends TokenResponse {
-  patron: string;
-
-  constructor(response: PAIATokenResponseJson) {
-    super(response);
-    this.patron = response.patron;
-  }
-
-  toJson(): PAIATokenResponseJson {
-    return {
-      access_token: this.accessToken,
-      id_token: this.idToken,
-      refresh_token: this.refreshToken,
-      scope: this.scope,
-      token_type: this.tokenType,
-      issued_at: this.issuedAt,
-      expires_in: this.expiresIn?.toString(),
-      patron: this.patron,
-    };
-  }
-
-  isValid(buffer: number = AUTH_EXPIRY_BUFFER): boolean {
-    if (this.expiresIn) {
-      const now = nowInSeconds();
-      return now < this.issuedAt + this.expiresIn + buffer;
-    } else {
-      return true;
-    }
-  }
-}
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2022 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <https://www.gnu.org/licenses/>.
- */
-import {AuthorizationServiceConfiguration, Requestor} from '@openid/appauth';
-import {PAIATokenResponse} from './paia-token-response';
-
-export interface UserInfoHandler {
-  performUserInfoRequest(
-    configuration: AuthorizationServiceConfiguration,
-    token: PAIATokenResponse,
-  ): Promise<unknown>;
-}
-
-export class PAIAUserInfoHandler implements UserInfoHandler {
-  constructor(private requestor: Requestor) {}
-
-  public async performUserInfoRequest(
-    configuration: AuthorizationServiceConfiguration,
-    token: PAIATokenResponse,
-  ): Promise<unknown> {
-    const settings: JQueryAjaxSettings = {
-      url: `${configuration.userInfoEndpoint}/${token.patron}`,
-      method: 'GET',
-      headers: {
-        Authorization: `${token.tokenType == 'bearer' ? 'Bearer' : token.tokenType} ${token.accessToken}`,
-      },
-    };
-
-    return this.requestor.xhr(settings);
-  }
-}
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2022 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <https://www.gnu.org/licenses/>.
- */
-import {
-  TokenErrorJson,
-  AuthorizationServiceConfiguration,
-  RevokeTokenRequest,
-  Requestor,
-  JQueryRequestor,
-  BasicQueryStringUtils,
-  QueryStringUtils,
-  AppAuthError,
-  TokenError,
-} from '@openid/appauth';
-import {PAIATokenRequest} from './paia-token-request';
-import {PAIATokenResponse, PAIATokenResponseJson} from './paia-token-response';
-
-export class PAIATokenRequestHandler {
-  constructor(
-    public readonly requestor: Requestor = new JQueryRequestor(),
-    public readonly utils: QueryStringUtils = new BasicQueryStringUtils(),
-  ) {}
-
-  private isTokenResponse(
-    response: PAIATokenResponseJson | TokenErrorJson,
-  ): response is PAIATokenResponseJson {
-    return (response as TokenErrorJson).error === undefined;
-  }
-
-  performRevokeTokenRequest(
-    configuration: AuthorizationServiceConfiguration,
-    request: RevokeTokenRequest,
-  ): Promise<boolean> {
-    const revokeTokenResponse = this.requestor.xhr<boolean>({
-      url: configuration.revocationEndpoint,
-      method: 'GET',
-      // headers: {'Content-Type': 'application/x-www-form-urlencoded'},
-      data: this.utils.stringify(request.toStringMap()),
-    });
-
-    return revokeTokenResponse.then(_response => {
-      return true;
-    });
-  }
-
-  performTokenRequest(
-    configuration: AuthorizationServiceConfiguration,
-    request: PAIATokenRequest,
-  ): Promise<PAIATokenResponse> {
-    const tokenResponse = this.requestor.xhr<PAIATokenResponseJson | TokenErrorJson>({
-      url: configuration.tokenEndpoint,
-      method: 'POST',
-      data: {
-        patron: request.patron,
-        grant_type: 'authorization_code',
-        ...request.toStringMap(),
-      },
-      headers: {
-        'Authorization': `Basic ${request.code}`,
-        'Content-Type': 'application/json',
-      },
-    });
-
-    return tokenResponse.then(response => {
-      return this.isTokenResponse(response)
-        ? new PAIATokenResponse(response)
-        : Promise.reject<PAIATokenResponse>(new AppAuthError(response.error, new TokenError(response)));
-    });
-  }
-}
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2022 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-export interface IUserInfo {
-  display_name: string;
-  role: string;
-  email: string;
-  user_name: string;
-}
@@ -40,16 +40,19 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';

@Injectable()
 export class ScheduleSyncService {
-  destroy$ = inject(DestroyRef);
+  private scheduleProvider = inject(ScheduleProvider);

-  constructor(
-    private scheduleProvider: ScheduleProvider,
-    private storageProvider: StorageProvider,
-    private translator: ThingTranslateService,
-    private dateFormatPipe: DateFormatPipe,
-    private durationFormatPipe: DurationPipe,
-    private calendar: CalendarService,
-  ) {}
+  private storageProvider = inject(StorageProvider);
+
+  private translator = inject(ThingTranslateService);
+
+  private dateFormatPipe = inject(DateFormatPipe);
+
+  private durationFormatPipe = inject(DurationPipe);
+
+  private calendar = inject(CalendarService);
+
+  destroy$ = inject(DestroyRef);

  init() {
    this.scheduleProvider.uuids$
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-import {Component, Input, OnInit} from '@angular/core';
+import {Component, Input, OnInit, inject} from '@angular/core';
 import {
  getICalExport,
  getNativeCalendarExport,
@@ -42,8 +42,15 @@ interface ICalInfo {
  selector: 'add-event-review-modal',
  templateUrl: 'add-event-review-modal.html',
  styleUrls: ['add-event-review-modal.scss'],
+  standalone: false,
 })
 export class AddEventReviewModalComponent implements OnInit {
+  readonly calendarService = inject(CalendarService);
+
+  readonly translator = inject(ThingTranslateService);
+
+  readonly translateService = inject(TranslateService);
+
  moment = moment;

  @Input() dismissAction: () => void;
@@ -56,12 +63,6 @@ export class AddEventReviewModalComponent implements OnInit {

  isWeb = true;

-  constructor(
-    readonly calendarService: CalendarService,
-    readonly translator: ThingTranslateService,
-    readonly translateService: TranslateService,
-  ) {}
-
  ngOnInit() {
    Device.getInfo().then(it => {
      this.isWeb = it.platform === 'web';
@@ -14,7 +14,7 @@
 */

 import {Calendar} from '@awesome-cordova-plugins/calendar/ngx';
-import {Injectable} from '@angular/core';
+import {Injectable, inject} from '@angular/core';
 import {ICalEvent} from './ical/ical';
 import moment, {duration, Moment, unitOfTime} from 'moment';
 import {Dialog} from '@capacitor/dialog';
@@ -31,6 +31,10 @@ const RECURRENCE_PATTERNS: Partial<Record<unitOfTime.Diff, string | undefined>>

@Injectable()
 export class CalendarService {
+  readonly calendar = inject(Calendar);
+
+  private readonly configProvider = inject(ConfigProvider);
+
  goToDate = new Subject<number>();

  goToDateClicked = this.goToDate.asObservable();
@@ -38,10 +42,7 @@ export class CalendarService {
  calendarName = 'StApps';

  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  constructor(
-    readonly calendar: Calendar,
-    private readonly configProvider: ConfigProvider,
-  ) {
+  constructor() {
    this.calendarName = (this.configProvider.getValue('name') as string) ?? 'StApps';
  }

@@ -68,6 +68,8 @@ export type DateSeriesRelevantData = Pick<SCDateSeries, DateSeriesRelevantKeys>;
 */
@Injectable()
 export class ScheduleProvider implements OnDestroy {
+  private readonly dataProvider = inject(DataProvider);
+
  // tslint:disable:prefer-function-over-method

  private static partialEventsStorageKey = 'schedule::partial_events';
@@ -76,7 +78,7 @@ export class ScheduleProvider implements OnDestroy {

  destroy$ = inject(DestroyRef);

-  constructor(private readonly dataProvider: DataProvider) {
+  constructor() {
    window.addEventListener('storage', this.storageListener);
  }

@@ -23,7 +23,7 @@
  </ion-toolbar>
  <ion-toolbar color="primary" mode="md">
    <ion-segment (ionChange)="segmentChanged($event)" [value]="selectedSemesterUID" mode="md">
-      @for (semester of availableSemesters; track semester) {
+      @for (semester of availableSemesters; track semester.uid) {
        <ion-segment-button [value]="semester.uid">
          <ion-label>{{ semester.acronym }}</ion-label>
        </ion-segment-button>
@@ -35,7 +35,7 @@
 <ion-content>
  @if (catalogs && catalogs.length > 0) {
    <ion-list>
-      @for (catalog of catalogs; track catalog) {
+      @for (catalog of catalogs; track catalog.uid) {
        <ion-item button="true" lines="inset" (click)="notifySelect(catalog)">
          <ion-label>
            <h2>{{ catalog.name }}</h2>
@@ -46,7 +46,7 @@
  }
  @if (!catalogs) {
    <ion-list>
-      @for (skeleton of [].constructor(10); track skeleton) {
+      @for (skeleton of [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; track skeleton) {
        <stapps-skeleton-list-item> </stapps-skeleton-list-item>
      }
    </ion-list>
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-import {Component, OnInit} from '@angular/core';
+import {Component, OnInit, inject} from '@angular/core';
 import {Router, ActivatedRoute} from '@angular/router';
 import {SCCatalog, SCSemester} from '@openstapps/core';
 import moment from 'moment';
@@ -26,8 +26,21 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
  selector: 'app-catalog',
  templateUrl: './catalog.component.html',
  styleUrls: ['./catalog.component.scss'],
+  standalone: false,
 })
 export class CatalogComponent implements OnInit {
+  private readonly route = inject(ActivatedRoute);
+
+  private readonly catalogProvider = inject(CatalogProvider);
+
+  private readonly dataRoutingService = inject(DataRoutingService);
+
+  private readonly logger = inject(NGXLogger);
+
+  protected router = inject(Router);
+
+  location = inject(Location);
+
  /**
   * SCSemester to show
   */
@@ -53,14 +66,7 @@ export class CatalogComponent implements OnInit {
   */
  superCatalog: SCCatalog;

-  constructor(
-    private readonly route: ActivatedRoute,
-    private readonly catalogProvider: CatalogProvider,
-    private readonly dataRoutingService: DataRoutingService,
-    private readonly logger: NGXLogger,
-    protected router: Router,
-    public location: Location,
-  ) {
+  constructor() {
    this.dataRoutingService
      .itemSelectListener()
      .pipe(takeUntilDestroyed())
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-import {Injectable} from '@angular/core';
+import {Injectable, inject} from '@angular/core';
 import {
  SCCatalogWithoutReferences,
  SCSearchFilter,
@@ -28,7 +28,7 @@ import {DataProvider} from '../data/data.provider';
  providedIn: 'root',
 })
 export class CatalogProvider {
-  constructor(private readonly dataProvider: DataProvider) {}
+  private readonly dataProvider = inject(DataProvider);

  /**
   * Get news messages
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-import {Injectable} from '@angular/core';
+import {Injectable, inject} from '@angular/core';
 import {Client} from '@openstapps/api';
 import {SCAppConfiguration, SCIndexResponse} from '@openstapps/core';
 import {CORE_VERSION} from '@openstapps/core';
@@ -44,6 +44,12 @@ export const STORAGE_KEY_CONFIG = 'stapps.config';
  providedIn: 'root',
 })
 export class ConfigProvider {
+  private readonly storageProvider = inject(StorageProvider);
+
+  private readonly logger = inject(NGXLogger);
+
+  private readonly internetConnectionService = inject(InternetConnectionService);
+
  /**
   * Api client
   */
@@ -66,16 +72,10 @@ export class ConfigProvider {

  /**
   * Constructor, initialise api client
-   * @param storageProvider StorageProvider to load persistent configuration
-   * @param swHttpClient Api client
-   * @param logger An angular logger
   */
-  constructor(
-    private readonly storageProvider: StorageProvider,
-    swHttpClient: StAppsWebHttpClient,
-    private readonly logger: NGXLogger,
-    private readonly internetConnectionService: InternetConnectionService,
-  ) {
+  constructor() {
+    const swHttpClient = inject(StAppsWebHttpClient);
+
    console.log('config init');
    this.client = new Client(swHttpClient, environment.backend_url, environment.backend_version);
  }
@@ -13,9 +13,9 @@
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */

-@import '../../../theme/util/mixins';
+@use '../../../theme/util/mixins';

-@include ion-md-down {
+@include mixins.ion-md-down {
  ion-toolbar,
  .logo,
  .schedule,
@@ -21,7 +21,7 @@
 <div #schedule class="schedule">
  <a [routerLink]="['/schedule/weekly-view']">
    <ion-icon [size]="36" [weight]="300" name="calendar_month"></ion-icon>
-    <ion-label [innerHTML]="'schedule.recurring' | translate"></ion-label>
+    <ion-label>{{ 'schedule.recurring' | translate }}</ion-label>
  </a>
  <!-- Avoid structural directives here, they might interfere with the collapse animation -->
  <a
@@ -13,7 +13,7 @@
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */

-@import '../../../theme/util/mixins';
+@use '../../../theme/util/mixins';

 :host ion-header {
  z-index: 1;
@@ -59,15 +59,6 @@ ion-content {
 }

 .schedule {
-  @include ion-md-up {
-    position: unset;
-
-    width: unset;
-    height: calc(var(--tablet-top-bar-height) + (2 * var(--spacing-xl)));
-    margin: 0;
-    padding: var(--spacing-xl);
-  }
-
  z-index: 3;

  display: flex;
@@ -82,6 +73,15 @@ ion-content {

  background: var(--ion-color-primary);

+  @include mixins.ion-md-up {
+    position: unset;
+
+    width: unset;
+    height: calc(var(--tablet-top-bar-height) + (2 * var(--spacing-xl)));
+    margin: 0;
+    padding: var(--spacing-xl);
+  }
+
  a {
    display: flex;
    flex-direction: column;
@@ -89,18 +89,13 @@ ion-content {
    height: auto;
    min-height: 80px;
    padding: var(--spacing-sm);
+    border-radius: var(--border-radius-default);

    color: var(--ion-color-primary-contrast);
    text-decoration: none;
-
-    border-radius: var(--border-radius-default);
  }

  a:first-child {
-    @include phone-landscape {
-      height: auto;
-    }
-
    overflow: hidden;
    flex: 0 0 auto;
    gap: var(--spacing-sm);
@@ -108,27 +103,22 @@ ion-content {
    justify-content: center;

    height: 100%;
+    border: 2px solid var(--ion-color-primary-tint);

    text-align: center;

-    border: 2px solid var(--ion-color-primary-tint);
+    @include mixins.phone-landscape {
+      height: auto;
+    }

    ion-label {
      font-size: var(--font-size-xxs);
      font-weight: var(--font-weight-semi-bold);
-      word-break: break-word;
+      word-break: overflow-wrap;
    }
  }

  a:last-child {
-    @include ion-md-up {
-      flex: 1 1 100%;
-    }
-
-    @include phone-landscape {
-      flex: 1 1 85%;
-    }
-
    z-index: 1;

    flex: 1 1 65%;
@@ -138,6 +128,14 @@ ion-content {

    background: var(--linear-gradient);

+    @include mixins.ion-md-up {
+      flex: 1 1 100%;
+    }
+
+    @include mixins.phone-landscape {
+      flex: 1 1 85%;
+    }
+
    ion-label {
      font-size: var(--font-size-xxs);
      font-weight: var(--font-weight-bold);
@@ -38,8 +38,23 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
  selector: 'app-dashboard',
  templateUrl: './dashboard.component.html',
  styleUrls: ['./dashboard.component.scss', './dashboard.collapse.component.scss'],
+  standalone: false,
 })
 export class DashboardComponent implements OnInit, OnDestroy, AfterViewInit {
+  private readonly dataRoutingService = inject(DataRoutingService);
+
+  private scheduleProvider = inject(ScheduleProvider);
+
+  protected router = inject(Router);
+
+  location = inject(Location);
+
+  private animationControl = inject(AnimationController);
+
+  private breakpointObserver = inject(BreakpointObserver);
+
+  private zone = inject(NgZone);
+
  @ViewChild('toolbar', {read: ElementRef}) toolbarRef: ElementRef;

  @ViewChild('schedule', {read: ElementRef}) scheduleRef: ElementRef;
@@ -60,15 +75,7 @@ export class DashboardComponent implements OnInit, OnDestroy, AfterViewInit {

  destroy$ = inject(DestroyRef);

-  constructor(
-    private readonly dataRoutingService: DataRoutingService,
-    private scheduleProvider: ScheduleProvider,
-    protected router: Router,
-    public location: Location,
-    private animationControl: AnimationController,
-    private breakpointObserver: BreakpointObserver,
-    private zone: NgZone,
-  ) {
+  constructor() {
    this.dataRoutingService
      .itemSelectListener()
      .pipe(takeUntilDestroyed())
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-import {Injectable} from '@angular/core';
+import {inject, Injectable} from '@angular/core';
 import {
  SCBooleanFilterArguments,
  SCMessage,
@@ -28,7 +28,9 @@ import {DataProvider} from '../data/data.provider';
  providedIn: 'root',
 })
 export class DashboardProvider {
-  constructor(private readonly dataProvider: DataProvider) {}
+  private readonly dataProvider = inject(DataProvider);
+
+  constructor() {}

  /**
   * Get news messages
@@ -19,7 +19,7 @@
  </ion-button>
  @if (items | async; as items) {
    <simple-swiper @fade>
-      @for (item of items; track item) {
+      @for (item of items; track item.uid) {
        <stapps-data-list-item
          [hideThumbnail]="true"
          [listItemEndInteraction]="false"
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-import {ChangeDetectionStrategy, Component} from '@angular/core';
+import {ChangeDetectionStrategy, Component, inject} from '@angular/core';
 import {filter, map} from 'rxjs/operators';
 import {FavoritesService} from '../../../favorites/favorites.service';
 import {fadeAnimation} from '../../fade.animation';
@@ -27,12 +27,13 @@ import {isMensaThing} from '../../mensa-filters';
  styleUrls: ['favorites-section.component.scss'],
  animations: [fadeAnimation],
  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: false,
 })
 export class FavoritesSectionComponent {
+  private favoritesService = inject(FavoritesService);
+
  items = this.favoritesService.favoriteThings$.pipe(
    map(favorites => favorites.filter(it => !isMensaThing(it))),
    filter(favorites => favorites.length > 0),
  );
-
-  constructor(private favoritesService: FavoritesService) {}
 }
@@ -19,7 +19,7 @@
  </ion-button>
  @if (jobs | async; as jobs) {
    <simple-swiper @fade>
-      @for (item of jobs; track item) {
+      @for (item of jobs; track item.uid) {
        <stapps-data-list-item
          [hideThumbnail]="true"
          [item]="item"
@@ -29,8 +29,8 @@ simple-swiper {

  &::part(native) {
    height: 100%;
-    background: none;
    border-radius: var(--border-radius-default);
+    background: none;
  }

  ion-label {
@@ -26,6 +26,7 @@ import {fadeAnimation} from '../../fade.animation';
  styleUrls: ['job-section.component.scss'],
  animations: [fadeAnimation],
  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: false,
 })
 export class JobSectionComponent {
  jobs = inject(DataProvider)
@@ -16,7 +16,7 @@
@if (dishes | async; as dishes) {
  @if (dishes.length > 0) {
    <simple-swiper @fade>
-      @for (dish of dishes; track dish) {
+      @for (dish of dishes; track dish.uid) {
        <stapps-data-list-item
          [hideThumbnail]="true"
          [item]="dish"
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-import {ChangeDetectionStrategy, Component, Input} from '@angular/core';
+import {ChangeDetectionStrategy, Component, Input, inject} from '@angular/core';
 import {SCDish, SCPlace, SCThings} from '@openstapps/core';
 import {PlaceMensaService} from '../../../data/types/place/special/mensa/place-mensa-service';
 import {fadeAnimation} from '../../fade.animation';
@@ -27,8 +27,11 @@ import {isToday} from 'date-fns';
  styleUrls: ['mensa-section-content.component.scss'],
  animations: [fadeAnimation],
  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: false,
 })
 export class MensaSectionContentComponent {
+  private readonly mensaService = inject(PlaceMensaService);
+
  /**
   * Map of dishes for each day
   */
@@ -41,6 +44,4 @@ export class MensaSectionContentComponent {
      return closestDayWithDishes ? it[closestDayWithDishes] : [];
    });
  }
-
-  constructor(private readonly mensaService: PlaceMensaService) {}
 }
@@ -15,7 +15,7 @@

@if (items | async; as items) {
  @if (items.length !== 0) {
-    @for (item of items; track item) {
+    @for (item of items; track item.uid) {
      <stapps-section @fade [item]="item" [title]="'name' | thingTranslate: item">
        <ion-button slot="button-end" fill="clear" color="medium" (click)="favoritesService.delete(item)">
          <ion-icon slot="icon-only" name="delete" [size]="24"></ion-icon>
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-import {ChangeDetectionStrategy, Component} from '@angular/core';
+import {ChangeDetectionStrategy, Component, inject} from '@angular/core';
 import {map} from 'rxjs/operators';
 import {FavoritesService} from '../../../favorites/favorites.service';
 import {fadeAnimation} from '../../fade.animation';
@@ -27,9 +27,10 @@ import {isMensaThing} from '../../mensa-filters';
  styleUrls: ['mensa-section.component.scss'],
  animations: [fadeAnimation],
  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: false,
 })
 export class MensaSectionComponent {
-  items = this.favoritesService.favoriteThings$.pipe(map(favorites => favorites.filter(isMensaThing)));
+  protected favoritesService = inject(FavoritesService);

-  constructor(protected favoritesService: FavoritesService) {}
+  items = this.favoritesService.favoriteThings$.pipe(map(favorites => favorites.filter(isMensaThing)));
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jovan Krunić	1c3ea06a7b	WIP	2026-10-02 19:52:32 +02:00
Rainer Killinger	dfb7336f25	refactor: fix map controlls	2026-10-01 18:10:57 +02:00
Rainer Killinger	32cc443600	refactor: id-cards related test	2026-10-01 16:44:56 +02:00
Rainer Killinger	c5e60ab9e5	refactor: upgrade typescript-eslint and start the stylistic migration	2026-10-01 16:44:51 +02:00
Rainer Killinger	444557b725	refactor: upgrade project to Typescript 5.9	2026-10-01 10:53:00 +02:00
Rainer Killinger	982c0cc57c	refactor: apply Angular 20 inject rules	2026-10-01 09:45:42 +02:00
Rainer Killinger	6d94dd74d7	refactor: angular 20 upgrade	2026-10-01 09:44:39 +02:00
Rainer Killinger	7105b38c71	refactor: maplibre update	2026-10-01 09:44:39 +02:00
Rainer Killinger	2ab759c1d6	refactor: fix new Angular warnings	2026-10-01 09:44:39 +02:00
Rainer Killinger	4dca0968e8	refactor: migrate sass/scss deprecations	2026-10-01 09:44:39 +02:00
Rainer Killinger	7519e8193b	fix: update @ionic/angular* and patch dependencies	2026-10-01 09:44:39 +02:00
Rainer Killinger	8457f791de	refactor: update to Angular 19.2	2026-10-01 09:44:38 +02:00
Rainer Killinger	4e02ecbc24	refactor: update to typescript 5.5.4	2026-10-01 09:44:36 +02:00
Jovan Krunić	66b8b53def	refactor: open external links without javascript in browser Close #246	2026-09-23 16:45:49 +02:00
Jovan Krunić	fb8c51de74	refactor: remove library features Closes #244	2026-09-11 15:25:22 +02:00
Rainer Killinger	1eaa70193d	fix: update critical production dependencies	2026-08-26 15:16:05 +02:00