mirror of
https://gitlab.com/openstapps/openstapps.git
synced 2026-09-22 02:41:56 +00:00
Compare commits
17
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
29f1c0e99e | ||
|
|
905a955622 | ||
|
|
68268eebe1 | ||
|
|
e3acb33355 | ||
|
|
0133fcdaf9 | ||
|
|
9f52db153f | ||
|
|
9848b5a952 | ||
|
|
a7881d56ab | ||
|
|
fb8c51de74 | ||
|
|
1eaa70193d | ||
|
|
2c7bed0b8b | ||
|
|
87d0af5a39 | ||
|
|
8ccbfac0b1 | ||
|
|
8550bf976b | ||
|
|
86004881b0 | ||
|
|
3d19fc87e3 | ||
|
|
80bcdad851 |
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
"@openstapps/proxy": patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Bumping proxy version to rebuild image
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
---
|
||||||
|
"@openstapps/projectmanagement": patch
|
||||||
|
"@openstapps/core-tools": patch
|
||||||
|
"@openstapps/easy-ast": patch
|
||||||
|
"@openstapps/app": patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Updated node-glob dependency
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
"@openstapps/app-cypress": patch
|
||||||
|
---
|
||||||
|
|
||||||
|
removed edge browser
|
||||||
+2
-2
@@ -120,6 +120,6 @@ audit:
|
|||||||
script:
|
script:
|
||||||
- pnpm audit --prod --audit-level critical
|
- pnpm audit --prod --audit-level critical
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_COMMIT_BRANCH == 'main'
|
|
||||||
allow_failure: false
|
|
||||||
- !reference [.limit_pipelines, rules]
|
- !reference [.limit_pipelines, rules]
|
||||||
|
# - if: $CI_COMMIT_BRANCH == 'main'
|
||||||
|
# allow_failure: false
|
||||||
|
|||||||
@@ -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',
|
icon: 'inventory_2',
|
||||||
route: '/catalog',
|
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',
|
icon: 'settings',
|
||||||
route: '/settings',
|
route: '/settings',
|
||||||
|
|||||||
@@ -32,25 +32,6 @@ const config = {
|
|||||||
userinfo: 'https://cas.rz.uni-frankfurt.de/cas/oauth2.0/profile',
|
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',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
app: {
|
app: {
|
||||||
...defaultApp,
|
...defaultApp,
|
||||||
@@ -60,16 +41,6 @@ const config = {
|
|||||||
authProvider: 'default',
|
authProvider: 'default',
|
||||||
url: 'https://his-self-service.rz.uni-frankfurt.de',
|
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: {
|
/** TODO: idCards: {
|
||||||
authProvider: 'default',
|
authProvider: 'default',
|
||||||
url: 'TODO',
|
url: 'TODO',
|
||||||
|
|||||||
@@ -100,7 +100,7 @@
|
|||||||
"supertest": "6.3.3",
|
"supertest": "6.3.3",
|
||||||
"ts-node": "10.9.2",
|
"ts-node": "10.9.2",
|
||||||
"tsup": "8.5.0",
|
"tsup": "8.5.0",
|
||||||
"typescript": "5.4.2"
|
"typescript": "5.5.4"
|
||||||
},
|
},
|
||||||
"tsup": {
|
"tsup": {
|
||||||
"entry": [
|
"entry": [
|
||||||
|
|||||||
@@ -51,7 +51,7 @@
|
|||||||
"is-cidr": "4.0.2",
|
"is-cidr": "4.0.2",
|
||||||
"mustache": "4.2.0",
|
"mustache": "4.2.0",
|
||||||
"semver": "7.6.0",
|
"semver": "7.6.0",
|
||||||
"typescript": "5.4.2"
|
"typescript": "5.5.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@openstapps/api-cli": "workspace:*",
|
"@openstapps/api-cli": "workspace:*",
|
||||||
|
|||||||
@@ -19,11 +19,11 @@
|
|||||||
"@openstapps/tsconfig": "workspace:*",
|
"@openstapps/tsconfig": "workspace:*",
|
||||||
"@types/node": "22.15.31",
|
"@types/node": "22.15.31",
|
||||||
"eslint": "8.57.0",
|
"eslint": "8.57.0",
|
||||||
"typescript": "5.4.2"
|
"typescript": "5.5.4"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@typescript-eslint/eslint-plugin": "7.11.0",
|
"@typescript-eslint/eslint-plugin": "7.18.0",
|
||||||
"@typescript-eslint/parser": "7.11.0",
|
"@typescript-eslint/parser": "7.18.0",
|
||||||
"eslint": "8.57.0",
|
"eslint": "8.57.0",
|
||||||
"eslint-config-prettier": "9.1.0",
|
"eslint-config-prettier": "9.1.0",
|
||||||
"eslint-plugin-jsdoc": "48.2.1",
|
"eslint-plugin-jsdoc": "48.2.1",
|
||||||
|
|||||||
@@ -9,7 +9,8 @@ const config = {
|
|||||||
trailingComma: 'all',
|
trailingComma: 'all',
|
||||||
bracketSpacing: false,
|
bracketSpacing: false,
|
||||||
arrowParens: 'avoid',
|
arrowParens: 'avoid',
|
||||||
endOfLine: 'lf'
|
endOfLine: 'lf',
|
||||||
|
htmlWhitespaceSensitivity: 'strict'
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = config;
|
module.exports = config;
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
"@openstapps/logger": "workspace:*",
|
"@openstapps/logger": "workspace:*",
|
||||||
"commander": "10.0.0",
|
"commander": "10.0.0",
|
||||||
"date-fns": "3.6.0",
|
"date-fns": "3.6.0",
|
||||||
"glob": "10.3.10",
|
"glob": "10.5.0",
|
||||||
"mustache": "4.2.0"
|
"mustache": "4.2.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
@@ -64,7 +64,7 @@
|
|||||||
"mocha-junit-reporter": "2.2.0",
|
"mocha-junit-reporter": "2.2.0",
|
||||||
"ts-node": "10.9.2",
|
"ts-node": "10.9.2",
|
||||||
"tsup": "8.5.0",
|
"tsup": "8.5.0",
|
||||||
"typescript": "5.4.2"
|
"typescript": "5.5.4"
|
||||||
},
|
},
|
||||||
"tsup": {
|
"tsup": {
|
||||||
"entry": [
|
"entry": [
|
||||||
|
|||||||
@@ -55,7 +55,7 @@
|
|||||||
"nock": "13.3.1",
|
"nock": "13.3.1",
|
||||||
"ts-node": "10.9.2",
|
"ts-node": "10.9.2",
|
||||||
"tsup": "8.5.0",
|
"tsup": "8.5.0",
|
||||||
"typescript": "5.4.2"
|
"typescript": "5.5.4"
|
||||||
},
|
},
|
||||||
"tsup": {
|
"tsup": {
|
||||||
"entry": [
|
"entry": [
|
||||||
|
|||||||
@@ -44,7 +44,7 @@
|
|||||||
"@types/express": "4.17.17",
|
"@types/express": "4.17.17",
|
||||||
"@types/node": "22.15.31",
|
"@types/node": "22.15.31",
|
||||||
"tsup": "8.5.0",
|
"tsup": "8.5.0",
|
||||||
"typescript": "5.4.2"
|
"typescript": "5.5.4"
|
||||||
},
|
},
|
||||||
"tsup": {
|
"tsup": {
|
||||||
"entry": [
|
"entry": [
|
||||||
|
|||||||
@@ -65,7 +65,8 @@
|
|||||||
],
|
],
|
||||||
"@typescript-eslint/lines-between-class-members": ["error", "always"],
|
"@typescript-eslint/lines-between-class-members": ["error", "always"],
|
||||||
"@typescript-eslint/no-explicit-any": "error",
|
"@typescript-eslint/no-explicit-any": "error",
|
||||||
"@angular-eslint/use-lifecycle-interface": "error"
|
"@angular-eslint/use-lifecycle-interface": "error",
|
||||||
|
"@angular-eslint/prefer-standalone": "off"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
apply plugin: 'com.android.application'
|
apply plugin: 'com.android.application'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
namespace "de.anyschool.app"
|
namespace = "de.anyschool.app"
|
||||||
compileSdk rootProject.ext.compileSdkVersion
|
compileSdk = rootProject.ext.compileSdkVersion
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "de.anyschool.app"
|
applicationId "de.anyschool.app"
|
||||||
minSdkVersion rootProject.ext.minSdkVersion
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
@@ -13,7 +13,7 @@ android {
|
|||||||
aaptOptions {
|
aaptOptions {
|
||||||
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
||||||
// Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
|
// Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
|
||||||
ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
|
ignoreAssetsPattern = '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
android:theme="@style/AppTheme"
|
android:theme="@style/AppTheme"
|
||||||
android:usesCleartextTraffic="true">
|
android:usesCleartextTraffic="true">
|
||||||
<activity
|
<activity
|
||||||
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout"
|
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation|density"
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
android:label="@string/title_activity_main"
|
android:label="@string/title_activity_main"
|
||||||
android:launchMode="singleTask"
|
android:launchMode="singleTask"
|
||||||
|
|||||||
@@ -7,5 +7,6 @@
|
|||||||
<item name="android:statusBarColor">@color/colorPrimary</item>
|
<item name="android:statusBarColor">@color/colorPrimary</item>
|
||||||
<item name="android:windowBackground">@color/colorPrimary</item>
|
<item name="android:windowBackground">@color/colorPrimary</item>
|
||||||
<item name="android:navigationBarColor">@color/colorBackground</item>
|
<item name="android:navigationBarColor">@color/colorBackground</item>
|
||||||
|
<item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
|
||||||
</style>
|
</style>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
<item name="colorPrimary">@color/colorPrimary</item>
|
<item name="colorPrimary">@color/colorPrimary</item>
|
||||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||||
<item name="colorAccent">@color/colorAccent</item>
|
<item name="colorAccent">@color/colorAccent</item>
|
||||||
|
<item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
|
<style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
|
||||||
@@ -17,6 +18,7 @@
|
|||||||
<item name="android:windowBackground">@color/colorPrimary</item>
|
<item name="android:windowBackground">@color/colorPrimary</item>
|
||||||
<item name="android:navigationBarColor">@color/colorBackground</item>
|
<item name="android:navigationBarColor">@color/colorBackground</item>
|
||||||
<item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
|
<item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
|
||||||
|
<item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ buildscript {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:8.7.2'
|
classpath 'com.android.tools.build:gradle:8.13.0'
|
||||||
classpath 'com.google.gms:google-services:4.4.2'
|
classpath 'com.google.gms:google-services:4.4.4'
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
|
|||||||
@@ -1,60 +1,60 @@
|
|||||||
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
|
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
|
||||||
include ':capacitor-android'
|
include ':capacitor-android'
|
||||||
project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@7.4.2_@capacitor+core@7.4.2/node_modules/@capacitor/android/capacitor')
|
project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@8.2.0_@capacitor+core@8.2.0/node_modules/@capacitor/android/capacitor')
|
||||||
|
|
||||||
include ':capacitor-community-in-app-review'
|
include ':capacitor-community-in-app-review'
|
||||||
project(':capacitor-community-in-app-review').projectDir = new File('../../../node_modules/.pnpm/@capacitor-community+in-app-review@7.0.1_@capacitor+core@7.4.2/node_modules/@capacitor-community/in-app-review/android')
|
project(':capacitor-community-in-app-review').projectDir = new File('../../../node_modules/.pnpm/@capacitor-community+in-app-review@8.0.0_@capacitor+core@8.2.0/node_modules/@capacitor-community/in-app-review/android')
|
||||||
|
|
||||||
include ':capacitor-community-screen-brightness'
|
include ':capacitor-community-screen-brightness'
|
||||||
project(':capacitor-community-screen-brightness').projectDir = new File('../../../node_modules/.pnpm/@capacitor-community+screen-brightness@7.0.0_@capacitor+core@7.4.2/node_modules/@capacitor-community/screen-brightness/android')
|
project(':capacitor-community-screen-brightness').projectDir = new File('../../../node_modules/.pnpm/@capacitor-community+screen-brightness@8.0.0_@capacitor+core@8.2.0/node_modules/@capacitor-community/screen-brightness/android')
|
||||||
|
|
||||||
include ':capacitor-app'
|
include ':capacitor-app'
|
||||||
project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/app/android')
|
project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/app/android')
|
||||||
|
|
||||||
include ':capacitor-browser'
|
include ':capacitor-browser'
|
||||||
project(':capacitor-browser').projectDir = new File('../../../node_modules/.pnpm/@capacitor+browser@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/browser/android')
|
project(':capacitor-browser').projectDir = new File('../../../node_modules/.pnpm/@capacitor+browser@8.0.2_@capacitor+core@8.2.0/node_modules/@capacitor/browser/android')
|
||||||
|
|
||||||
include ':capacitor-clipboard'
|
include ':capacitor-clipboard'
|
||||||
project(':capacitor-clipboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+clipboard@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/clipboard/android')
|
project(':capacitor-clipboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+clipboard@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/clipboard/android')
|
||||||
|
|
||||||
include ':capacitor-device'
|
include ':capacitor-device'
|
||||||
project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/device/android')
|
project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/device/android')
|
||||||
|
|
||||||
include ':capacitor-dialog'
|
include ':capacitor-dialog'
|
||||||
project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/@capacitor+dialog@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/dialog/android')
|
project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/@capacitor+dialog@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/dialog/android')
|
||||||
|
|
||||||
include ':capacitor-filesystem'
|
include ':capacitor-filesystem'
|
||||||
project(':capacitor-filesystem').projectDir = new File('../../../node_modules/.pnpm/@capacitor+filesystem@7.1.4_@capacitor+core@7.4.2/node_modules/@capacitor/filesystem/android')
|
project(':capacitor-filesystem').projectDir = new File('../../../node_modules/.pnpm/@capacitor+filesystem@8.1.2_@capacitor+core@8.2.0/node_modules/@capacitor/filesystem/android')
|
||||||
|
|
||||||
include ':capacitor-geolocation'
|
include ':capacitor-geolocation'
|
||||||
project(':capacitor-geolocation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+geolocation@7.1.5_@capacitor+core@7.4.2/node_modules/@capacitor/geolocation/android')
|
project(':capacitor-geolocation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+geolocation@8.1.0_@capacitor+core@8.2.0/node_modules/@capacitor/geolocation/android')
|
||||||
|
|
||||||
include ':capacitor-haptics'
|
include ':capacitor-haptics'
|
||||||
project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@capacitor+haptics@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/haptics/android')
|
project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@capacitor+haptics@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/haptics/android')
|
||||||
|
|
||||||
include ':capacitor-keyboard'
|
include ':capacitor-keyboard'
|
||||||
project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+keyboard@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/keyboard/android')
|
project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+keyboard@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/keyboard/android')
|
||||||
|
|
||||||
include ':capacitor-local-notifications'
|
include ':capacitor-local-notifications'
|
||||||
project(':capacitor-local-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+local-notifications@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/local-notifications/android')
|
project(':capacitor-local-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+local-notifications@8.0.2_@capacitor+core@8.2.0/node_modules/@capacitor/local-notifications/android')
|
||||||
|
|
||||||
include ':capacitor-network'
|
include ':capacitor-network'
|
||||||
project(':capacitor-network').projectDir = new File('../../../node_modules/.pnpm/@capacitor+network@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/network/android')
|
project(':capacitor-network').projectDir = new File('../../../node_modules/.pnpm/@capacitor+network@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/network/android')
|
||||||
|
|
||||||
include ':capacitor-preferences'
|
include ':capacitor-preferences'
|
||||||
project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/preferences/android')
|
project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/preferences/android')
|
||||||
|
|
||||||
include ':capacitor-screen-orientation'
|
include ':capacitor-screen-orientation'
|
||||||
project(':capacitor-screen-orientation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+screen-orientation@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/screen-orientation/android')
|
project(':capacitor-screen-orientation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+screen-orientation@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/screen-orientation/android')
|
||||||
|
|
||||||
include ':capacitor-share'
|
include ':capacitor-share'
|
||||||
project(':capacitor-share').projectDir = new File('../../../node_modules/.pnpm/@capacitor+share@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/share/android')
|
project(':capacitor-share').projectDir = new File('../../../node_modules/.pnpm/@capacitor+share@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/share/android')
|
||||||
|
|
||||||
include ':capacitor-splash-screen'
|
include ':capacitor-splash-screen'
|
||||||
project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/.pnpm/@capacitor+splash-screen@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/splash-screen/android')
|
project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/.pnpm/@capacitor+splash-screen@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/splash-screen/android')
|
||||||
|
|
||||||
include ':transistorsoft-capacitor-background-fetch'
|
include ':transistorsoft-capacitor-background-fetch'
|
||||||
project(':transistorsoft-capacitor-background-fetch').projectDir = new File('../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@7.1.0_@capacitor+core@7.4.2/node_modules/@transistorsoft/capacitor-background-fetch/android')
|
project(':transistorsoft-capacitor-background-fetch').projectDir = new File('../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@8.0.0_@capacitor+core@8.2.0/node_modules/@transistorsoft/capacitor-background-fetch/android')
|
||||||
|
|
||||||
include ':capacitor-secure-storage-plugin'
|
include ':capacitor-secure-storage-plugin'
|
||||||
project(':capacitor-secure-storage-plugin').projectDir = new File('../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.11.0_@capacitor+core@7.4.2/node_modules/capacitor-secure-storage-plugin/android')
|
project(':capacitor-secure-storage-plugin').projectDir = new File('../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.12.0_@capacitor+core@8.2.0/node_modules/capacitor-secure-storage-plugin/android')
|
||||||
|
|||||||
Binary file not shown.
@@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
Vendored
+4
-5
@@ -86,8 +86,7 @@ done
|
|||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
|
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||||
' "$PWD" ) || exit
|
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
@@ -115,7 +114,7 @@ case "$( uname )" in #(
|
|||||||
NONSTOP* ) nonstop=true ;;
|
NONSTOP* ) nonstop=true ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
CLASSPATH="\\\"\\\""
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
# Determine the Java command to use to start the JVM.
|
||||||
@@ -206,7 +205,7 @@ fi
|
|||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Collect all arguments for the java command:
|
# Collect all arguments for the java command:
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
# and any embedded shellness will be escaped.
|
# and any embedded shellness will be escaped.
|
||||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
# treated as '${Hostname}' itself on the command line.
|
# treated as '${Hostname}' itself on the command line.
|
||||||
@@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
-classpath "$CLASSPATH" \
|
-classpath "$CLASSPATH" \
|
||||||
org.gradle.wrapper.GradleWrapperMain \
|
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||||
"$@"
|
"$@"
|
||||||
|
|
||||||
# Stop when "xargs" is not available.
|
# Stop when "xargs" is not available.
|
||||||
|
|||||||
Vendored
+2
-2
@@ -70,11 +70,11 @@ goto fail
|
|||||||
:execute
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
set CLASSPATH=
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
@rem Execute Gradle
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||||
|
|
||||||
:end
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
|||||||
@@ -1,16 +1,16 @@
|
|||||||
ext {
|
ext {
|
||||||
minSdkVersion = 23
|
minSdkVersion = 24
|
||||||
compileSdkVersion = 35
|
compileSdkVersion = 36
|
||||||
targetSdkVersion = 35
|
targetSdkVersion = 36
|
||||||
androidxActivityVersion = '1.9.2'
|
androidxActivityVersion = '1.11.0'
|
||||||
androidxAppCompatVersion = '1.7.0'
|
androidxAppCompatVersion = '1.7.1'
|
||||||
androidxCoordinatorLayoutVersion = '1.2.0'
|
androidxCoordinatorLayoutVersion = '1.3.0'
|
||||||
androidxCoreVersion = '1.15.0'
|
androidxCoreVersion = '1.17.0'
|
||||||
androidxFragmentVersion = '1.8.4'
|
androidxFragmentVersion = '1.8.9'
|
||||||
coreSplashScreenVersion = '1.0.1'
|
coreSplashScreenVersion = '1.2.0'
|
||||||
androidxWebkitVersion = '1.12.1'
|
androidxWebkitVersion = '1.14.0'
|
||||||
junitVersion = '4.13.2'
|
junitVersion = '4.13.2'
|
||||||
androidxJunitVersion = '1.2.1'
|
androidxJunitVersion = '1.3.0'
|
||||||
androidxEspressoCoreVersion = '3.6.1'
|
androidxEspressoCoreVersion = '3.7.0'
|
||||||
cordovaAndroidVersion = '10.1.1'
|
cordovaAndroidVersion = '14.0.1'
|
||||||
}
|
}
|
||||||
@@ -40,6 +40,16 @@
|
|||||||
"glob": "CHANGELOG.md",
|
"glob": "CHANGELOG.md",
|
||||||
"input": ".",
|
"input": ".",
|
||||||
"output": "assets"
|
"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": [
|
"styles": [
|
||||||
@@ -195,6 +205,30 @@
|
|||||||
},
|
},
|
||||||
"@ionic/angular-toolkit:page": {
|
"@ionic/angular-toolkit:page": {
|
||||||
"styleext": "scss"
|
"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": "."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -175,16 +175,6 @@
|
|||||||
"hisometry": {
|
"hisometry": {
|
||||||
"authProvider": "default",
|
"authProvider": "default",
|
||||||
"url": "https://his-self-service.rz.uni-frankfurt.de"
|
"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": {
|
"plugins": {
|
||||||
@@ -193,9 +183,6 @@
|
|||||||
},
|
},
|
||||||
"feedback": {
|
"feedback": {
|
||||||
"urlPath": "/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",
|
"icon": "inventory_2",
|
||||||
"route": "/catalog",
|
"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",
|
"icon": "settings",
|
||||||
"route": "/settings",
|
"route": "/settings",
|
||||||
@@ -473,24 +433,6 @@
|
|||||||
"token": "https://cas.rz.uni-frankfurt.de/cas/oauth2.0/accessToken",
|
"token": "https://cas.rz.uni-frankfurt.de/cas/oauth2.0/accessToken",
|
||||||
"userinfo": "https://cas.rz.uni-frankfurt.de/cas/oauth2.0/profile"
|
"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": {
|
"backend": {
|
||||||
|
|||||||
@@ -109,7 +109,6 @@
|
|||||||
504EC3011FED79650016851F /* Frameworks */,
|
504EC3011FED79650016851F /* Frameworks */,
|
||||||
504EC3021FED79650016851F /* Resources */,
|
504EC3021FED79650016851F /* Resources */,
|
||||||
F40DBF7576173B02228B7A71 /* [CP] Embed Pods Frameworks */,
|
F40DBF7576173B02228B7A71 /* [CP] Embed Pods Frameworks */,
|
||||||
2D217985258DD775FC9B6A72 /* [CP] Copy Pods Resources */,
|
|
||||||
);
|
);
|
||||||
buildRules = (
|
buildRules = (
|
||||||
);
|
);
|
||||||
@@ -171,21 +170,6 @@
|
|||||||
/* End PBXResourcesBuildPhase section */
|
/* End PBXResourcesBuildPhase section */
|
||||||
|
|
||||||
/* Begin PBXShellScriptBuildPhase section */
|
/* Begin PBXShellScriptBuildPhase section */
|
||||||
2D217985258DD775FC9B6A72 /* [CP] Copy Pods Resources */ = {
|
|
||||||
isa = PBXShellScriptBuildPhase;
|
|
||||||
buildActionMask = 2147483647;
|
|
||||||
files = (
|
|
||||||
);
|
|
||||||
inputPaths = (
|
|
||||||
);
|
|
||||||
name = "[CP] Copy Pods Resources";
|
|
||||||
outputPaths = (
|
|
||||||
);
|
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
|
||||||
shellPath = /bin/sh;
|
|
||||||
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-resources.sh\"\n";
|
|
||||||
showEnvVarsInLog = 0;
|
|
||||||
};
|
|
||||||
947055B15D65E7FC3ADB1FEB /* [CP] Check Pods Manifest.lock */ = {
|
947055B15D65E7FC3ADB1FEB /* [CP] Check Pods Manifest.lock */ = {
|
||||||
isa = PBXShellScriptBuildPhase;
|
isa = PBXShellScriptBuildPhase;
|
||||||
buildActionMask = 2147483647;
|
buildActionMask = 2147483647;
|
||||||
@@ -304,7 +288,7 @@
|
|||||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
|
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
|
||||||
MTL_ENABLE_DEBUG_INFO = YES;
|
MTL_ENABLE_DEBUG_INFO = YES;
|
||||||
ONLY_ACTIVE_ARCH = YES;
|
ONLY_ACTIVE_ARCH = YES;
|
||||||
SDKROOT = iphoneos;
|
SDKROOT = iphoneos;
|
||||||
@@ -355,7 +339,7 @@
|
|||||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
|
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
|
||||||
MTL_ENABLE_DEBUG_INFO = NO;
|
MTL_ENABLE_DEBUG_INFO = NO;
|
||||||
SDKROOT = iphoneos;
|
SDKROOT = iphoneos;
|
||||||
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
|
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
|
||||||
@@ -373,7 +357,7 @@
|
|||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
DEVELOPMENT_TEAM = YSGS9WV338;
|
DEVELOPMENT_TEAM = YSGS9WV338;
|
||||||
INFOPLIST_FILE = App/Info.plist;
|
INFOPLIST_FILE = App/Info.plist;
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
|
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
|
||||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
||||||
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
|
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = de.openstapps.app;
|
PRODUCT_BUNDLE_IDENTIFIER = de.openstapps.app;
|
||||||
@@ -395,7 +379,7 @@
|
|||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
DEVELOPMENT_TEAM = YSGS9WV338;
|
DEVELOPMENT_TEAM = YSGS9WV338;
|
||||||
INFOPLIST_FILE = App/Info.plist;
|
INFOPLIST_FILE = App/Info.plist;
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
|
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
|
||||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = de.openstapps.app;
|
PRODUCT_BUNDLE_IDENTIFIER = de.openstapps.app;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
require_relative '../../../../node_modules/.pnpm/@capacitor+ios@7.4.2_@capacitor+core@7.4.2/node_modules/@capacitor/ios/scripts/pods_helpers'
|
require_relative '../../../../node_modules/.pnpm/@capacitor+ios@8.2.0_@capacitor+core@8.2.0/node_modules/@capacitor/ios/scripts/pods_helpers'
|
||||||
|
|
||||||
platform :ios, '14.0'
|
platform :ios, '15.0'
|
||||||
use_frameworks!
|
use_frameworks!
|
||||||
|
|
||||||
# workaround to avoid Xcode caching of Pods that requires
|
# workaround to avoid Xcode caching of Pods that requires
|
||||||
@@ -9,27 +9,27 @@ use_frameworks!
|
|||||||
install! 'cocoapods', :disable_input_output_paths => true
|
install! 'cocoapods', :disable_input_output_paths => true
|
||||||
|
|
||||||
def capacitor_pods
|
def capacitor_pods
|
||||||
pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@7.4.2_@capacitor+core@7.4.2/node_modules/@capacitor/ios'
|
pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@8.2.0_@capacitor+core@8.2.0/node_modules/@capacitor/ios'
|
||||||
pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@7.4.2_@capacitor+core@7.4.2/node_modules/@capacitor/ios'
|
pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@8.2.0_@capacitor+core@8.2.0/node_modules/@capacitor/ios'
|
||||||
pod 'CapacitorCommunityInAppReview', :path => '../../../../node_modules/.pnpm/@capacitor-community+in-app-review@7.0.1_@capacitor+core@7.4.2/node_modules/@capacitor-community/in-app-review'
|
pod 'CapacitorCommunityInAppReview', :path => '../../../../node_modules/.pnpm/@capacitor-community+in-app-review@8.0.0_@capacitor+core@8.2.0/node_modules/@capacitor-community/in-app-review'
|
||||||
pod 'CapacitorCommunityScreenBrightness', :path => '../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@7.0.0_@capacitor+core@7.4.2/node_modules/@capacitor-community/screen-brightness'
|
pod 'CapacitorCommunityScreenBrightness', :path => '../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@8.0.0_@capacitor+core@8.2.0/node_modules/@capacitor-community/screen-brightness'
|
||||||
pod 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@capacitor+app@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/app'
|
pod 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@capacitor+app@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/app'
|
||||||
pod 'CapacitorBrowser', :path => '../../../../node_modules/.pnpm/@capacitor+browser@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/browser'
|
pod 'CapacitorBrowser', :path => '../../../../node_modules/.pnpm/@capacitor+browser@8.0.2_@capacitor+core@8.2.0/node_modules/@capacitor/browser'
|
||||||
pod 'CapacitorClipboard', :path => '../../../../node_modules/.pnpm/@capacitor+clipboard@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/clipboard'
|
pod 'CapacitorClipboard', :path => '../../../../node_modules/.pnpm/@capacitor+clipboard@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/clipboard'
|
||||||
pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@capacitor+device@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/device'
|
pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@capacitor+device@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/device'
|
||||||
pod 'CapacitorDialog', :path => '../../../../node_modules/.pnpm/@capacitor+dialog@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/dialog'
|
pod 'CapacitorDialog', :path => '../../../../node_modules/.pnpm/@capacitor+dialog@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/dialog'
|
||||||
pod 'CapacitorFilesystem', :path => '../../../../node_modules/.pnpm/@capacitor+filesystem@7.1.4_@capacitor+core@7.4.2/node_modules/@capacitor/filesystem'
|
pod 'CapacitorFilesystem', :path => '../../../../node_modules/.pnpm/@capacitor+filesystem@8.1.2_@capacitor+core@8.2.0/node_modules/@capacitor/filesystem'
|
||||||
pod 'CapacitorGeolocation', :path => '../../../../node_modules/.pnpm/@capacitor+geolocation@7.1.5_@capacitor+core@7.4.2/node_modules/@capacitor/geolocation'
|
pod 'CapacitorGeolocation', :path => '../../../../node_modules/.pnpm/@capacitor+geolocation@8.1.0_@capacitor+core@8.2.0/node_modules/@capacitor/geolocation'
|
||||||
pod 'CapacitorHaptics', :path => '../../../../node_modules/.pnpm/@capacitor+haptics@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/haptics'
|
pod 'CapacitorHaptics', :path => '../../../../node_modules/.pnpm/@capacitor+haptics@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/haptics'
|
||||||
pod 'CapacitorKeyboard', :path => '../../../../node_modules/.pnpm/@capacitor+keyboard@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/keyboard'
|
pod 'CapacitorKeyboard', :path => '../../../../node_modules/.pnpm/@capacitor+keyboard@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/keyboard'
|
||||||
pod 'CapacitorLocalNotifications', :path => '../../../../node_modules/.pnpm/@capacitor+local-notifications@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/local-notifications'
|
pod 'CapacitorLocalNotifications', :path => '../../../../node_modules/.pnpm/@capacitor+local-notifications@8.0.2_@capacitor+core@8.2.0/node_modules/@capacitor/local-notifications'
|
||||||
pod 'CapacitorNetwork', :path => '../../../../node_modules/.pnpm/@capacitor+network@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/network'
|
pod 'CapacitorNetwork', :path => '../../../../node_modules/.pnpm/@capacitor+network@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/network'
|
||||||
pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/preferences'
|
pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/preferences'
|
||||||
pod 'CapacitorScreenOrientation', :path => '../../../../node_modules/.pnpm/@capacitor+screen-orientation@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/screen-orientation'
|
pod 'CapacitorScreenOrientation', :path => '../../../../node_modules/.pnpm/@capacitor+screen-orientation@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/screen-orientation'
|
||||||
pod 'CapacitorShare', :path => '../../../../node_modules/.pnpm/@capacitor+share@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/share'
|
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@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/splash-screen'
|
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@7.1.0_@capacitor+core@7.4.2/node_modules/@transistorsoft/capacitor-background-fetch'
|
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.11.0_@capacitor+core@7.4.2/node_modules/capacitor-secure-storage-plugin'
|
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 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
|
pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,157 +1,161 @@
|
|||||||
PODS:
|
PODS:
|
||||||
- Capacitor (7.4.2):
|
- Capacitor (8.2.0):
|
||||||
- CapacitorCordova
|
- CapacitorCordova
|
||||||
- CapacitorApp (7.0.2):
|
- CapacitorApp (8.0.1):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorBrowser (7.0.2):
|
- CapacitorBrowser (8.0.2):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorClipboard (7.0.2):
|
- CapacitorClipboard (8.0.1):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorCommunityInAppReview (7.0.1):
|
- CapacitorCommunityInAppReview (8.0.0):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorCommunityScreenBrightness (7.0.0):
|
- CapacitorCommunityScreenBrightness (8.0.0):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorCordova (7.4.2)
|
- CapacitorCordova (8.2.0)
|
||||||
- CapacitorDevice (7.0.2):
|
- CapacitorDevice (8.0.1):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorDialog (7.0.2):
|
- CapacitorDialog (8.0.1):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorFilesystem (7.1.4):
|
- CapacitorFilesystem (8.1.2):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- IONFilesystemLib (~> 1.0.1)
|
- IONFilesystemLib (~> 1.1.1)
|
||||||
- CapacitorGeolocation (7.1.5):
|
- CapacitorGeolocation (8.1.0):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- IONGeolocationLib (= 1.0.1)
|
- IONGeolocationLib (= 2.0.0)
|
||||||
- CapacitorHaptics (7.0.2):
|
- CapacitorHaptics (8.0.1):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorKeyboard (7.0.2):
|
- CapacitorKeyboard (8.0.1):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorLocalNotifications (7.0.2):
|
- CapacitorLocalNotifications (8.0.2):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorNetwork (7.0.2):
|
- CapacitorNetwork (8.0.1):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorPreferences (7.0.2):
|
- CapacitorPreferences (8.0.1):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorScreenOrientation (7.0.2):
|
- CapacitorScreenOrientation (8.0.1):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorSecureStoragePlugin (0.11.0):
|
- CapacitorSecureStoragePlugin (0.12.0):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- SwiftKeychainWrapper
|
- SwiftKeychainWrapper
|
||||||
- CapacitorShare (7.0.2):
|
- CapacitorShare (8.0.1):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorSplashScreen (7.0.2):
|
- CapacitorSplashScreen (8.0.1):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CordovaPlugins (7.4.2):
|
- CordovaPlugins (8.2.0):
|
||||||
- CapacitorCordova
|
- CapacitorCordova
|
||||||
- IONFilesystemLib (1.0.1)
|
- IONFilesystemLib (1.1.2)
|
||||||
- IONGeolocationLib (1.0.1)
|
- IONGeolocationLib (2.0.0)
|
||||||
- SwiftKeychainWrapper (4.0.1)
|
- SwiftKeychainWrapper (4.0.1)
|
||||||
- TransistorsoftCapacitorBackgroundFetch (7.1.0):
|
- TransistorsoftCapacitorBackgroundFetch (8.0.0):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
|
- TSBackgroundFetch (~> 4.0)
|
||||||
|
- TSBackgroundFetch (4.0.6)
|
||||||
|
|
||||||
DEPENDENCIES:
|
DEPENDENCIES:
|
||||||
- "Capacitor (from `../../../../node_modules/.pnpm/@capacitor+ios@7.4.2_@capacitor+core@7.4.2/node_modules/@capacitor/ios`)"
|
- "Capacitor (from `../../../../node_modules/.pnpm/@capacitor+ios@8.2.0_@capacitor+core@8.2.0/node_modules/@capacitor/ios`)"
|
||||||
- "CapacitorApp (from `../../../../node_modules/.pnpm/@capacitor+app@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/app`)"
|
- "CapacitorApp (from `../../../../node_modules/.pnpm/@capacitor+app@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/app`)"
|
||||||
- "CapacitorBrowser (from `../../../../node_modules/.pnpm/@capacitor+browser@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/browser`)"
|
- "CapacitorBrowser (from `../../../../node_modules/.pnpm/@capacitor+browser@8.0.2_@capacitor+core@8.2.0/node_modules/@capacitor/browser`)"
|
||||||
- "CapacitorClipboard (from `../../../../node_modules/.pnpm/@capacitor+clipboard@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/clipboard`)"
|
- "CapacitorClipboard (from `../../../../node_modules/.pnpm/@capacitor+clipboard@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/clipboard`)"
|
||||||
- "CapacitorCommunityInAppReview (from `../../../../node_modules/.pnpm/@capacitor-community+in-app-review@7.0.1_@capacitor+core@7.4.2/node_modules/@capacitor-community/in-app-review`)"
|
- "CapacitorCommunityInAppReview (from `../../../../node_modules/.pnpm/@capacitor-community+in-app-review@8.0.0_@capacitor+core@8.2.0/node_modules/@capacitor-community/in-app-review`)"
|
||||||
- "CapacitorCommunityScreenBrightness (from `../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@7.0.0_@capacitor+core@7.4.2/node_modules/@capacitor-community/screen-brightness`)"
|
- "CapacitorCommunityScreenBrightness (from `../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@8.0.0_@capacitor+core@8.2.0/node_modules/@capacitor-community/screen-brightness`)"
|
||||||
- "CapacitorCordova (from `../../../../node_modules/.pnpm/@capacitor+ios@7.4.2_@capacitor+core@7.4.2/node_modules/@capacitor/ios`)"
|
- "CapacitorCordova (from `../../../../node_modules/.pnpm/@capacitor+ios@8.2.0_@capacitor+core@8.2.0/node_modules/@capacitor/ios`)"
|
||||||
- "CapacitorDevice (from `../../../../node_modules/.pnpm/@capacitor+device@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/device`)"
|
- "CapacitorDevice (from `../../../../node_modules/.pnpm/@capacitor+device@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/device`)"
|
||||||
- "CapacitorDialog (from `../../../../node_modules/.pnpm/@capacitor+dialog@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/dialog`)"
|
- "CapacitorDialog (from `../../../../node_modules/.pnpm/@capacitor+dialog@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/dialog`)"
|
||||||
- "CapacitorFilesystem (from `../../../../node_modules/.pnpm/@capacitor+filesystem@7.1.4_@capacitor+core@7.4.2/node_modules/@capacitor/filesystem`)"
|
- "CapacitorFilesystem (from `../../../../node_modules/.pnpm/@capacitor+filesystem@8.1.2_@capacitor+core@8.2.0/node_modules/@capacitor/filesystem`)"
|
||||||
- "CapacitorGeolocation (from `../../../../node_modules/.pnpm/@capacitor+geolocation@7.1.5_@capacitor+core@7.4.2/node_modules/@capacitor/geolocation`)"
|
- "CapacitorGeolocation (from `../../../../node_modules/.pnpm/@capacitor+geolocation@8.1.0_@capacitor+core@8.2.0/node_modules/@capacitor/geolocation`)"
|
||||||
- "CapacitorHaptics (from `../../../../node_modules/.pnpm/@capacitor+haptics@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/haptics`)"
|
- "CapacitorHaptics (from `../../../../node_modules/.pnpm/@capacitor+haptics@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/haptics`)"
|
||||||
- "CapacitorKeyboard (from `../../../../node_modules/.pnpm/@capacitor+keyboard@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/keyboard`)"
|
- "CapacitorKeyboard (from `../../../../node_modules/.pnpm/@capacitor+keyboard@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/keyboard`)"
|
||||||
- "CapacitorLocalNotifications (from `../../../../node_modules/.pnpm/@capacitor+local-notifications@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/local-notifications`)"
|
- "CapacitorLocalNotifications (from `../../../../node_modules/.pnpm/@capacitor+local-notifications@8.0.2_@capacitor+core@8.2.0/node_modules/@capacitor/local-notifications`)"
|
||||||
- "CapacitorNetwork (from `../../../../node_modules/.pnpm/@capacitor+network@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/network`)"
|
- "CapacitorNetwork (from `../../../../node_modules/.pnpm/@capacitor+network@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/network`)"
|
||||||
- "CapacitorPreferences (from `../../../../node_modules/.pnpm/@capacitor+preferences@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/preferences`)"
|
- "CapacitorPreferences (from `../../../../node_modules/.pnpm/@capacitor+preferences@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/preferences`)"
|
||||||
- "CapacitorScreenOrientation (from `../../../../node_modules/.pnpm/@capacitor+screen-orientation@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/screen-orientation`)"
|
- "CapacitorScreenOrientation (from `../../../../node_modules/.pnpm/@capacitor+screen-orientation@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/screen-orientation`)"
|
||||||
- "CapacitorSecureStoragePlugin (from `../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.11.0_@capacitor+core@7.4.2/node_modules/capacitor-secure-storage-plugin`)"
|
- "CapacitorSecureStoragePlugin (from `../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.12.0_@capacitor+core@8.2.0/node_modules/capacitor-secure-storage-plugin`)"
|
||||||
- "CapacitorShare (from `../../../../node_modules/.pnpm/@capacitor+share@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/share`)"
|
- "CapacitorShare (from `../../../../node_modules/.pnpm/@capacitor+share@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/share`)"
|
||||||
- "CapacitorSplashScreen (from `../../../../node_modules/.pnpm/@capacitor+splash-screen@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/splash-screen`)"
|
- "CapacitorSplashScreen (from `../../../../node_modules/.pnpm/@capacitor+splash-screen@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/splash-screen`)"
|
||||||
- CordovaPlugins (from `../capacitor-cordova-ios-plugins`)
|
- CordovaPlugins (from `../capacitor-cordova-ios-plugins`)
|
||||||
- "TransistorsoftCapacitorBackgroundFetch (from `../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@7.1.0_@capacitor+core@7.4.2/node_modules/@transistorsoft/capacitor-background-fetch`)"
|
- "TransistorsoftCapacitorBackgroundFetch (from `../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@8.0.0_@capacitor+core@8.2.0/node_modules/@transistorsoft/capacitor-background-fetch`)"
|
||||||
|
|
||||||
SPEC REPOS:
|
SPEC REPOS:
|
||||||
trunk:
|
trunk:
|
||||||
- IONFilesystemLib
|
- IONFilesystemLib
|
||||||
- IONGeolocationLib
|
- IONGeolocationLib
|
||||||
- SwiftKeychainWrapper
|
- SwiftKeychainWrapper
|
||||||
|
- TSBackgroundFetch
|
||||||
|
|
||||||
EXTERNAL SOURCES:
|
EXTERNAL SOURCES:
|
||||||
Capacitor:
|
Capacitor:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+ios@7.4.2_@capacitor+core@7.4.2/node_modules/@capacitor/ios"
|
:path: "../../../../node_modules/.pnpm/@capacitor+ios@8.2.0_@capacitor+core@8.2.0/node_modules/@capacitor/ios"
|
||||||
CapacitorApp:
|
CapacitorApp:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+app@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/app"
|
:path: "../../../../node_modules/.pnpm/@capacitor+app@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/app"
|
||||||
CapacitorBrowser:
|
CapacitorBrowser:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+browser@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/browser"
|
:path: "../../../../node_modules/.pnpm/@capacitor+browser@8.0.2_@capacitor+core@8.2.0/node_modules/@capacitor/browser"
|
||||||
CapacitorClipboard:
|
CapacitorClipboard:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+clipboard@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/clipboard"
|
:path: "../../../../node_modules/.pnpm/@capacitor+clipboard@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/clipboard"
|
||||||
CapacitorCommunityInAppReview:
|
CapacitorCommunityInAppReview:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor-community+in-app-review@7.0.1_@capacitor+core@7.4.2/node_modules/@capacitor-community/in-app-review"
|
:path: "../../../../node_modules/.pnpm/@capacitor-community+in-app-review@8.0.0_@capacitor+core@8.2.0/node_modules/@capacitor-community/in-app-review"
|
||||||
CapacitorCommunityScreenBrightness:
|
CapacitorCommunityScreenBrightness:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@7.0.0_@capacitor+core@7.4.2/node_modules/@capacitor-community/screen-brightness"
|
:path: "../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@8.0.0_@capacitor+core@8.2.0/node_modules/@capacitor-community/screen-brightness"
|
||||||
CapacitorCordova:
|
CapacitorCordova:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+ios@7.4.2_@capacitor+core@7.4.2/node_modules/@capacitor/ios"
|
:path: "../../../../node_modules/.pnpm/@capacitor+ios@8.2.0_@capacitor+core@8.2.0/node_modules/@capacitor/ios"
|
||||||
CapacitorDevice:
|
CapacitorDevice:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+device@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/device"
|
:path: "../../../../node_modules/.pnpm/@capacitor+device@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/device"
|
||||||
CapacitorDialog:
|
CapacitorDialog:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+dialog@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/dialog"
|
:path: "../../../../node_modules/.pnpm/@capacitor+dialog@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/dialog"
|
||||||
CapacitorFilesystem:
|
CapacitorFilesystem:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+filesystem@7.1.4_@capacitor+core@7.4.2/node_modules/@capacitor/filesystem"
|
:path: "../../../../node_modules/.pnpm/@capacitor+filesystem@8.1.2_@capacitor+core@8.2.0/node_modules/@capacitor/filesystem"
|
||||||
CapacitorGeolocation:
|
CapacitorGeolocation:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+geolocation@7.1.5_@capacitor+core@7.4.2/node_modules/@capacitor/geolocation"
|
:path: "../../../../node_modules/.pnpm/@capacitor+geolocation@8.1.0_@capacitor+core@8.2.0/node_modules/@capacitor/geolocation"
|
||||||
CapacitorHaptics:
|
CapacitorHaptics:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+haptics@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/haptics"
|
:path: "../../../../node_modules/.pnpm/@capacitor+haptics@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/haptics"
|
||||||
CapacitorKeyboard:
|
CapacitorKeyboard:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+keyboard@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/keyboard"
|
:path: "../../../../node_modules/.pnpm/@capacitor+keyboard@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/keyboard"
|
||||||
CapacitorLocalNotifications:
|
CapacitorLocalNotifications:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+local-notifications@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/local-notifications"
|
:path: "../../../../node_modules/.pnpm/@capacitor+local-notifications@8.0.2_@capacitor+core@8.2.0/node_modules/@capacitor/local-notifications"
|
||||||
CapacitorNetwork:
|
CapacitorNetwork:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+network@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/network"
|
:path: "../../../../node_modules/.pnpm/@capacitor+network@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/network"
|
||||||
CapacitorPreferences:
|
CapacitorPreferences:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+preferences@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/preferences"
|
:path: "../../../../node_modules/.pnpm/@capacitor+preferences@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/preferences"
|
||||||
CapacitorScreenOrientation:
|
CapacitorScreenOrientation:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+screen-orientation@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/screen-orientation"
|
:path: "../../../../node_modules/.pnpm/@capacitor+screen-orientation@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/screen-orientation"
|
||||||
CapacitorSecureStoragePlugin:
|
CapacitorSecureStoragePlugin:
|
||||||
:path: "../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.11.0_@capacitor+core@7.4.2/node_modules/capacitor-secure-storage-plugin"
|
:path: "../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.12.0_@capacitor+core@8.2.0/node_modules/capacitor-secure-storage-plugin"
|
||||||
CapacitorShare:
|
CapacitorShare:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+share@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/share"
|
:path: "../../../../node_modules/.pnpm/@capacitor+share@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/share"
|
||||||
CapacitorSplashScreen:
|
CapacitorSplashScreen:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+splash-screen@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/splash-screen"
|
:path: "../../../../node_modules/.pnpm/@capacitor+splash-screen@8.0.1_@capacitor+core@8.2.0/node_modules/@capacitor/splash-screen"
|
||||||
CordovaPlugins:
|
CordovaPlugins:
|
||||||
:path: "../capacitor-cordova-ios-plugins"
|
:path: "../capacitor-cordova-ios-plugins"
|
||||||
TransistorsoftCapacitorBackgroundFetch:
|
TransistorsoftCapacitorBackgroundFetch:
|
||||||
:path: "../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@7.1.0_@capacitor+core@7.4.2/node_modules/@transistorsoft/capacitor-background-fetch"
|
:path: "../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@8.0.0_@capacitor+core@8.2.0/node_modules/@transistorsoft/capacitor-background-fetch"
|
||||||
|
|
||||||
SPEC CHECKSUMS:
|
SPEC CHECKSUMS:
|
||||||
Capacitor: 9d9e481b79ffaeacaf7a85d6a11adec32bd33b59
|
Capacitor: 49a454e1cdbd520bc106a220adca7913536a4933
|
||||||
CapacitorApp: 1f6922c9c5c8b1c538d7fbe92ebe44a81b34bed3
|
CapacitorApp: 942306cd1acf7774a00e89a3986af3a67c8cad7a
|
||||||
CapacitorBrowser: 22541e48442de44dc629c214388290d6eecc6ae9
|
CapacitorBrowser: 76847841b74c11ccac0a1afae18cf06e3bd59044
|
||||||
CapacitorClipboard: 7e227702976d4435a5a40df54f65e154d0dfc1f3
|
CapacitorClipboard: c75fdaa6e622111119f35e7914ecfc67b05efecb
|
||||||
CapacitorCommunityInAppReview: a8f26c4e48a8ccc9df0acf1c7bca39844c325572
|
CapacitorCommunityInAppReview: 4492bdd34aad4d27ed87949376022cc93b294ea1
|
||||||
CapacitorCommunityScreenBrightness: 508f3d0f79024cd8da7d063f456870a4a1932723
|
CapacitorCommunityScreenBrightness: e4075e1181f7e88259edb8b1e3b9a209e1144d45
|
||||||
CapacitorCordova: 5e58d04631bc5094894ac106e2bf1da18a9e6151
|
CapacitorCordova: a9ac88d84a1f5280f33b349fe50fce1902683ac0
|
||||||
CapacitorDevice: 81ae78d5d1942707caad79276badd458bf6ec603
|
CapacitorDevice: ff033fa0c4ec19f5e059a073769a9b2347e69f57
|
||||||
CapacitorDialog: 5bf72a94b747fb339df6f64ef60812e5e4630ad2
|
CapacitorDialog: 854c5dac405081cae697c177ca43bcaa95ae67bf
|
||||||
CapacitorFilesystem: f9bd850c41e048180e5dc0cbb90f2033ede9d2cc
|
CapacitorFilesystem: 2db285a1ac6e475cc27cae2e1bea999000f9e2be
|
||||||
CapacitorGeolocation: 84f868bea4c2499aebc3bb3a88fd0a508f87ab87
|
CapacitorGeolocation: 7132de914f9d853ec4642dc1d36e4e2018a4e8a8
|
||||||
CapacitorHaptics: b3fb2869e72c4466e18ce9ccbeb60a3d8723b3d4
|
CapacitorHaptics: 4df2c625445cef39b67ea635a21802bc92df3b82
|
||||||
CapacitorKeyboard: a86aa9e4741b6444a802df26440a92ae041b34a6
|
CapacitorKeyboard: 867eb4b3c901d9bb5c3d0c93b546185d52484e19
|
||||||
CapacitorLocalNotifications: 665188ae8accd40806129073896fb2b39322d858
|
CapacitorLocalNotifications: 4db83a7f6bdd2f30dcedf5c6f92c415065467a24
|
||||||
CapacitorNetwork: 695069886b3c5ed514db69aa3d026b8dc3c03a6b
|
CapacitorNetwork: 8812ce60d11fb63d8f2e4ba51a49b2e59892ebe2
|
||||||
CapacitorPreferences: 65107ed7437d96ee72583df5763985e3c0ff2bc2
|
CapacitorPreferences: cca2021f386efb75947c850334447d9ff22b14f1
|
||||||
CapacitorScreenOrientation: e0d5b9ef293b269b8f93373355d5b276f50fabea
|
CapacitorScreenOrientation: 6c3c84223ea1dd44aaa7184e2b416dd1192270d0
|
||||||
CapacitorSecureStoragePlugin: 450d402026ee3bcc018fa206504d9c0572fee78d
|
CapacitorSecureStoragePlugin: 50de0808ad398aa401e00f9e58adf88c77cb3c25
|
||||||
CapacitorShare: be166411fa995ead2d39b104aa0aae56d8615c66
|
CapacitorShare: 0c58305114538568059bfc07111f22dcb9cb2a82
|
||||||
CapacitorSplashScreen: 157947576b59d913792063a8d442a79e6d283ee5
|
CapacitorSplashScreen: 4b46c72298db552b3c57ce021ef028b6dc7f1fa7
|
||||||
CordovaPlugins: 7b9a4f380c92ca7f28630723befaca556461f4c3
|
CordovaPlugins: a59b2cf4431ebffa93e36e7cc3fc0aedfeb058ad
|
||||||
IONFilesystemLib: 89258b8e3e85465da93127d25d7ce37f977e8a6f
|
IONFilesystemLib: 21a63377696b2d8fab5632ecfb7d2ac67bddb68a
|
||||||
IONGeolocationLib: 20f9d0248a0b5264511fb57a37e25dd2badf797a
|
IONGeolocationLib: a5e40b54edc2ee9902036eda5aaa41ddf07bb68d
|
||||||
SwiftKeychainWrapper: 807ba1d63c33a7d0613288512399cd1eda1e470c
|
SwiftKeychainWrapper: 807ba1d63c33a7d0613288512399cd1eda1e470c
|
||||||
TransistorsoftCapacitorBackgroundFetch: 28e561636145a899f05025d31f627019c16791f5
|
TransistorsoftCapacitorBackgroundFetch: 12dc742682562c9339241d12615f27ef7dbfb88f
|
||||||
|
TSBackgroundFetch: 0afbeaae4e1132866e1d4b6e55265af26b5958ae
|
||||||
|
|
||||||
PODFILE CHECKSUM: 90bc09990a659848ea76c94331d39bad0b28024d
|
PODFILE CHECKSUM: 809074712090e90da383be24c4ad182cd7a3dd1f
|
||||||
|
|
||||||
COCOAPODS: 1.16.2
|
COCOAPODS: 1.16.2
|
||||||
|
|||||||
+71
-71
@@ -48,109 +48,109 @@
|
|||||||
"test:integration": "sh integration-test.sh"
|
"test:integration": "sh integration-test.sh"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "18.2.13",
|
"@angular/animations": "20.3.31",
|
||||||
"@angular/cdk": "18.2.13",
|
"@angular/cdk": "20.2.14",
|
||||||
"@angular/common": "18.2.13",
|
"@angular/common": "20.3.31",
|
||||||
"@angular/core": "18.2.13",
|
"@angular/core": "20.3.31",
|
||||||
"@angular/forms": "18.2.13",
|
"@angular/forms": "20.3.31",
|
||||||
"@angular/platform-browser": "18.2.13",
|
"@angular/platform-browser": "20.3.31",
|
||||||
"@angular/router": "18.2.13",
|
"@angular/router": "20.3.31",
|
||||||
"@awesome-cordova-plugins/calendar": "6.6.0",
|
"@awesome-cordova-plugins/calendar": "8.1.0",
|
||||||
"@awesome-cordova-plugins/core": "6.6.0",
|
"@awesome-cordova-plugins/core": "8.1.0",
|
||||||
"@capacitor-community/in-app-review": "7.0.1",
|
"@capacitor-community/in-app-review": "8.0.0",
|
||||||
"@capacitor-community/screen-brightness": "7.0.0",
|
"@capacitor-community/screen-brightness": "8.0.0",
|
||||||
"@capacitor/app": "7.0.2",
|
"@capacitor/app": "8.0.1",
|
||||||
"@capacitor/browser": "7.0.2",
|
"@capacitor/browser": "8.0.4",
|
||||||
"@capacitor/clipboard": "7.0.2",
|
"@capacitor/clipboard": "8.0.1",
|
||||||
"@capacitor/core": "7.4.2",
|
"@capacitor/core": "8.2.0",
|
||||||
"@capacitor/device": "7.0.2",
|
"@capacitor/device": "8.0.3",
|
||||||
"@capacitor/dialog": "7.0.2",
|
"@capacitor/dialog": "8.0.1",
|
||||||
"@capacitor/filesystem": "7.1.4",
|
"@capacitor/filesystem": "8.1.3",
|
||||||
"@capacitor/geolocation": "7.1.5",
|
"@capacitor/geolocation": "8.1.0",
|
||||||
"@capacitor/haptics": "7.0.2",
|
"@capacitor/haptics": "8.0.2",
|
||||||
"@capacitor/keyboard": "7.0.2",
|
"@capacitor/keyboard": "8.0.5",
|
||||||
"@capacitor/local-notifications": "7.0.2",
|
"@capacitor/local-notifications": "8.0.2",
|
||||||
"@capacitor/network": "7.0.2",
|
"@capacitor/network": "8.0.1",
|
||||||
"@capacitor/preferences": "7.0.2",
|
"@capacitor/preferences": "8.0.1",
|
||||||
"@capacitor/screen-orientation": "7.0.2",
|
"@capacitor/screen-orientation": "8.0.1",
|
||||||
"@capacitor/share": "7.0.2",
|
"@capacitor/share": "8.0.1",
|
||||||
"@capacitor/splash-screen": "7.0.2",
|
"@capacitor/splash-screen": "8.0.2",
|
||||||
"@ionic/angular": "8.7.3",
|
"@ionic/angular": "8.8.19",
|
||||||
"@ionic/angular-server": "8.7.3",
|
"@ionic/angular-server": "8.8.19",
|
||||||
"@ionic/storage-angular": "4.0.0",
|
"@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/core": "15.0.0",
|
||||||
"@ngx-translate/http-loader": "8.0.0",
|
"@ngx-translate/http-loader": "8.0.0",
|
||||||
"@openid/appauth": "1.3.2",
|
"@openid/appauth": "1.3.2",
|
||||||
"@openstapps/api": "workspace:*",
|
"@openstapps/api": "workspace:*",
|
||||||
"@openstapps/collection-utils": "workspace:*",
|
"@openstapps/collection-utils": "workspace:*",
|
||||||
"@openstapps/core": "workspace:*",
|
"@openstapps/core": "workspace:*",
|
||||||
"@transistorsoft/capacitor-background-fetch": "7.1.0",
|
"@transistorsoft/capacitor-background-fetch": "8.0.0",
|
||||||
"@types/dom-view-transitions": "1.0.4",
|
"@types/dom-view-transitions": "1.0.6",
|
||||||
"capacitor-secure-storage-plugin": "0.11.0",
|
"capacitor-secure-storage-plugin": "0.13.0",
|
||||||
"cordova-plugin-calendar": "5.1.6",
|
"cordova-plugin-calendar": "5.1.6",
|
||||||
"date-fns": "3.6.0",
|
"date-fns": "3.6.0",
|
||||||
"deepmerge": "4.3.1",
|
"deepmerge": "4.3.1",
|
||||||
"form-data": "4.0.4",
|
"form-data": "4.0.6",
|
||||||
"geojson": "0.5.0",
|
"geojson": "0.5.0",
|
||||||
"ionic-appauth": "2.1.0",
|
"ionic-appauth": "2.1.0",
|
||||||
"ionicons": "8.0.13",
|
"ionicons": "8.1.0",
|
||||||
"jsonpath-plus": "10.3.0",
|
"jsonpath-plus": "10.3.0",
|
||||||
"maplibre-gl": "4.0.2",
|
"maplibre-gl": "6.4.1",
|
||||||
"material-symbols": "0.17.1",
|
"material-symbols": "0.17.1",
|
||||||
"moment": "2.30.1",
|
"moment": "2.30.1",
|
||||||
"ngx-date-fns": "11.0.0",
|
"ngx-date-fns": "11.0.0",
|
||||||
"ngx-logger": "5.0.12",
|
"ngx-logger": "5.0.12",
|
||||||
"ngx-markdown": "17.2.1",
|
"ngx-markdown": "18.1.0",
|
||||||
"ngx-moment": "6.0.2",
|
"ngx-moment": "6.0.2",
|
||||||
"opening_hours": "3.8.0",
|
"opening_hours": "3.8.0",
|
||||||
"pmtiles": "3.0.3",
|
"pmtiles": "3.0.3",
|
||||||
"prettier": "3.1.1",
|
"prettier": "3.1.1",
|
||||||
"rxjs": "7.8.1",
|
"rxjs": "7.8.2",
|
||||||
"semver": "7.6.0",
|
"semver": "7.6.0",
|
||||||
"swiper": "8.4.5",
|
"swiper": "8.4.5",
|
||||||
"tslib": "2.6.2",
|
"tslib": "2.6.2",
|
||||||
"zone.js": "0.14.10"
|
"zone.js": "0.16.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular-devkit/architect": "0.1802.20",
|
"@angular-devkit/architect": "0.2003.37",
|
||||||
"@angular-devkit/build-angular": "18.2.20",
|
"@angular-devkit/build-angular": "20.3.37",
|
||||||
"@angular-devkit/core": "18.2.20",
|
"@angular-devkit/core": "20.3.37",
|
||||||
"@angular-devkit/schematics": "18.2.20",
|
"@angular-devkit/schematics": "20.3.37",
|
||||||
"@angular-eslint/builder": "18.4.3",
|
"@angular-eslint/builder": "20.7.0",
|
||||||
"@angular-eslint/eslint-plugin": "18.4.3",
|
"@angular-eslint/eslint-plugin": "20.7.0",
|
||||||
"@angular-eslint/eslint-plugin-template": "18.4.3",
|
"@angular-eslint/eslint-plugin-template": "20.7.0",
|
||||||
"@angular-eslint/schematics": "18.4.1",
|
"@angular-eslint/schematics": "20.7.0",
|
||||||
"@angular-eslint/template-parser": "18.4.3",
|
"@angular-eslint/template-parser": "20.7.0",
|
||||||
"@angular/cli": "18.2.20",
|
"@angular/cli": "20.3.37",
|
||||||
"@angular/compiler": "18.2.13",
|
"@angular/compiler": "20.3.31",
|
||||||
"@angular/compiler-cli": "18.2.13",
|
"@angular/compiler-cli": "20.3.31",
|
||||||
"@angular/language-server": "18.2.0",
|
"@angular/language-server": "20.3.0",
|
||||||
"@angular/language-service": "18.2.13",
|
"@angular/language-service": "20.3.31",
|
||||||
"@angular/platform-browser-dynamic": "18.2.13",
|
"@angular/platform-browser-dynamic": "20.3.31",
|
||||||
"@capacitor/android": "7.4.2",
|
"@capacitor/android": "8.2.0",
|
||||||
"@capacitor/assets": "3.0.5",
|
"@capacitor/assets": "3.0.5",
|
||||||
"@capacitor/cli": "7.4.2",
|
"@capacitor/cli": "8.2.0",
|
||||||
"@capacitor/ios": "7.4.2",
|
"@capacitor/ios": "8.2.0",
|
||||||
"@compodoc/compodoc": "1.1.23",
|
"@compodoc/compodoc": "1.2.1",
|
||||||
"@cypress/schematic": "4.1.1",
|
"@cypress/schematic": "4.1.1",
|
||||||
"@ionic/angular-toolkit": "12.3.0",
|
"@ionic/angular-toolkit": "12.3.0",
|
||||||
"@ionic/cli": "7.2.0",
|
"@ionic/cli": "7.2.1",
|
||||||
"@openstapps/prettier-config": "workspace:*",
|
"@openstapps/prettier-config": "workspace:*",
|
||||||
"@openstapps/tsconfig": "workspace:*",
|
"@openstapps/tsconfig": "workspace:*",
|
||||||
"@types/fontkit": "2.0.7",
|
"@types/fontkit": "2.0.9",
|
||||||
"@types/geojson": "1.0.6",
|
"@types/geojson": "1.0.6",
|
||||||
"@types/glob": "8.1.0",
|
"@types/glob": "8.1.0",
|
||||||
"@types/jasmine": "5.1.4",
|
"@types/jasmine": "5.1.4",
|
||||||
"@types/jasminewd2": "2.0.13",
|
"@types/jasminewd2": "2.0.13",
|
||||||
"@types/jsonpath": "0.2.0",
|
"@types/jsonpath": "0.2.0",
|
||||||
"@types/karma": "6.3.8",
|
"@types/karma": "6.3.9",
|
||||||
"@types/karma-coverage": "2.0.3",
|
"@types/karma-coverage": "2.0.3",
|
||||||
"@types/karma-jasmine": "4.0.5",
|
"@types/karma-jasmine": "4.0.5",
|
||||||
"@types/node": "22.15.31",
|
"@types/node": "22.15.31",
|
||||||
"@types/semver": "7.5.8",
|
"@types/semver": "7.5.8",
|
||||||
"@typescript-eslint/eslint-plugin": "7.11.0",
|
"@typescript-eslint/eslint-plugin": "7.18.0",
|
||||||
"@typescript-eslint/parser": "7.11.0",
|
"@typescript-eslint/parser": "7.18.0",
|
||||||
"cordova-res": "0.15.4",
|
"cordova-res": "0.15.4",
|
||||||
"cypress": "15.0.0",
|
"cypress": "15.0.0",
|
||||||
"eslint": "8.57.0",
|
"eslint": "8.57.0",
|
||||||
@@ -158,28 +158,28 @@
|
|||||||
"eslint-plugin-prettier": "5.1.3",
|
"eslint-plugin-prettier": "5.1.3",
|
||||||
"eslint-plugin-unicorn": "51.0.1",
|
"eslint-plugin-unicorn": "51.0.1",
|
||||||
"fast-deep-equal": "3.1.3",
|
"fast-deep-equal": "3.1.3",
|
||||||
"fontkit": "2.0.2",
|
"fontkit": "2.0.4",
|
||||||
"glob": "10.3.10",
|
"glob": "10.5.0",
|
||||||
"http-server": "14.1.1",
|
"http-server": "14.1.1",
|
||||||
"is-docker": "2.2.1",
|
"is-docker": "2.2.1",
|
||||||
"jasmine-core": "5.1.2",
|
"jasmine-core": "5.1.2",
|
||||||
"jasmine-spec-reporter": "7.0.0",
|
"jasmine-spec-reporter": "7.0.0",
|
||||||
"junit-report-merger": "6.0.3",
|
"junit-report-merger": "6.0.3",
|
||||||
"karma": "6.4.3",
|
"karma": "6.4.4",
|
||||||
"karma-chrome-launcher": "3.2.0",
|
"karma-chrome-launcher": "3.2.0",
|
||||||
"karma-coverage": "2.2.1",
|
"karma-coverage": "2.2.1",
|
||||||
"karma-jasmine": "5.1.0",
|
"karma-jasmine": "5.1.0",
|
||||||
"karma-junit-reporter": "2.0.1",
|
"karma-junit-reporter": "2.0.1",
|
||||||
"karma-mocha-reporter": "2.2.5",
|
"karma-mocha-reporter": "2.2.5",
|
||||||
"license-checker": "25.0.1",
|
"license-checker": "25.0.1",
|
||||||
"stylelint": "16.3.1",
|
"stylelint": "17.14.1",
|
||||||
"stylelint-config-clean-order": "5.4.1",
|
"stylelint-config-clean-order": "10.0.0",
|
||||||
"stylelint-config-prettier-scss": "1.0.0",
|
"stylelint-config-prettier-scss": "1.0.0",
|
||||||
"stylelint-config-recommended-scss": "14.0.0",
|
"stylelint-config-recommended-scss": "17.0.1",
|
||||||
"stylelint-config-standard-scss": "13.0.0",
|
"stylelint-config-standard-scss": "17.0.0",
|
||||||
"surge": "0.23.1",
|
"surge": "0.23.1",
|
||||||
"ts-node": "10.9.2",
|
"ts-node": "10.9.2",
|
||||||
"typescript": "5.4.2"
|
"typescript": "5.9.3"
|
||||||
},
|
},
|
||||||
"cordova": {
|
"cordova": {
|
||||||
"plugins": {},
|
"plugins": {},
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import {HttpClient} from '@angular/common/http';
|
import {HttpClient} from '@angular/common/http';
|
||||||
import {Injectable} from '@angular/core';
|
import {Injectable, inject} from '@angular/core';
|
||||||
import {
|
import {
|
||||||
SCAcademicEvent,
|
SCAcademicEvent,
|
||||||
SCArticle,
|
SCArticle,
|
||||||
@@ -395,7 +395,9 @@ export class SampleThings {
|
|||||||
*/
|
*/
|
||||||
http: HttpClient;
|
http: HttpClient;
|
||||||
|
|
||||||
constructor(http: HttpClient) {
|
constructor() {
|
||||||
|
const http = inject(HttpClient);
|
||||||
|
|
||||||
this.http = http;
|
this.http = http;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* 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 {HttpRequest, HttpHandler, HttpEvent, HttpInterceptor, HttpErrorResponse} from '@angular/common/http';
|
||||||
import {Observable, throwError} from 'rxjs';
|
import {Observable, throwError} from 'rxjs';
|
||||||
import {NGXLogger} from 'ngx-logger';
|
import {NGXLogger} from 'ngx-logger';
|
||||||
@@ -21,7 +21,7 @@ import {catchError} from 'rxjs/operators';
|
|||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class ServiceHandlerInterceptor implements HttpInterceptor {
|
export class ServiceHandlerInterceptor implements HttpInterceptor {
|
||||||
constructor(private readonly logger: NGXLogger) {}
|
private readonly logger = inject(NGXLogger);
|
||||||
|
|
||||||
intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
|
intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
|
||||||
return next.handle(request).pipe(
|
return next.handle(request).pipe(
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ const routes: Routes = [{path: '', redirectTo: '/overview', pathMatch: 'full'}];
|
|||||||
RouterModule.forRoot(routes, {
|
RouterModule.forRoot(routes, {
|
||||||
preloadingStrategy: PreloadAllModules,
|
preloadingStrategy: PreloadAllModules,
|
||||||
errorHandler: error => {
|
errorHandler: error => {
|
||||||
|
console.error(error);
|
||||||
// Handle unknown routes, at the moment this can only be done via window.location
|
// Handle unknown routes, at the moment this can only be done via window.location
|
||||||
if (error.message.includes('Cannot match any routes')) {
|
if (error.message.includes('Cannot match any routes')) {
|
||||||
window.location.href = '/overview';
|
window.location.href = '/overview';
|
||||||
|
|||||||
@@ -72,6 +72,7 @@ describe('AppComponent', () => {
|
|||||||
configProvider.getAnyValue = jasmine.createSpy().and.callFake(function () {
|
configProvider.getAnyValue = jasmine.createSpy().and.callFake(function () {
|
||||||
return sampleAuthConfiguration;
|
return sampleAuthConfiguration;
|
||||||
});
|
});
|
||||||
|
inAppReviewProvider = jasmine.createSpyObj('InAppReviewProvider', ['init']);
|
||||||
ngxLogger = jasmine.createSpyObj('NGXLogger', ['log', 'error', 'warn']);
|
ngxLogger = jasmine.createSpyObj('NGXLogger', ['log', 'error', 'warn']);
|
||||||
storageProvider = jasmine.createSpyObj('StorageProvider', ['init', 'get', 'has', 'put']);
|
storageProvider = jasmine.createSpyObj('StorageProvider', ['init', 'get', 'has', 'put']);
|
||||||
simpleBrowser = jasmine.createSpyObj('SimpleBrowser', ['open']);
|
simpleBrowser = jasmine.createSpyObj('SimpleBrowser', ['open']);
|
||||||
@@ -108,11 +109,5 @@ describe('AppComponent', () => {
|
|||||||
it('should initialize the app', async () => {
|
it('should initialize the app', async () => {
|
||||||
TestBed.createComponent(AppComponent);
|
TestBed.createComponent(AppComponent);
|
||||||
expect(platformSpy.ready).toHaveBeenCalled();
|
expect(platformSpy.ready).toHaveBeenCalled();
|
||||||
// await platformReadySpy;
|
|
||||||
|
|
||||||
// TODO: https://capacitorjs.com/docs/guides/mocking-plugins
|
|
||||||
// expect(splashScreenSpy.hide).toHaveBeenCalled();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// TODO: add more tests!
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* 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 {Router} from '@angular/router';
|
||||||
import {App, URLOpenListenerEvent} from '@capacitor/app';
|
import {App, URLOpenListenerEvent} from '@capacitor/app';
|
||||||
import {Platform, ToastController} from '@ionic/angular/standalone';
|
import {Platform, ToastController} from '@ionic/angular/standalone';
|
||||||
@@ -32,8 +32,27 @@ import {SplashScreen} from '@capacitor/splash-screen';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'app-root',
|
selector: 'app-root',
|
||||||
templateUrl: 'app.component.html',
|
templateUrl: 'app.component.html',
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class AppComponent implements AfterContentInit {
|
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 authHelper = inject(AuthHelperService);
|
||||||
|
|
||||||
|
private readonly toastController = inject(ToastController);
|
||||||
|
|
||||||
|
private readonly scheduleSyncService = inject(ScheduleSyncService);
|
||||||
|
|
||||||
|
private readonly versionService = inject(AppVersionService);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* TODO
|
* TODO
|
||||||
*/
|
*/
|
||||||
@@ -53,17 +72,7 @@ export class AppComponent implements AfterContentInit {
|
|||||||
*/
|
*/
|
||||||
ommitedEventSources = ['ion-input', 'ion-searchbar'];
|
ommitedEventSources = ['ion-input', 'ion-searchbar'];
|
||||||
|
|
||||||
constructor(
|
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,
|
|
||||||
) {
|
|
||||||
void this.initializeApp();
|
void this.initializeApp();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -121,11 +130,8 @@ export class AppComponent implements AfterContentInit {
|
|||||||
|
|
||||||
private async authNotificationsInit() {
|
private async authNotificationsInit() {
|
||||||
this.authHelper
|
this.authHelper
|
||||||
.getProvider('default')
|
.getProvider()
|
||||||
.events$.subscribe(action => this.showMessage(this.authHelper.getAuthMessage('default', action)));
|
.events$.subscribe(action => this.showMessage(this.authHelper.getAuthMessage('default', action)));
|
||||||
this.authHelper
|
|
||||||
.getProvider('paia')
|
|
||||||
.events$.subscribe(action => this.showMessage(this.authHelper.getAuthMessage('paia', action)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private async showMessage(message?: string) {
|
private async showMessage(message?: string) {
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
import {CommonModule, LocationStrategy, PathLocationStrategy, registerLocaleData} from '@angular/common';
|
import {CommonModule, LocationStrategy, PathLocationStrategy, registerLocaleData} from '@angular/common';
|
||||||
import {HTTP_INTERCEPTORS, HttpClient, provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
|
import {HTTP_INTERCEPTORS, HttpClient, provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
|
||||||
import localeDe from '@angular/common/locales/de';
|
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 {BrowserModule} from '@angular/platform-browser';
|
||||||
import {RouteReuseStrategy} from '@angular/router';
|
import {RouteReuseStrategy} from '@angular/router';
|
||||||
import {IonicRouteStrategy, Platform, provideIonicAngular, IonApp} from '@ionic/angular/standalone';
|
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 {ConfigProvider} from './modules/config/config.provider';
|
||||||
import {DashboardModule} from './modules/dashboard/dashboard.module';
|
import {DashboardModule} from './modules/dashboard/dashboard.module';
|
||||||
import {DataModule} from './modules/data/data.module';
|
import {DataModule} from './modules/data/data.module';
|
||||||
import {HebisModule} from './modules/hebis/hebis.module';
|
|
||||||
import {MapModule} from './modules/map/map.module';
|
import {MapModule} from './modules/map/map.module';
|
||||||
import {MenuModule} from './modules/menu/menu.module';
|
import {MenuModule} from './modules/menu/menu.module';
|
||||||
import {NewsModule} from './modules/news/news.module';
|
import {NewsModule} from './modules/news/news.module';
|
||||||
@@ -53,14 +52,12 @@ import {FeedbackModule} from './modules/feedback/feedback.module';
|
|||||||
import {DebugDataCollectorService} from './modules/data/debug-data-collector.service';
|
import {DebugDataCollectorService} from './modules/data/debug-data-collector.service';
|
||||||
import {AuthModule} from './modules/auth/auth.module';
|
import {AuthModule} from './modules/auth/auth.module';
|
||||||
import {BackgroundModule} from './modules/background/background.module';
|
import {BackgroundModule} from './modules/background/background.module';
|
||||||
import {LibraryModule} from './modules/library/library.module';
|
|
||||||
import {StorageProvider} from './modules/storage/storage.provider';
|
import {StorageProvider} from './modules/storage/storage.provider';
|
||||||
import {AssessmentsModule} from './modules/assessments/assessments.module';
|
import {AssessmentsModule} from './modules/assessments/assessments.module';
|
||||||
import {ServiceHandlerInterceptor} from './_helpers/service-handler.interceptor';
|
import {ServiceHandlerInterceptor} from './_helpers/service-handler.interceptor';
|
||||||
import {RoutingStackService} from './util/routing-stack.service';
|
import {RoutingStackService} from './util/routing-stack.service';
|
||||||
import {SCLanguageCode, SCSettingValue} from '@openstapps/core';
|
import {SCLanguageCode, SCSettingValue} from '@openstapps/core';
|
||||||
import {DefaultAuthService} from './modules/auth/default-auth.service';
|
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 {NavigationModule} from './modules/menu/navigation/navigation.module';
|
||||||
import {browserFactory, SimpleBrowser} from './util/browser.factory';
|
import {browserFactory, SimpleBrowser} from './util/browser.factory';
|
||||||
import {getDateFnsLocale} from './translation/dfns-locale';
|
import {getDateFnsLocale} from './translation/dfns-locale';
|
||||||
@@ -68,7 +65,7 @@ import {setDefaultOptions} from 'date-fns';
|
|||||||
import {DateFnsConfigurationService} from 'ngx-date-fns';
|
import {DateFnsConfigurationService} from 'ngx-date-fns';
|
||||||
import {Capacitor} from '@capacitor/core';
|
import {Capacitor} from '@capacitor/core';
|
||||||
import {SplashScreen} from '@capacitor/splash-screen';
|
import {SplashScreen} from '@capacitor/splash-screen';
|
||||||
import maplibregl from 'maplibre-gl';
|
import * as maplibregl from 'maplibre-gl';
|
||||||
import {Protocol} from 'pmtiles';
|
import {Protocol} from 'pmtiles';
|
||||||
|
|
||||||
registerLocaleData(localeDe);
|
registerLocaleData(localeDe);
|
||||||
@@ -86,11 +83,11 @@ export function initializerFactory(
|
|||||||
translateService: TranslateService,
|
translateService: TranslateService,
|
||||||
_routingStackService: RoutingStackService,
|
_routingStackService: RoutingStackService,
|
||||||
defaultAuthService: DefaultAuthService,
|
defaultAuthService: DefaultAuthService,
|
||||||
paiaAuthService: PAIAAuthService,
|
|
||||||
dateFnsConfigurationService: DateFnsConfigurationService,
|
dateFnsConfigurationService: DateFnsConfigurationService,
|
||||||
) {
|
) {
|
||||||
return async () => {
|
return async () => {
|
||||||
try {
|
try {
|
||||||
|
maplibregl.setWorkerUrl(new URL('maplibre-gl-worker.mjs', document.baseURI).href);
|
||||||
maplibregl.addProtocol('pmtiles', new Protocol().tile);
|
maplibregl.addProtocol('pmtiles', new Protocol().tile);
|
||||||
initLogger(logger);
|
initLogger(logger);
|
||||||
await storageProvider.init();
|
await storageProvider.init();
|
||||||
@@ -115,7 +112,6 @@ export function initializerFactory(
|
|||||||
dateFnsConfigurationService.setLocale(dateFnsLocale);
|
dateFnsConfigurationService.setLocale(dateFnsLocale);
|
||||||
|
|
||||||
await defaultAuthService.init();
|
await defaultAuthService.init();
|
||||||
await paiaAuthService.init();
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.warn(error);
|
logger.warn(error);
|
||||||
}
|
}
|
||||||
@@ -154,10 +150,8 @@ export function createTranslateLoader(http: HttpClient) {
|
|||||||
CommonModule,
|
CommonModule,
|
||||||
DashboardModule,
|
DashboardModule,
|
||||||
DataModule,
|
DataModule,
|
||||||
HebisModule,
|
|
||||||
JobModule,
|
JobModule,
|
||||||
FavoritesModule,
|
FavoritesModule,
|
||||||
LibraryModule,
|
|
||||||
ProfilePageModule,
|
ProfilePageModule,
|
||||||
FeedbackModule,
|
FeedbackModule,
|
||||||
MapModule,
|
MapModule,
|
||||||
@@ -208,7 +202,6 @@ export function createTranslateLoader(http: HttpClient) {
|
|||||||
TranslateService,
|
TranslateService,
|
||||||
RoutingStackService,
|
RoutingStackService,
|
||||||
DefaultAuthService,
|
DefaultAuthService,
|
||||||
PAIAAuthService,
|
|
||||||
DateFnsConfigurationService,
|
DateFnsConfigurationService,
|
||||||
],
|
],
|
||||||
useFactory: initializerFactory,
|
useFactory: initializerFactory,
|
||||||
@@ -223,5 +216,5 @@ export function createTranslateLoader(http: HttpClient) {
|
|||||||
],
|
],
|
||||||
})
|
})
|
||||||
export class AppModule {
|
export class AppModule {
|
||||||
constructor(public debugDataCollectorService: DebugDataCollectorService) {}
|
debugDataCollectorService = inject(DebugDataCollectorService);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ import {ConfigProvider} from '../config/config.provider';
|
|||||||
templateUrl: 'about-changelog.html',
|
templateUrl: 'about-changelog.html',
|
||||||
styleUrls: ['about-changelog.scss', './about-page/about-page.scss', 'release-notes-markdown.scss'],
|
styleUrls: ['about-changelog.scss', './about-page/about-page.scss', 'release-notes-markdown.scss'],
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class AboutChangelogComponent {
|
export class AboutChangelogComponent {
|
||||||
config = inject(ConfigProvider);
|
config = inject(ConfigProvider);
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ import {License} from './about-licenses.component';
|
|||||||
selector: 'about-license-modal',
|
selector: 'about-license-modal',
|
||||||
templateUrl: 'about-license-modal.html',
|
templateUrl: 'about-license-modal.html',
|
||||||
styleUrls: ['about-license-modal.scss'],
|
styleUrls: ['about-license-modal.scss'],
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class AboutLicenseModalComponent {
|
export class AboutLicenseModalComponent {
|
||||||
@Input() license: License;
|
@Input() license: License;
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* 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 {ModalController} from '@ionic/angular/standalone';
|
||||||
import {AboutLicenseModalComponent} from './about-license-modal.component';
|
import {AboutLicenseModalComponent} from './about-license-modal.component';
|
||||||
import licensesFile from 'src/assets/about/licenses.json';
|
import licensesFile from 'src/assets/about/licenses.json';
|
||||||
@@ -32,11 +32,12 @@ export interface License {
|
|||||||
selector: 'about-changelog',
|
selector: 'about-changelog',
|
||||||
templateUrl: 'about-licenses.html',
|
templateUrl: 'about-licenses.html',
|
||||||
styleUrls: ['about-licenses.scss', './about-page/about-page.scss'],
|
styleUrls: ['about-licenses.scss', './about-page/about-page.scss'],
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class AboutLicensesComponent implements OnInit {
|
export class AboutLicensesComponent implements OnInit {
|
||||||
licenses: License[];
|
private modalController = inject(ModalController);
|
||||||
|
|
||||||
constructor(private modalController: ModalController) {}
|
licenses: License[];
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.licenses = this.loadLicenses();
|
this.licenses = this.loadLicenses();
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import {SCAboutPageContent} from '@openstapps/core';
|
|||||||
selector: 'about-page-content',
|
selector: 'about-page-content',
|
||||||
templateUrl: 'about-page-content.html',
|
templateUrl: 'about-page-content.html',
|
||||||
styleUrls: ['about-page-content.scss'],
|
styleUrls: ['about-page-content.scss'],
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class AboutPageContentComponent {
|
export class AboutPageContentComponent {
|
||||||
@Input() content: SCAboutPageContent;
|
@Input() content: SCAboutPageContent;
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* 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 {ActivatedRoute} from '@angular/router';
|
||||||
import {SCAboutPage, SCAppConfiguration} from '@openstapps/core';
|
import {SCAboutPage, SCAppConfiguration} from '@openstapps/core';
|
||||||
import {ConfigProvider} from '../../config/config.provider';
|
import {ConfigProvider} from '../../config/config.provider';
|
||||||
@@ -25,8 +25,13 @@ import {Capacitor} from '@capacitor/core';
|
|||||||
selector: 'about-page',
|
selector: 'about-page',
|
||||||
templateUrl: 'about-page.html',
|
templateUrl: 'about-page.html',
|
||||||
styleUrls: ['about-page.scss'],
|
styleUrls: ['about-page.scss'],
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class AboutPageComponent implements OnInit {
|
export class AboutPageComponent implements OnInit {
|
||||||
|
private readonly route = inject(ActivatedRoute);
|
||||||
|
|
||||||
|
private readonly configProvider = inject(ConfigProvider);
|
||||||
|
|
||||||
content: SCAboutPage;
|
content: SCAboutPage;
|
||||||
|
|
||||||
name = config.appName;
|
name = config.appName;
|
||||||
@@ -35,11 +40,6 @@ export class AboutPageComponent implements OnInit {
|
|||||||
|
|
||||||
version: string;
|
version: string;
|
||||||
|
|
||||||
constructor(
|
|
||||||
private readonly route: ActivatedRoute,
|
|
||||||
private readonly configProvider: ConfigProvider,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
async ngOnInit() {
|
async ngOnInit() {
|
||||||
const route = this.route.snapshot.url.map(it => it.path).join('/');
|
const route = this.route.snapshot.url.map(it => it.path).join('/');
|
||||||
this.content =
|
this.content =
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
@import '../../../../theme/util/mixins';
|
@use '../../../../theme/util/mixins';
|
||||||
|
|
||||||
ion-text {
|
ion-text {
|
||||||
margin-inline: var(--spacing-md);
|
margin-inline: var(--spacing-md);
|
||||||
@@ -64,7 +64,7 @@ ion-text {
|
|||||||
.about-changelog,
|
.about-changelog,
|
||||||
.licenses-content,
|
.licenses-content,
|
||||||
.page-content {
|
.page-content {
|
||||||
@include border-radius-in-parallax(var(--border-radius-default));
|
@include mixins.border-radius-in-parallax(var(--border-radius-default));
|
||||||
|
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
@@ -76,7 +76,7 @@ ion-text {
|
|||||||
background: var(--ion-item-background);
|
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;
|
position: relative;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ import {ConfigProvider} from '../config/config.provider';
|
|||||||
templateUrl: 'about-release-notes.html',
|
templateUrl: 'about-release-notes.html',
|
||||||
styleUrls: ['about-release-notes.scss', './about-page/about-page.scss', 'release-notes-markdown.scss'],
|
styleUrls: ['about-release-notes.scss', './about-page/about-page.scss', 'release-notes-markdown.scss'],
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class AboutReleaseNotesComponent {
|
export class AboutReleaseNotesComponent {
|
||||||
config = inject(ConfigProvider);
|
config = inject(ConfigProvider);
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
@import '../../../theme/util/mixins';
|
@use '../../../theme/util/mixins';
|
||||||
|
|
||||||
ion-button {
|
ion-button {
|
||||||
--color: var(--ion-color-primary-contrast);
|
--color: var(--ion-color-primary-contrast);
|
||||||
@@ -22,7 +22,7 @@ ion-button {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.release-notes {
|
.release-notes {
|
||||||
@include border-radius-in-parallax(var(--border-radius-default));
|
@include mixins.border-radius-in-parallax(var(--border-radius-default));
|
||||||
|
|
||||||
display: block;
|
display: block;
|
||||||
margin: var(--spacing-md);
|
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 {StorageProvider} from '../storage/storage.provider';
|
||||||
import {ConfigProvider} from '../config/config.provider';
|
import {ConfigProvider} from '../config/config.provider';
|
||||||
import {ModalController} from '@ionic/angular/standalone';
|
import {ModalController} from '@ionic/angular/standalone';
|
||||||
@@ -12,11 +12,11 @@ export const RELEASE_NOTES_SHOWN_KEY = 'release_notes_shown';
|
|||||||
|
|
||||||
@Injectable({providedIn: 'root'})
|
@Injectable({providedIn: 'root'})
|
||||||
export class AppVersionService {
|
export class AppVersionService {
|
||||||
constructor(
|
private storage = inject(StorageProvider);
|
||||||
private storage: StorageProvider,
|
|
||||||
private config: ConfigProvider,
|
private config = inject(ConfigProvider);
|
||||||
private modalController: ModalController,
|
|
||||||
) {}
|
private modalController = inject(ModalController);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the latest release notes that have not been presented yet
|
* Get the latest release notes that have not been presented yet
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
blockquote {
|
blockquote {
|
||||||
background: var(--ion-item-background);
|
|
||||||
border-left: 0.25em solid var(--ion-color-medium);
|
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 {SCAppVersionInfo} from '@openstapps/core';
|
||||||
import {MarkdownModule} from 'ngx-markdown';
|
import {MarkdownModule} from 'ngx-markdown';
|
||||||
import {ThingTranslateModule} from '../../translation/thing-translate.module';
|
import {ThingTranslateModule} from '../../translation/thing-translate.module';
|
||||||
@@ -17,7 +17,6 @@ import {UtilModule} from '../../util/util.module';
|
|||||||
selector: 'stapps-release-notes',
|
selector: 'stapps-release-notes',
|
||||||
templateUrl: 'release-notes.html',
|
templateUrl: 'release-notes.html',
|
||||||
styleUrls: ['release-notes.scss', 'release-notes-markdown.scss'],
|
styleUrls: ['release-notes.scss', 'release-notes-markdown.scss'],
|
||||||
standalone: true,
|
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
imports: [
|
imports: [
|
||||||
UtilModule,
|
UtilModule,
|
||||||
@@ -32,7 +31,7 @@ import {UtilModule} from '../../util/util.module';
|
|||||||
],
|
],
|
||||||
})
|
})
|
||||||
export class ReleaseNotesComponent {
|
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 {
|
ion-title {
|
||||||
padding-block: var(--spacing-md);
|
padding-block: var(--spacing-md);
|
||||||
}
|
}
|
||||||
|
|
||||||
.content-card {
|
.content-card {
|
||||||
@include border-radius-in-parallax(var(--border-radius-default));
|
@include mixins.border-radius-in-parallax(var(--border-radius-default));
|
||||||
|
|
||||||
display: block;
|
display: block;
|
||||||
margin: var(--spacing-md);
|
margin: var(--spacing-md);
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* 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 {ConfigProvider} from '../config/config.provider';
|
||||||
import {SCAssessment, SCUuid} from '@openstapps/core';
|
import {SCAssessment, SCUuid} from '@openstapps/core';
|
||||||
import {DefaultAuthService} from '../auth/default-auth.service';
|
import {DefaultAuthService} from '../auth/default-auth.service';
|
||||||
@@ -51,6 +51,12 @@ export function toAssessmentMap(data: SCAssessment[]): Record<SCUuid, SCAssessme
|
|||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class AssessmentsProvider {
|
export class AssessmentsProvider {
|
||||||
|
readonly configProvider = inject(ConfigProvider);
|
||||||
|
|
||||||
|
readonly defaultAuth = inject(DefaultAuthService);
|
||||||
|
|
||||||
|
readonly http = inject(HttpClient);
|
||||||
|
|
||||||
assessmentPath = 'assessments';
|
assessmentPath = 'assessments';
|
||||||
|
|
||||||
// usually this wouldn't be necessary, but the assessment service
|
// usually this wouldn't be necessary, but the assessment service
|
||||||
@@ -64,12 +70,6 @@ export class AssessmentsProvider {
|
|||||||
// 15 minutes
|
// 15 minutes
|
||||||
cacheMaxAge = 15 * 60 * 1000;
|
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> {
|
async getAssessment(uid: SCUuid, accessToken?: string | null, forceFetch = false): Promise<SCAssessment> {
|
||||||
await this.getAssessments(accessToken, forceFetch);
|
await this.getAssessments(accessToken, forceFetch);
|
||||||
|
|
||||||
|
|||||||
@@ -26,17 +26,20 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
|||||||
selector: 'assessments-detail',
|
selector: 'assessments-detail',
|
||||||
templateUrl: 'assessments-detail.html',
|
templateUrl: 'assessments-detail.html',
|
||||||
styleUrls: ['assessments-detail.scss'],
|
styleUrls: ['assessments-detail.scss'],
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class AssessmentsDetailComponent implements OnInit {
|
export class AssessmentsDetailComponent implements OnInit {
|
||||||
destroy$ = inject(DestroyRef);
|
readonly route = inject(ActivatedRoute);
|
||||||
|
|
||||||
constructor(
|
readonly assessmentsProvider = inject(AssessmentsProvider);
|
||||||
readonly route: ActivatedRoute,
|
|
||||||
readonly assessmentsProvider: AssessmentsProvider,
|
readonly dataRoutingService = inject(DataRoutingService);
|
||||||
readonly dataRoutingService: DataRoutingService,
|
|
||||||
readonly navController: NavController,
|
readonly navController = inject(NavController);
|
||||||
readonly activatedRoute: ActivatedRoute,
|
|
||||||
) {}
|
readonly activatedRoute = inject(ActivatedRoute);
|
||||||
|
|
||||||
|
destroy$ = inject(DestroyRef);
|
||||||
|
|
||||||
@Input() dataPathAutoRouting = true;
|
@Input() dataPathAutoRouting = true;
|
||||||
|
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ import {Observable} from 'rxjs';
|
|||||||
selector: 'assessments-data-list',
|
selector: 'assessments-data-list',
|
||||||
templateUrl: './assessments-data-list.html',
|
templateUrl: './assessments-data-list.html',
|
||||||
styleUrls: ['./assessments-data-list.scss'],
|
styleUrls: ['./assessments-data-list.scss'],
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class AssessmentsDataListComponent {
|
export class AssessmentsDataListComponent {
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ import {SCThings} from '@openstapps/core';
|
|||||||
selector: 'assessments-list-item',
|
selector: 'assessments-list-item',
|
||||||
templateUrl: 'assessments-list-item.html',
|
templateUrl: 'assessments-list-item.html',
|
||||||
styleUrls: ['assessments-list-item.scss'],
|
styleUrls: ['assessments-list-item.scss'],
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class AssessmentsListItemComponent {
|
export class AssessmentsListItemComponent {
|
||||||
/**
|
/**
|
||||||
|
|||||||
+7
-6
@@ -23,8 +23,15 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
|||||||
selector: 'assessments-simple-data-list',
|
selector: 'assessments-simple-data-list',
|
||||||
templateUrl: 'assessments-simple-data-list.html',
|
templateUrl: 'assessments-simple-data-list.html',
|
||||||
styleUrls: ['assessments-simple-data-list.scss'],
|
styleUrls: ['assessments-simple-data-list.scss'],
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class AssessmentsSimpleDataListComponent implements OnInit {
|
export class AssessmentsSimpleDataListComponent implements OnInit {
|
||||||
|
readonly dataRoutingService = inject(DataRoutingService);
|
||||||
|
|
||||||
|
readonly router = inject(Router);
|
||||||
|
|
||||||
|
readonly activatedRoute = inject(ActivatedRoute);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* All SCThings to display
|
* All SCThings to display
|
||||||
*/
|
*/
|
||||||
@@ -46,12 +53,6 @@ export class AssessmentsSimpleDataListComponent implements OnInit {
|
|||||||
|
|
||||||
destroy$ = inject(DestroyRef);
|
destroy$ = inject(DestroyRef);
|
||||||
|
|
||||||
constructor(
|
|
||||||
readonly dataRoutingService: DataRoutingService,
|
|
||||||
readonly router: Router,
|
|
||||||
readonly activatedRoute: ActivatedRoute,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.dataRoutingService
|
this.dataRoutingService
|
||||||
.itemSelectListener()
|
.itemSelectListener()
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ import {SCThings} from '@openstapps/core';
|
|||||||
selector: 'assessments-tree-list',
|
selector: 'assessments-tree-list',
|
||||||
templateUrl: 'assessments-tree-list.html',
|
templateUrl: 'assessments-tree-list.html',
|
||||||
styleUrls: ['assessments-tree-list.scss'],
|
styleUrls: ['assessments-tree-list.scss'],
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class AssessmentsTreeListComponent {
|
export class AssessmentsTreeListComponent {
|
||||||
@Input() items?: Promise<SCThings[] | undefined>;
|
@Input() items?: Promise<SCThings[] | undefined>;
|
||||||
|
|||||||
@@ -29,8 +29,21 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
|||||||
templateUrl: 'assessments-page.html',
|
templateUrl: 'assessments-page.html',
|
||||||
styleUrls: ['assessments-page.scss'],
|
styleUrls: ['assessments-page.scss'],
|
||||||
animations: [materialSharedAxisX],
|
animations: [materialSharedAxisX],
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class AssessmentsPageComponent implements OnInit, AfterViewInit {
|
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<
|
assessments: Promise<
|
||||||
Record<
|
Record<
|
||||||
string,
|
string,
|
||||||
@@ -49,15 +62,6 @@ export class AssessmentsPageComponent implements OnInit, AfterViewInit {
|
|||||||
|
|
||||||
destroy$ = inject(DestroyRef);
|
destroy$ = inject(DestroyRef);
|
||||||
|
|
||||||
constructor(
|
|
||||||
readonly logger: NGXLogger,
|
|
||||||
readonly assessmentsProvider: AssessmentsProvider,
|
|
||||||
readonly dataProvider: DataProvider,
|
|
||||||
readonly activatedRoute: ActivatedRoute,
|
|
||||||
readonly dataRoutingService: DataRoutingService,
|
|
||||||
readonly router: Router,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
ngAfterViewInit() {
|
ngAfterViewInit() {
|
||||||
this.segmentView.value = this.sharedAxisChoreographer.currentValue;
|
this.segmentView.value = this.sharedAxisChoreographer.currentValue;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
@@ -20,6 +20,7 @@ import {SCAssessment} from '@openstapps/core';
|
|||||||
selector: 'assessment-base-info',
|
selector: 'assessment-base-info',
|
||||||
templateUrl: 'assessment-base-info.html',
|
templateUrl: 'assessment-base-info.html',
|
||||||
styleUrls: ['assessment-base-info.scss'],
|
styleUrls: ['assessment-base-info.scss'],
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class AssessmentBaseInfoComponent {
|
export class AssessmentBaseInfoComponent {
|
||||||
_item: SCAssessment;
|
_item: SCAssessment;
|
||||||
|
|||||||
+1
@@ -20,6 +20,7 @@ import {SCAssessment} from '@openstapps/core';
|
|||||||
selector: 'assessment-detail',
|
selector: 'assessment-detail',
|
||||||
templateUrl: 'assessment-detail.html',
|
templateUrl: 'assessment-detail.html',
|
||||||
styleUrls: ['assessment-detail.scss'],
|
styleUrls: ['assessment-detail.scss'],
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class AssessmentDetailComponent {
|
export class AssessmentDetailComponent {
|
||||||
@Input() item: SCAssessment;
|
@Input() item: SCAssessment;
|
||||||
|
|||||||
+1
@@ -20,6 +20,7 @@ import {SCAssessment} from '@openstapps/core';
|
|||||||
selector: 'stapps-assessment-list-item',
|
selector: 'stapps-assessment-list-item',
|
||||||
templateUrl: './assessment-list-item.html',
|
templateUrl: './assessment-list-item.html',
|
||||||
styleUrls: ['./assessment-list-item.scss'],
|
styleUrls: ['./assessment-list-item.scss'],
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class AssessmentListItemComponent {
|
export class AssessmentListItemComponent {
|
||||||
@Input() item: SCAssessment;
|
@Input() item: SCAssessment;
|
||||||
|
|||||||
+1
@@ -20,6 +20,7 @@ import {SCAssessment, SCCourseOfStudyWithoutReferences} from '@openstapps/core';
|
|||||||
selector: 'course-of-study-assessment',
|
selector: 'course-of-study-assessment',
|
||||||
templateUrl: 'course-of-study-assessment.html',
|
templateUrl: 'course-of-study-assessment.html',
|
||||||
styleUrls: ['course-of-study-assessment.scss'],
|
styleUrls: ['course-of-study-assessment.scss'],
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class CourseOfStudyAssessmentComponent {
|
export class CourseOfStudyAssessmentComponent {
|
||||||
@Input() courseOfStudy?: SCCourseOfStudyWithoutReferences | null;
|
@Input() courseOfStudy?: SCCourseOfStudyWithoutReferences | null;
|
||||||
|
|||||||
+12
-9
@@ -12,28 +12,31 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import {Component} from '@angular/core';
|
import {Component, inject} from '@angular/core';
|
||||||
import {NavController} from '@ionic/angular/standalone';
|
import {NavController} from '@ionic/angular/standalone';
|
||||||
import {Router} from '@angular/router';
|
import {Router} from '@angular/router';
|
||||||
import {AuthActions, IAuthAction} from 'ionic-appauth';
|
import {AuthActions, IAuthAction} from 'ionic-appauth';
|
||||||
import {AuthHelperService} from '../../auth-helper.service';
|
import {AuthHelperService} from '../../auth-helper.service';
|
||||||
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
||||||
import {Observable} from 'rxjs';
|
import {Observable} from 'rxjs';
|
||||||
import {IPAIAAuthAction} from '../../paia/paia-auth-action';
|
|
||||||
import {DefaultAuthService} from '../../default-auth.service';
|
import {DefaultAuthService} from '../../default-auth.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
templateUrl: 'auth-callback-page.component.html',
|
templateUrl: 'auth-callback-page.component.html',
|
||||||
styleUrls: ['auth-callback-page.component.scss'],
|
styleUrls: ['auth-callback-page.component.scss'],
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class AuthCallbackPageComponent {
|
export class AuthCallbackPageComponent {
|
||||||
constructor(
|
private navCtrl = inject(NavController);
|
||||||
private navCtrl: NavController,
|
|
||||||
private router: Router,
|
private router = inject(Router);
|
||||||
private authHelper: AuthHelperService,
|
|
||||||
private auth: DefaultAuthService,
|
private authHelper = inject(AuthHelperService);
|
||||||
) {
|
|
||||||
const events: Observable<IPAIAAuthAction | IAuthAction> = this.auth.events$;
|
private auth = inject(DefaultAuthService);
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
const events: Observable<IAuthAction> = this.auth.events$;
|
||||||
|
|
||||||
events.pipe(takeUntilDestroyed()).subscribe((action: IAuthAction) => this.postCallback(action));
|
events.pipe(takeUntilDestroyed()).subscribe((action: IAuthAction) => this.postCallback(action));
|
||||||
this.auth.authorizationCallback(window.location.origin + this.router.url);
|
this.auth.authorizationCallback(window.location.origin + this.router.url);
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* 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 {CanActivate, NavigationExtras, Router, RouterStateSnapshot} from '@angular/router';
|
||||||
import {ActivatedProtectedRouteSnapshot} from './protected.routes';
|
import {ActivatedProtectedRouteSnapshot} from './protected.routes';
|
||||||
import {AuthHelperService} from './auth-helper.service';
|
import {AuthHelperService} from './auth-helper.service';
|
||||||
@@ -22,10 +22,9 @@ import {AuthHelperService} from './auth-helper.service';
|
|||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class AuthGuardService implements CanActivate {
|
export class AuthGuardService implements CanActivate {
|
||||||
constructor(
|
private authHelper = inject(AuthHelperService);
|
||||||
private authHelper: AuthHelperService,
|
|
||||||
private router: Router,
|
private router = inject(Router);
|
||||||
) {}
|
|
||||||
|
|
||||||
public async canActivate(route: ActivatedProtectedRouteSnapshot, _state: RouterStateSnapshot) {
|
public async canActivate(route: ActivatedProtectedRouteSnapshot, _state: RouterStateSnapshot) {
|
||||||
if (route.queryParamMap.get('token')) {
|
if (route.queryParamMap.get('token')) {
|
||||||
@@ -33,16 +32,16 @@ export class AuthGuardService implements CanActivate {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await this.authHelper.getProvider(route.data.authProvider).getValidToken();
|
await this.authHelper.getProvider().getValidToken();
|
||||||
} catch {
|
} catch {
|
||||||
const originNavigation = this.router.getCurrentNavigation();
|
const originNavigation = this.router.currentNavigation();
|
||||||
let extras: NavigationExtras = {};
|
let extras: NavigationExtras = {};
|
||||||
if (originNavigation) {
|
if (originNavigation) {
|
||||||
const url = originNavigation.extractedUrl.toString();
|
const url = originNavigation.extractedUrl.toString();
|
||||||
extras = {queryParams: {origin_path: url}};
|
extras = {queryParams: {origin_path: url}};
|
||||||
}
|
}
|
||||||
this.router.navigate(['profile'], extras);
|
this.router.navigate(['profile'], extras);
|
||||||
await this.authHelper.getProvider(route.data.authProvider).signIn();
|
await this.authHelper.getProvider().signIn();
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ import {DefaultAuthService} from './default-auth.service';
|
|||||||
import {Browser} from 'ionic-appauth';
|
import {Browser} from 'ionic-appauth';
|
||||||
import {Requestor, StorageBackend} from '@openid/appauth';
|
import {Requestor, StorageBackend} from '@openid/appauth';
|
||||||
import {TranslateService} from '@ngx-translate/core';
|
import {TranslateService} from '@ngx-translate/core';
|
||||||
import {PAIAAuthService} from './paia/paia-auth.service';
|
|
||||||
import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
|
import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
|
||||||
import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
|
import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
|
||||||
import {SimpleBrowser} from '../../util/browser.factory';
|
import {SimpleBrowser} from '../../util/browser.factory';
|
||||||
@@ -31,7 +30,6 @@ describe('AuthHelperService', () => {
|
|||||||
const storageProviderSpy = jasmine.createSpyObj('StorageProvider', ['init', 'get', 'has', 'put', 'search']);
|
const storageProviderSpy = jasmine.createSpyObj('StorageProvider', ['init', 'get', 'has', 'put', 'search']);
|
||||||
const translateServiceSpy = jasmine.createSpyObj('TranslateService', ['setDefaultLang', 'use']);
|
const translateServiceSpy = jasmine.createSpyObj('TranslateService', ['setDefaultLang', 'use']);
|
||||||
const defaultAuthServiceMock = jasmine.createSpyObj('DefaultAuthService', ['init', 'setupConfiguration']);
|
const defaultAuthServiceMock = jasmine.createSpyObj('DefaultAuthService', ['init', 'setupConfiguration']);
|
||||||
const paiaAuthServiceMock = jasmine.createSpyObj('PAIAAuthService', ['init', 'setupConfiguration']);
|
|
||||||
const authHelperServiceMock = jasmine.createSpyObj('AuthHelperService', ['constructor']);
|
const authHelperServiceMock = jasmine.createSpyObj('AuthHelperService', ['constructor']);
|
||||||
const simpleBrowserMock = jasmine.createSpyObj('SimpleBrowser', ['open']);
|
const simpleBrowserMock = jasmine.createSpyObj('SimpleBrowser', ['open']);
|
||||||
const configProvider = jasmine.createSpyObj('ConfigProvider', {
|
const configProvider = jasmine.createSpyObj('ConfigProvider', {
|
||||||
@@ -69,10 +67,6 @@ describe('AuthHelperService', () => {
|
|||||||
provider: DefaultAuthService,
|
provider: DefaultAuthService,
|
||||||
useValue: defaultAuthServiceMock,
|
useValue: defaultAuthServiceMock,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
provider: PAIAAuthService,
|
|
||||||
useValue: paiaAuthServiceMock,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
provide: ConfigProvider,
|
provide: ConfigProvider,
|
||||||
useValue: configProvider,
|
useValue: configProvider,
|
||||||
|
|||||||
@@ -13,8 +13,7 @@
|
|||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {Injectable} from '@angular/core';
|
import {Injectable, inject} from '@angular/core';
|
||||||
import {IPAIAAuthAction} from './paia/paia-auth-action';
|
|
||||||
import {AuthActions, IAuthAction} from 'ionic-appauth';
|
import {AuthActions, IAuthAction} from 'ionic-appauth';
|
||||||
import {TranslateService} from '@ngx-translate/core';
|
import {TranslateService} from '@ngx-translate/core';
|
||||||
import {JSONPath} from 'jsonpath-plus';
|
import {JSONPath} from 'jsonpath-plus';
|
||||||
@@ -27,7 +26,6 @@ import {
|
|||||||
import {ConfigProvider} from '../config/config.provider';
|
import {ConfigProvider} from '../config/config.provider';
|
||||||
import {StorageProvider} from '../storage/storage.provider';
|
import {StorageProvider} from '../storage/storage.provider';
|
||||||
import {DefaultAuthService} from './default-auth.service';
|
import {DefaultAuthService} from './default-auth.service';
|
||||||
import {PAIAAuthService} from './paia/paia-auth.service';
|
|
||||||
import {SimpleBrowser} from '../../util/browser.factory';
|
import {SimpleBrowser} from '../../util/browser.factory';
|
||||||
import {AlertController} from '@ionic/angular/standalone';
|
import {AlertController} from '@ionic/angular/standalone';
|
||||||
|
|
||||||
@@ -37,17 +35,21 @@ const AUTH_ORIGIN_PATH = 'stapps.auth.origin_path';
|
|||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class AuthHelperService {
|
export class AuthHelperService {
|
||||||
|
private translateService = inject(TranslateService);
|
||||||
|
|
||||||
|
private configProvider = inject(ConfigProvider);
|
||||||
|
|
||||||
|
private storageProvider = inject(StorageProvider);
|
||||||
|
|
||||||
|
private defaultAuth = inject(DefaultAuthService);
|
||||||
|
|
||||||
|
private browser = inject(SimpleBrowser);
|
||||||
|
|
||||||
|
private alertController = inject(AlertController);
|
||||||
|
|
||||||
userConfigurationMap: SCUserConfigurationMap;
|
userConfigurationMap: SCUserConfigurationMap;
|
||||||
|
|
||||||
constructor(
|
constructor() {
|
||||||
private translateService: TranslateService,
|
|
||||||
private configProvider: ConfigProvider,
|
|
||||||
private storageProvider: StorageProvider,
|
|
||||||
private defaultAuth: DefaultAuthService,
|
|
||||||
private paiaAuth: PAIAAuthService,
|
|
||||||
private browser: SimpleBrowser,
|
|
||||||
private alertController: AlertController,
|
|
||||||
) {
|
|
||||||
this.userConfigurationMap =
|
this.userConfigurationMap =
|
||||||
(
|
(
|
||||||
this.configProvider.getAnyValue('auth') as {
|
this.configProvider.getAnyValue('auth') as {
|
||||||
@@ -56,7 +58,7 @@ export class AuthHelperService {
|
|||||||
).default?.endpoints.mapping ?? {};
|
).default?.endpoints.mapping ?? {};
|
||||||
}
|
}
|
||||||
|
|
||||||
public getAuthMessage(provider: SCAuthorizationProviderType, action: IAuthAction | IPAIAAuthAction) {
|
public getAuthMessage(provider: SCAuthorizationProviderType, action: IAuthAction) {
|
||||||
let message: string | undefined;
|
let message: string | undefined;
|
||||||
switch (action.action) {
|
switch (action.action) {
|
||||||
case AuthActions.SignInSuccess: {
|
case AuthActions.SignInSuccess: {
|
||||||
@@ -108,16 +110,11 @@ export class AuthHelperService {
|
|||||||
return originPath;
|
return originPath;
|
||||||
}
|
}
|
||||||
|
|
||||||
getProvider<B extends SCAuthorizationProviderType>(
|
|
||||||
providerType: B,
|
|
||||||
): B extends 'paia' ? PAIAAuthService : DefaultAuthService;
|
|
||||||
/**
|
/**
|
||||||
* Provides appropriate auth service instance based on type (string) parameter
|
* Provides appropriate auth service instance based on type (string) parameter
|
||||||
*/
|
*/
|
||||||
getProvider(providerType: SCAuthorizationProviderType): DefaultAuthService | PAIAAuthService {
|
getProvider(): DefaultAuthService {
|
||||||
return providerType === 'paia'
|
return this.defaultAuth;
|
||||||
? (this.paiaAuth as PAIAAuthService)
|
|
||||||
: (this.defaultAuth as DefaultAuthService);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -125,7 +122,7 @@ export class AuthHelperService {
|
|||||||
* @param providerType Type of the provider (e.g. 'default' or 'paia')
|
* @param providerType Type of the provider (e.g. 'default' or 'paia')
|
||||||
*/
|
*/
|
||||||
async endBrowserSession(providerType: SCAuthorizationProviderType) {
|
async endBrowserSession(providerType: SCAuthorizationProviderType) {
|
||||||
const endSessionEndpoint = (await this.getProvider(providerType).configuration).endSessionEndpoint;
|
const endSessionEndpoint = (await this.getProvider().configuration).endSessionEndpoint;
|
||||||
|
|
||||||
if (endSessionEndpoint) {
|
if (endSessionEndpoint) {
|
||||||
const alert: HTMLIonAlertElement = await this.alertController.create({
|
const alert: HTMLIonAlertElement = await this.alertController.create({
|
||||||
|
|||||||
@@ -17,19 +17,12 @@ import {RouterModule, Routes} from '@angular/router';
|
|||||||
import {NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import {authPaths} from './auth-paths';
|
import {authPaths} from './auth-paths';
|
||||||
import {AuthCallbackPageComponent} from './auth-callback/page/auth-callback-page.component';
|
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 = [
|
const authRoutes: Routes = [
|
||||||
{
|
{
|
||||||
path: authPaths.default.redirect_path,
|
path: authPaths.default.redirect_path,
|
||||||
component: AuthCallbackPageComponent,
|
component: AuthCallbackPageComponent,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
path: authPaths.paia.redirect_path,
|
|
||||||
component: AuthCallbackPageComponent,
|
|
||||||
providers: [{provide: DefaultAuthService, useExisting: PAIAAuthService}],
|
|
||||||
},
|
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ import {AuthRoutingModule} from './auth-routing.module';
|
|||||||
import {TranslateModule} from '@ngx-translate/core';
|
import {TranslateModule} from '@ngx-translate/core';
|
||||||
import {AuthCallbackPageComponent} from './auth-callback/page/auth-callback-page.component';
|
import {AuthCallbackPageComponent} from './auth-callback/page/auth-callback-page.component';
|
||||||
import {DefaultAuthService} from './default-auth.service';
|
import {DefaultAuthService} from './default-auth.service';
|
||||||
import {PAIAAuthService} from './paia/paia-auth.service';
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
declarations: [AuthCallbackPageComponent],
|
declarations: [AuthCallbackPageComponent],
|
||||||
@@ -32,7 +31,6 @@ import {PAIAAuthService} from './paia/paia-auth.service';
|
|||||||
useClass: CapacitorBrowser,
|
useClass: CapacitorBrowser,
|
||||||
},
|
},
|
||||||
DefaultAuthService,
|
DefaultAuthService,
|
||||||
PAIAAuthService,
|
|
||||||
],
|
],
|
||||||
})
|
})
|
||||||
export class AuthModule {}
|
export class AuthModule {}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ import {AuthActionBuilder, Browser, DefaultBrowser, EndSessionHandler, UserInfoH
|
|||||||
import {ConfigProvider} from '../config/config.provider';
|
import {ConfigProvider} from '../config/config.provider';
|
||||||
import {SCAuthorizationProvider} from '@openstapps/core';
|
import {SCAuthorizationProvider} from '@openstapps/core';
|
||||||
import {getClientConfig, getEndpointsConfig} from './auth.provider.methods';
|
import {getClientConfig, getEndpointsConfig} from './auth.provider.methods';
|
||||||
import {Injectable} from '@angular/core';
|
import {Injectable, inject} from '@angular/core';
|
||||||
import {AuthService} from './auth.service';
|
import {AuthService} from './auth.service';
|
||||||
|
|
||||||
const TOKEN_RESPONSE_KEY = 'token_response';
|
const TOKEN_RESPONSE_KEY = 'token_response';
|
||||||
@@ -35,6 +35,14 @@ const TOKEN_RESPONSE_KEY = 'token_response';
|
|||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class DefaultAuthService extends AuthService {
|
export class DefaultAuthService extends AuthService {
|
||||||
|
protected browser: Browser;
|
||||||
|
|
||||||
|
protected storage: StorageBackend;
|
||||||
|
|
||||||
|
protected requestor: Requestor;
|
||||||
|
|
||||||
|
private readonly configProvider = inject(ConfigProvider);
|
||||||
|
|
||||||
public localConfiguration: AuthorizationServiceConfiguration;
|
public localConfiguration: AuthorizationServiceConfiguration;
|
||||||
|
|
||||||
protected tokenHandler: TokenRequestHandler;
|
protected tokenHandler: TokenRequestHandler;
|
||||||
@@ -45,13 +53,16 @@ export class DefaultAuthService extends AuthService {
|
|||||||
|
|
||||||
protected endSessionHandler: EndSessionHandler;
|
protected endSessionHandler: EndSessionHandler;
|
||||||
|
|
||||||
constructor(
|
constructor() {
|
||||||
protected browser: Browser = new DefaultBrowser(),
|
const browser = inject(Browser) ?? new DefaultBrowser();
|
||||||
protected storage: StorageBackend = new LocalStorageBackend(),
|
const storage = inject(StorageBackend) ?? new LocalStorageBackend();
|
||||||
protected requestor: Requestor = new JQueryRequestor(),
|
const requestor = inject(Requestor) ?? new JQueryRequestor();
|
||||||
private readonly configProvider: ConfigProvider,
|
|
||||||
) {
|
|
||||||
super(browser, storage, requestor);
|
super(browser, storage, requestor);
|
||||||
|
|
||||||
|
this.browser = browser;
|
||||||
|
this.storage = storage;
|
||||||
|
this.requestor = requestor;
|
||||||
}
|
}
|
||||||
|
|
||||||
get configuration(): Promise<AuthorizationServiceConfiguration> {
|
get configuration(): Promise<AuthorizationServiceConfiguration> {
|
||||||
|
|||||||
@@ -13,11 +13,10 @@
|
|||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {HttpClient} from '@angular/common/http';
|
|
||||||
import {Platform} from '@ionic/angular/standalone';
|
import {Platform} from '@ionic/angular/standalone';
|
||||||
import {CapacitorRequestor} from '../capacitor-requestor';
|
import {CapacitorRequestor} from '../capacitor-requestor';
|
||||||
import {NgHttpService} from '../ng-http.service';
|
import {NgHttpService} from '../ng-http.service';
|
||||||
|
|
||||||
export const httpFactory = (platform: Platform, httpClient: HttpClient) => {
|
export const httpFactory = (platform: Platform) => {
|
||||||
return platform.is('capacitor') ? new CapacitorRequestor() : new NgHttpService(httpClient);
|
return platform.is('capacitor') ? new CapacitorRequestor() : new NgHttpService();
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {Injectable} from '@angular/core';
|
import {Injectable, inject} from '@angular/core';
|
||||||
import {Requestor} from '@openid/appauth';
|
import {Requestor} from '@openid/appauth';
|
||||||
import {HttpClient, HttpHeaders} from '@angular/common/http';
|
import {HttpClient, HttpHeaders} from '@angular/common/http';
|
||||||
import {XhrSettings} from 'ionic-appauth/lib/cordova';
|
import {XhrSettings} from 'ionic-appauth/lib/cordova';
|
||||||
@@ -23,7 +23,7 @@ import {firstValueFrom, Observable} from 'rxjs';
|
|||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class NgHttpService implements Requestor {
|
export class NgHttpService implements Requestor {
|
||||||
constructor(private http: HttpClient) {}
|
private http = inject(HttpClient);
|
||||||
|
|
||||||
public async xhr<T>(settings: XhrSettings): Promise<T> {
|
public async xhr<T>(settings: XhrSettings): Promise<T> {
|
||||||
if (!settings.method) {
|
if (!settings.method) {
|
||||||
|
|||||||
@@ -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)));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -40,16 +40,19 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
|||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class ScheduleSyncService {
|
export class ScheduleSyncService {
|
||||||
destroy$ = inject(DestroyRef);
|
private scheduleProvider = inject(ScheduleProvider);
|
||||||
|
|
||||||
constructor(
|
private storageProvider = inject(StorageProvider);
|
||||||
private scheduleProvider: ScheduleProvider,
|
|
||||||
private storageProvider: StorageProvider,
|
private translator = inject(ThingTranslateService);
|
||||||
private translator: ThingTranslateService,
|
|
||||||
private dateFormatPipe: DateFormatPipe,
|
private dateFormatPipe = inject(DateFormatPipe);
|
||||||
private durationFormatPipe: DurationPipe,
|
|
||||||
private calendar: CalendarService,
|
private durationFormatPipe = inject(DurationPipe);
|
||||||
) {}
|
|
||||||
|
private calendar = inject(CalendarService);
|
||||||
|
|
||||||
|
destroy$ = inject(DestroyRef);
|
||||||
|
|
||||||
init() {
|
init() {
|
||||||
this.scheduleProvider.uuids$
|
this.scheduleProvider.uuids$
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* 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 {
|
import {
|
||||||
getICalExport,
|
getICalExport,
|
||||||
getNativeCalendarExport,
|
getNativeCalendarExport,
|
||||||
@@ -42,8 +42,15 @@ interface ICalInfo {
|
|||||||
selector: 'add-event-review-modal',
|
selector: 'add-event-review-modal',
|
||||||
templateUrl: 'add-event-review-modal.html',
|
templateUrl: 'add-event-review-modal.html',
|
||||||
styleUrls: ['add-event-review-modal.scss'],
|
styleUrls: ['add-event-review-modal.scss'],
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class AddEventReviewModalComponent implements OnInit {
|
export class AddEventReviewModalComponent implements OnInit {
|
||||||
|
readonly calendarService = inject(CalendarService);
|
||||||
|
|
||||||
|
readonly translator = inject(ThingTranslateService);
|
||||||
|
|
||||||
|
readonly translateService = inject(TranslateService);
|
||||||
|
|
||||||
moment = moment;
|
moment = moment;
|
||||||
|
|
||||||
@Input() dismissAction: () => void;
|
@Input() dismissAction: () => void;
|
||||||
@@ -56,12 +63,6 @@ export class AddEventReviewModalComponent implements OnInit {
|
|||||||
|
|
||||||
isWeb = true;
|
isWeb = true;
|
||||||
|
|
||||||
constructor(
|
|
||||||
readonly calendarService: CalendarService,
|
|
||||||
readonly translator: ThingTranslateService,
|
|
||||||
readonly translateService: TranslateService,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
Device.getInfo().then(it => {
|
Device.getInfo().then(it => {
|
||||||
this.isWeb = it.platform === 'web';
|
this.isWeb = it.platform === 'web';
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import {Calendar} from '@awesome-cordova-plugins/calendar/ngx';
|
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 {ICalEvent} from './ical/ical';
|
||||||
import moment, {duration, Moment, unitOfTime} from 'moment';
|
import moment, {duration, Moment, unitOfTime} from 'moment';
|
||||||
import {Dialog} from '@capacitor/dialog';
|
import {Dialog} from '@capacitor/dialog';
|
||||||
@@ -31,6 +31,10 @@ const RECURRENCE_PATTERNS: Partial<Record<unitOfTime.Diff, string | undefined>>
|
|||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class CalendarService {
|
export class CalendarService {
|
||||||
|
readonly calendar = inject(Calendar);
|
||||||
|
|
||||||
|
private readonly configProvider = inject(ConfigProvider);
|
||||||
|
|
||||||
goToDate = new Subject<number>();
|
goToDate = new Subject<number>();
|
||||||
|
|
||||||
goToDateClicked = this.goToDate.asObservable();
|
goToDateClicked = this.goToDate.asObservable();
|
||||||
@@ -38,10 +42,7 @@ export class CalendarService {
|
|||||||
calendarName = 'StApps';
|
calendarName = 'StApps';
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
||||||
constructor(
|
constructor() {
|
||||||
readonly calendar: Calendar,
|
|
||||||
private readonly configProvider: ConfigProvider,
|
|
||||||
) {
|
|
||||||
this.calendarName = (this.configProvider.getValue('name') as string) ?? 'StApps';
|
this.calendarName = (this.configProvider.getValue('name') as string) ?? 'StApps';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -68,6 +68,8 @@ export type DateSeriesRelevantData = Pick<SCDateSeries, DateSeriesRelevantKeys>;
|
|||||||
*/
|
*/
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class ScheduleProvider implements OnDestroy {
|
export class ScheduleProvider implements OnDestroy {
|
||||||
|
private readonly dataProvider = inject(DataProvider);
|
||||||
|
|
||||||
// tslint:disable:prefer-function-over-method
|
// tslint:disable:prefer-function-over-method
|
||||||
|
|
||||||
private static partialEventsStorageKey = 'schedule::partial_events';
|
private static partialEventsStorageKey = 'schedule::partial_events';
|
||||||
@@ -76,7 +78,7 @@ export class ScheduleProvider implements OnDestroy {
|
|||||||
|
|
||||||
destroy$ = inject(DestroyRef);
|
destroy$ = inject(DestroyRef);
|
||||||
|
|
||||||
constructor(private readonly dataProvider: DataProvider) {
|
constructor() {
|
||||||
window.addEventListener('storage', this.storageListener);
|
window.addEventListener('storage', this.storageListener);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
</ion-toolbar>
|
</ion-toolbar>
|
||||||
<ion-toolbar color="primary" mode="md">
|
<ion-toolbar color="primary" mode="md">
|
||||||
<ion-segment (ionChange)="segmentChanged($event)" [value]="selectedSemesterUID" 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-segment-button [value]="semester.uid">
|
||||||
<ion-label>{{ semester.acronym }}</ion-label>
|
<ion-label>{{ semester.acronym }}</ion-label>
|
||||||
</ion-segment-button>
|
</ion-segment-button>
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
<ion-content>
|
<ion-content>
|
||||||
@if (catalogs && catalogs.length > 0) {
|
@if (catalogs && catalogs.length > 0) {
|
||||||
<ion-list>
|
<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-item button="true" lines="inset" (click)="notifySelect(catalog)">
|
||||||
<ion-label>
|
<ion-label>
|
||||||
<h2>{{ catalog.name }}</h2>
|
<h2>{{ catalog.name }}</h2>
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
}
|
}
|
||||||
@if (!catalogs) {
|
@if (!catalogs) {
|
||||||
<ion-list>
|
<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>
|
<stapps-skeleton-list-item> </stapps-skeleton-list-item>
|
||||||
}
|
}
|
||||||
</ion-list>
|
</ion-list>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* 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 {Router, ActivatedRoute} from '@angular/router';
|
||||||
import {SCCatalog, SCSemester} from '@openstapps/core';
|
import {SCCatalog, SCSemester} from '@openstapps/core';
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
@@ -26,8 +26,21 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
|||||||
selector: 'app-catalog',
|
selector: 'app-catalog',
|
||||||
templateUrl: './catalog.component.html',
|
templateUrl: './catalog.component.html',
|
||||||
styleUrls: ['./catalog.component.scss'],
|
styleUrls: ['./catalog.component.scss'],
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class CatalogComponent implements OnInit {
|
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
|
* SCSemester to show
|
||||||
*/
|
*/
|
||||||
@@ -53,14 +66,7 @@ export class CatalogComponent implements OnInit {
|
|||||||
*/
|
*/
|
||||||
superCatalog: SCCatalog;
|
superCatalog: SCCatalog;
|
||||||
|
|
||||||
constructor(
|
constructor() {
|
||||||
private readonly route: ActivatedRoute,
|
|
||||||
private readonly catalogProvider: CatalogProvider,
|
|
||||||
private readonly dataRoutingService: DataRoutingService,
|
|
||||||
private readonly logger: NGXLogger,
|
|
||||||
protected router: Router,
|
|
||||||
public location: Location,
|
|
||||||
) {
|
|
||||||
this.dataRoutingService
|
this.dataRoutingService
|
||||||
.itemSelectListener()
|
.itemSelectListener()
|
||||||
.pipe(takeUntilDestroyed())
|
.pipe(takeUntilDestroyed())
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import {Injectable} from '@angular/core';
|
import {Injectable, inject} from '@angular/core';
|
||||||
import {
|
import {
|
||||||
SCCatalogWithoutReferences,
|
SCCatalogWithoutReferences,
|
||||||
SCSearchFilter,
|
SCSearchFilter,
|
||||||
@@ -28,7 +28,7 @@ import {DataProvider} from '../data/data.provider';
|
|||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class CatalogProvider {
|
export class CatalogProvider {
|
||||||
constructor(private readonly dataProvider: DataProvider) {}
|
private readonly dataProvider = inject(DataProvider);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get news messages
|
* Get news messages
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* 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 {Client} from '@openstapps/api';
|
||||||
import {SCAppConfiguration, SCIndexResponse} from '@openstapps/core';
|
import {SCAppConfiguration, SCIndexResponse} from '@openstapps/core';
|
||||||
import {CORE_VERSION} from '@openstapps/core';
|
import {CORE_VERSION} from '@openstapps/core';
|
||||||
@@ -44,6 +44,12 @@ export const STORAGE_KEY_CONFIG = 'stapps.config';
|
|||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class ConfigProvider {
|
export class ConfigProvider {
|
||||||
|
private readonly storageProvider = inject(StorageProvider);
|
||||||
|
|
||||||
|
private readonly logger = inject(NGXLogger);
|
||||||
|
|
||||||
|
private readonly internetConnectionService = inject(InternetConnectionService);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Api client
|
* Api client
|
||||||
*/
|
*/
|
||||||
@@ -66,16 +72,10 @@ export class ConfigProvider {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor, initialise api client
|
* Constructor, initialise api client
|
||||||
* @param storageProvider StorageProvider to load persistent configuration
|
|
||||||
* @param swHttpClient Api client
|
|
||||||
* @param logger An angular logger
|
|
||||||
*/
|
*/
|
||||||
constructor(
|
constructor() {
|
||||||
private readonly storageProvider: StorageProvider,
|
const swHttpClient = inject(StAppsWebHttpClient);
|
||||||
swHttpClient: StAppsWebHttpClient,
|
|
||||||
private readonly logger: NGXLogger,
|
|
||||||
private readonly internetConnectionService: InternetConnectionService,
|
|
||||||
) {
|
|
||||||
console.log('config init');
|
console.log('config init');
|
||||||
this.client = new Client(swHttpClient, environment.backend_url, environment.backend_version);
|
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/>.
|
* 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,
|
ion-toolbar,
|
||||||
.logo,
|
.logo,
|
||||||
.schedule,
|
.schedule,
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
<div #schedule class="schedule">
|
<div #schedule class="schedule">
|
||||||
<a [routerLink]="['/schedule/weekly-view']">
|
<a [routerLink]="['/schedule/weekly-view']">
|
||||||
<ion-icon [size]="36" [weight]="300" name="calendar_month"></ion-icon>
|
<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>
|
</a>
|
||||||
<!-- Avoid structural directives here, they might interfere with the collapse animation -->
|
<!-- Avoid structural directives here, they might interfere with the collapse animation -->
|
||||||
<a
|
<a
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@import '../../../theme/util/mixins';
|
@use '../../../theme/util/mixins';
|
||||||
|
|
||||||
:host ion-header {
|
:host ion-header {
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
@@ -59,15 +59,6 @@ ion-content {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.schedule {
|
.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;
|
z-index: 3;
|
||||||
|
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -82,6 +73,15 @@ ion-content {
|
|||||||
|
|
||||||
background: var(--ion-color-primary);
|
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 {
|
a {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
@@ -89,18 +89,13 @@ ion-content {
|
|||||||
height: auto;
|
height: auto;
|
||||||
min-height: 80px;
|
min-height: 80px;
|
||||||
padding: var(--spacing-sm);
|
padding: var(--spacing-sm);
|
||||||
|
border-radius: var(--border-radius-default);
|
||||||
|
|
||||||
color: var(--ion-color-primary-contrast);
|
color: var(--ion-color-primary-contrast);
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
|
|
||||||
border-radius: var(--border-radius-default);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
a:first-child {
|
a:first-child {
|
||||||
@include phone-landscape {
|
|
||||||
height: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
gap: var(--spacing-sm);
|
gap: var(--spacing-sm);
|
||||||
@@ -108,27 +103,22 @@ ion-content {
|
|||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
border: 2px solid var(--ion-color-primary-tint);
|
||||||
|
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|
||||||
border: 2px solid var(--ion-color-primary-tint);
|
@include mixins.phone-landscape {
|
||||||
|
height: auto;
|
||||||
|
}
|
||||||
|
|
||||||
ion-label {
|
ion-label {
|
||||||
font-size: var(--font-size-xxs);
|
font-size: var(--font-size-xxs);
|
||||||
font-weight: var(--font-weight-semi-bold);
|
font-weight: var(--font-weight-semi-bold);
|
||||||
word-break: break-word;
|
word-break: overflow-wrap;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
a:last-child {
|
a:last-child {
|
||||||
@include ion-md-up {
|
|
||||||
flex: 1 1 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
@include phone-landscape {
|
|
||||||
flex: 1 1 85%;
|
|
||||||
}
|
|
||||||
|
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
|
|
||||||
flex: 1 1 65%;
|
flex: 1 1 65%;
|
||||||
@@ -138,6 +128,14 @@ ion-content {
|
|||||||
|
|
||||||
background: var(--linear-gradient);
|
background: var(--linear-gradient);
|
||||||
|
|
||||||
|
@include mixins.ion-md-up {
|
||||||
|
flex: 1 1 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
@include mixins.phone-landscape {
|
||||||
|
flex: 1 1 85%;
|
||||||
|
}
|
||||||
|
|
||||||
ion-label {
|
ion-label {
|
||||||
font-size: var(--font-size-xxs);
|
font-size: var(--font-size-xxs);
|
||||||
font-weight: var(--font-weight-bold);
|
font-weight: var(--font-weight-bold);
|
||||||
|
|||||||
@@ -38,8 +38,23 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
|||||||
selector: 'app-dashboard',
|
selector: 'app-dashboard',
|
||||||
templateUrl: './dashboard.component.html',
|
templateUrl: './dashboard.component.html',
|
||||||
styleUrls: ['./dashboard.component.scss', './dashboard.collapse.component.scss'],
|
styleUrls: ['./dashboard.component.scss', './dashboard.collapse.component.scss'],
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class DashboardComponent implements OnInit, OnDestroy, AfterViewInit {
|
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('toolbar', {read: ElementRef}) toolbarRef: ElementRef;
|
||||||
|
|
||||||
@ViewChild('schedule', {read: ElementRef}) scheduleRef: ElementRef;
|
@ViewChild('schedule', {read: ElementRef}) scheduleRef: ElementRef;
|
||||||
@@ -60,15 +75,7 @@ export class DashboardComponent implements OnInit, OnDestroy, AfterViewInit {
|
|||||||
|
|
||||||
destroy$ = inject(DestroyRef);
|
destroy$ = inject(DestroyRef);
|
||||||
|
|
||||||
constructor(
|
constructor() {
|
||||||
private readonly dataRoutingService: DataRoutingService,
|
|
||||||
private scheduleProvider: ScheduleProvider,
|
|
||||||
protected router: Router,
|
|
||||||
public location: Location,
|
|
||||||
private animationControl: AnimationController,
|
|
||||||
private breakpointObserver: BreakpointObserver,
|
|
||||||
private zone: NgZone,
|
|
||||||
) {
|
|
||||||
this.dataRoutingService
|
this.dataRoutingService
|
||||||
.itemSelectListener()
|
.itemSelectListener()
|
||||||
.pipe(takeUntilDestroyed())
|
.pipe(takeUntilDestroyed())
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import {Injectable} from '@angular/core';
|
import {inject, Injectable} from '@angular/core';
|
||||||
import {
|
import {
|
||||||
SCBooleanFilterArguments,
|
SCBooleanFilterArguments,
|
||||||
SCMessage,
|
SCMessage,
|
||||||
@@ -28,7 +28,9 @@ import {DataProvider} from '../data/data.provider';
|
|||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class DashboardProvider {
|
export class DashboardProvider {
|
||||||
constructor(private readonly dataProvider: DataProvider) {}
|
private readonly dataProvider = inject(DataProvider);
|
||||||
|
|
||||||
|
constructor() {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get news messages
|
* Get news messages
|
||||||
|
|||||||
+1
-1
@@ -19,7 +19,7 @@
|
|||||||
</ion-button>
|
</ion-button>
|
||||||
@if (items | async; as items) {
|
@if (items | async; as items) {
|
||||||
<simple-swiper @fade>
|
<simple-swiper @fade>
|
||||||
@for (item of items; track item) {
|
@for (item of items; track item.uid) {
|
||||||
<stapps-data-list-item
|
<stapps-data-list-item
|
||||||
[hideThumbnail]="true"
|
[hideThumbnail]="true"
|
||||||
[listItemEndInteraction]="false"
|
[listItemEndInteraction]="false"
|
||||||
|
|||||||
+4
-3
@@ -12,7 +12,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* 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 {filter, map} from 'rxjs/operators';
|
||||||
import {FavoritesService} from '../../../favorites/favorites.service';
|
import {FavoritesService} from '../../../favorites/favorites.service';
|
||||||
import {fadeAnimation} from '../../fade.animation';
|
import {fadeAnimation} from '../../fade.animation';
|
||||||
@@ -27,12 +27,13 @@ import {isMensaThing} from '../../mensa-filters';
|
|||||||
styleUrls: ['favorites-section.component.scss'],
|
styleUrls: ['favorites-section.component.scss'],
|
||||||
animations: [fadeAnimation],
|
animations: [fadeAnimation],
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class FavoritesSectionComponent {
|
export class FavoritesSectionComponent {
|
||||||
|
private favoritesService = inject(FavoritesService);
|
||||||
|
|
||||||
items = this.favoritesService.favoriteThings$.pipe(
|
items = this.favoritesService.favoriteThings$.pipe(
|
||||||
map(favorites => favorites.filter(it => !isMensaThing(it))),
|
map(favorites => favorites.filter(it => !isMensaThing(it))),
|
||||||
filter(favorites => favorites.length > 0),
|
filter(favorites => favorites.length > 0),
|
||||||
);
|
);
|
||||||
|
|
||||||
constructor(private favoritesService: FavoritesService) {}
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -19,7 +19,7 @@
|
|||||||
</ion-button>
|
</ion-button>
|
||||||
@if (jobs | async; as jobs) {
|
@if (jobs | async; as jobs) {
|
||||||
<simple-swiper @fade>
|
<simple-swiper @fade>
|
||||||
@for (item of jobs; track item) {
|
@for (item of jobs; track item.uid) {
|
||||||
<stapps-data-list-item
|
<stapps-data-list-item
|
||||||
[hideThumbnail]="true"
|
[hideThumbnail]="true"
|
||||||
[item]="item"
|
[item]="item"
|
||||||
|
|||||||
+1
-1
@@ -29,8 +29,8 @@ simple-swiper {
|
|||||||
|
|
||||||
&::part(native) {
|
&::part(native) {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
background: none;
|
|
||||||
border-radius: var(--border-radius-default);
|
border-radius: var(--border-radius-default);
|
||||||
|
background: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
ion-label {
|
ion-label {
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import {fadeAnimation} from '../../fade.animation';
|
|||||||
styleUrls: ['job-section.component.scss'],
|
styleUrls: ['job-section.component.scss'],
|
||||||
animations: [fadeAnimation],
|
animations: [fadeAnimation],
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class JobSectionComponent {
|
export class JobSectionComponent {
|
||||||
jobs = inject(DataProvider)
|
jobs = inject(DataProvider)
|
||||||
|
|||||||
+1
-1
@@ -16,7 +16,7 @@
|
|||||||
@if (dishes | async; as dishes) {
|
@if (dishes | async; as dishes) {
|
||||||
@if (dishes.length > 0) {
|
@if (dishes.length > 0) {
|
||||||
<simple-swiper @fade>
|
<simple-swiper @fade>
|
||||||
@for (dish of dishes; track dish) {
|
@for (dish of dishes; track dish.uid) {
|
||||||
<stapps-data-list-item
|
<stapps-data-list-item
|
||||||
[hideThumbnail]="true"
|
[hideThumbnail]="true"
|
||||||
[item]="dish"
|
[item]="dish"
|
||||||
|
|||||||
+4
-3
@@ -12,7 +12,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* 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 {SCDish, SCPlace, SCThings} from '@openstapps/core';
|
||||||
import {PlaceMensaService} from '../../../data/types/place/special/mensa/place-mensa-service';
|
import {PlaceMensaService} from '../../../data/types/place/special/mensa/place-mensa-service';
|
||||||
import {fadeAnimation} from '../../fade.animation';
|
import {fadeAnimation} from '../../fade.animation';
|
||||||
@@ -27,8 +27,11 @@ import {isToday} from 'date-fns';
|
|||||||
styleUrls: ['mensa-section-content.component.scss'],
|
styleUrls: ['mensa-section-content.component.scss'],
|
||||||
animations: [fadeAnimation],
|
animations: [fadeAnimation],
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
standalone: false,
|
||||||
})
|
})
|
||||||
export class MensaSectionContentComponent {
|
export class MensaSectionContentComponent {
|
||||||
|
private readonly mensaService = inject(PlaceMensaService);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Map of dishes for each day
|
* Map of dishes for each day
|
||||||
*/
|
*/
|
||||||
@@ -41,6 +44,4 @@ export class MensaSectionContentComponent {
|
|||||||
return closestDayWithDishes ? it[closestDayWithDishes] : [];
|
return closestDayWithDishes ? it[closestDayWithDishes] : [];
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
constructor(private readonly mensaService: PlaceMensaService) {}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user