mirror of
https://gitlab.com/openstapps/openstapps.git
synced 2026-09-15 07:11:58 +00:00
Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
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',
|
||||||
|
|||||||
@@ -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": {
|
||||||
|
|||||||
@@ -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'
|
||||||
}
|
}
|
||||||
@@ -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
|
||||||
|
|||||||
+29
-29
@@ -55,28 +55,28 @@
|
|||||||
"@angular/forms": "18.2.13",
|
"@angular/forms": "18.2.13",
|
||||||
"@angular/platform-browser": "18.2.13",
|
"@angular/platform-browser": "18.2.13",
|
||||||
"@angular/router": "18.2.13",
|
"@angular/router": "18.2.13",
|
||||||
"@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.2",
|
||||||
"@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.1",
|
||||||
"@capacitor/dialog": "7.0.2",
|
"@capacitor/dialog": "8.0.1",
|
||||||
"@capacitor/filesystem": "7.1.4",
|
"@capacitor/filesystem": "8.1.2",
|
||||||
"@capacitor/geolocation": "7.1.5",
|
"@capacitor/geolocation": "8.1.0",
|
||||||
"@capacitor/haptics": "7.0.2",
|
"@capacitor/haptics": "8.0.1",
|
||||||
"@capacitor/keyboard": "7.0.2",
|
"@capacitor/keyboard": "8.0.1",
|
||||||
"@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.1",
|
||||||
"@ionic/angular": "8.7.3",
|
"@ionic/angular": "8.7.16",
|
||||||
"@ionic/angular-server": "8.7.3",
|
"@ionic/angular-server": "8.7.16",
|
||||||
"@ionic/storage-angular": "4.0.0",
|
"@ionic/storage-angular": "4.0.0",
|
||||||
"@maplibre/ngx-maplibre-gl": "17.4.1",
|
"@maplibre/ngx-maplibre-gl": "17.4.1",
|
||||||
"@ngx-translate/core": "15.0.0",
|
"@ngx-translate/core": "15.0.0",
|
||||||
@@ -85,9 +85,9 @@
|
|||||||
"@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.4",
|
||||||
"capacitor-secure-storage-plugin": "0.11.0",
|
"capacitor-secure-storage-plugin": "0.12.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",
|
||||||
@@ -128,14 +128,14 @@
|
|||||||
"@angular/language-server": "18.2.0",
|
"@angular/language-server": "18.2.0",
|
||||||
"@angular/language-service": "18.2.13",
|
"@angular/language-service": "18.2.13",
|
||||||
"@angular/platform-browser-dynamic": "18.2.13",
|
"@angular/platform-browser-dynamic": "18.2.13",
|
||||||
"@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.1.23",
|
||||||
"@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.7",
|
||||||
@@ -159,7 +159,7 @@
|
|||||||
"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.2",
|
||||||
"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",
|
||||||
|
|||||||
@@ -121,11 +121,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) {
|
||||||
|
|||||||
@@ -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';
|
||||||
@@ -86,7 +83,6 @@ 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 () => {
|
||||||
@@ -115,7 +111,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 +149,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 +201,6 @@ export function createTranslateLoader(http: HttpClient) {
|
|||||||
TranslateService,
|
TranslateService,
|
||||||
RoutingStackService,
|
RoutingStackService,
|
||||||
DefaultAuthService,
|
DefaultAuthService,
|
||||||
PAIAAuthService,
|
|
||||||
DateFnsConfigurationService,
|
DateFnsConfigurationService,
|
||||||
],
|
],
|
||||||
useFactory: initializerFactory,
|
useFactory: initializerFactory,
|
||||||
|
|||||||
+1
-2
@@ -19,7 +19,6 @@ 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({
|
||||||
@@ -33,7 +32,7 @@ export class AuthCallbackPageComponent {
|
|||||||
private authHelper: AuthHelperService,
|
private authHelper: AuthHelperService,
|
||||||
private auth: DefaultAuthService,
|
private auth: DefaultAuthService,
|
||||||
) {
|
) {
|
||||||
const events: Observable<IPAIAAuthAction | IAuthAction> = this.auth.events$;
|
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);
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ 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.getCurrentNavigation();
|
||||||
let extras: NavigationExtras = {};
|
let extras: NavigationExtras = {};
|
||||||
@@ -42,7 +42,7 @@ export class AuthGuardService implements CanActivate {
|
|||||||
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,
|
||||||
|
|||||||
@@ -14,7 +14,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import {Injectable} from '@angular/core';
|
import {Injectable} 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';
|
||||||
|
|
||||||
@@ -44,7 +42,6 @@ export class AuthHelperService {
|
|||||||
private configProvider: ConfigProvider,
|
private configProvider: ConfigProvider,
|
||||||
private storageProvider: StorageProvider,
|
private storageProvider: StorageProvider,
|
||||||
private defaultAuth: DefaultAuthService,
|
private defaultAuth: DefaultAuthService,
|
||||||
private paiaAuth: PAIAAuthService,
|
|
||||||
private browser: SimpleBrowser,
|
private browser: SimpleBrowser,
|
||||||
private alertController: AlertController,
|
private alertController: AlertController,
|
||||||
) {
|
) {
|
||||||
@@ -56,7 +53,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 +105,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 +117,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 {}
|
||||||
|
|||||||
@@ -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)));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -114,10 +114,6 @@ import {SkeletonListComponent} from './list/skeleton-list.component';
|
|||||||
import {TreeListFragmentComponent} from './list/tree-list-fragment.component';
|
import {TreeListFragmentComponent} from './list/tree-list-fragment.component';
|
||||||
import {TreeListComponent} from './list/tree-list.component';
|
import {TreeListComponent} from './list/tree-list.component';
|
||||||
import {StAppsWebHttpClient} from './stapps-web-http-client.provider';
|
import {StAppsWebHttpClient} from './stapps-web-http-client.provider';
|
||||||
import {ArticleDetailContentComponent} from './types/article/article-detail-content.component';
|
|
||||||
import {ArticleListItemComponent} from './types/article/article-item.component';
|
|
||||||
import {BookDetailContentComponent} from './types/book/book-detail-content.component';
|
|
||||||
import {BookListItemComponent} from './types/book/book-list-item.component';
|
|
||||||
import {CatalogDetailContentComponent} from './types/catalog/catalog-detail-content.component';
|
import {CatalogDetailContentComponent} from './types/catalog/catalog-detail-content.component';
|
||||||
import {CatalogListItemComponent} from './types/catalog/catalog-list-item.component';
|
import {CatalogListItemComponent} from './types/catalog/catalog-list-item.component';
|
||||||
import {DateSeriesDetailContentComponent} from './types/date-series/date-series-detail-content.component';
|
import {DateSeriesDetailContentComponent} from './types/date-series/date-series-detail-content.component';
|
||||||
@@ -136,8 +132,6 @@ import {MessageDetailContentComponent} from './types/message/message-detail-cont
|
|||||||
import {MessageListItemComponent} from './types/message/message-list-item.component';
|
import {MessageListItemComponent} from './types/message/message-list-item.component';
|
||||||
import {OrganizationDetailContentComponent} from './types/organization/organization-detail-content.component';
|
import {OrganizationDetailContentComponent} from './types/organization/organization-detail-content.component';
|
||||||
import {OrganizationListItemComponent} from './types/organization/organization-list-item.component';
|
import {OrganizationListItemComponent} from './types/organization/organization-list-item.component';
|
||||||
import {PeriodicalDetailContentComponent} from './types/periodical/periodical-detail-content.component';
|
|
||||||
import {PeriodicalListItemComponent} from './types/periodical/periodical-list-item.component';
|
|
||||||
import {PersonDetailContentComponent} from './types/person/person-detail-content.component';
|
import {PersonDetailContentComponent} from './types/person/person-detail-content.component';
|
||||||
import {PersonListItemComponent} from './types/person/person-list-item.component';
|
import {PersonListItemComponent} from './types/person/person-list-item.component';
|
||||||
import {PlaceDetailContentComponent} from './types/place/place-detail-content.component';
|
import {PlaceDetailContentComponent} from './types/place/place-detail-content.component';
|
||||||
@@ -216,12 +210,6 @@ import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
|
|||||||
SimpleDataListComponent,
|
SimpleDataListComponent,
|
||||||
TitleCardComponent,
|
TitleCardComponent,
|
||||||
ExternalLinkComponent,
|
ExternalLinkComponent,
|
||||||
ArticleListItemComponent,
|
|
||||||
ArticleDetailContentComponent,
|
|
||||||
BookListItemComponent,
|
|
||||||
BookDetailContentComponent,
|
|
||||||
PeriodicalListItemComponent,
|
|
||||||
PeriodicalDetailContentComponent,
|
|
||||||
ShareButtonComponent,
|
ShareButtonComponent,
|
||||||
],
|
],
|
||||||
exports: [
|
exports: [
|
||||||
@@ -241,9 +229,6 @@ import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
|
|||||||
FavoriteButtonComponent,
|
FavoriteButtonComponent,
|
||||||
TreeListComponent,
|
TreeListComponent,
|
||||||
ExternalLinkComponent,
|
ExternalLinkComponent,
|
||||||
ArticleDetailContentComponent,
|
|
||||||
BookDetailContentComponent,
|
|
||||||
PeriodicalDetailContentComponent,
|
|
||||||
TitleCardComponent,
|
TitleCardComponent,
|
||||||
],
|
],
|
||||||
imports: [
|
imports: [
|
||||||
|
|||||||
@@ -33,9 +33,6 @@
|
|||||||
<ng-template #defaultContent>
|
<ng-template #defaultContent>
|
||||||
<div class="content-switch">
|
<div class="content-switch">
|
||||||
@switch (item.type) {
|
@switch (item.type) {
|
||||||
@case ('article') {
|
|
||||||
<stapps-article-detail-content [item]="$any(item)"></stapps-article-detail-content>
|
|
||||||
}
|
|
||||||
@case ('catalog') {
|
@case ('catalog') {
|
||||||
<stapps-catalog-detail-content [item]="$any(item)"></stapps-catalog-detail-content>
|
<stapps-catalog-detail-content [item]="$any(item)"></stapps-catalog-detail-content>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,6 @@
|
|||||||
*/
|
*/
|
||||||
import {ComponentRef, Directive, Input, Type, ViewContainerRef} from '@angular/core';
|
import {ComponentRef, Directive, Input, Type, ViewContainerRef} from '@angular/core';
|
||||||
import {SCThings, SCThingType} from '@openstapps/core';
|
import {SCThings, SCThingType} from '@openstapps/core';
|
||||||
import {BookListItemComponent} from '../types/book/book-list-item.component';
|
|
||||||
import {CatalogListItemComponent} from '../types/catalog/catalog-list-item.component';
|
import {CatalogListItemComponent} from '../types/catalog/catalog-list-item.component';
|
||||||
import {DateSeriesListItemComponent} from '../types/date-series/date-series-list-item.component';
|
import {DateSeriesListItemComponent} from '../types/date-series/date-series-list-item.component';
|
||||||
import {EventListItemComponent} from '../types/event/event-list-item.component';
|
import {EventListItemComponent} from '../types/event/event-list-item.component';
|
||||||
@@ -25,9 +24,7 @@ import {PersonListItemComponent} from '../types/person/person-list-item.componen
|
|||||||
import {PlaceListItemComponent} from '../types/place/place-list-item.component';
|
import {PlaceListItemComponent} from '../types/place/place-list-item.component';
|
||||||
import {SemesterListItemComponent} from '../types/semester/semester-list-item.component';
|
import {SemesterListItemComponent} from '../types/semester/semester-list-item.component';
|
||||||
import {VideoListItemComponent} from '../types/video/video-list-item.component';
|
import {VideoListItemComponent} from '../types/video/video-list-item.component';
|
||||||
import {PeriodicalListItemComponent} from '../types/periodical/periodical-list-item.component';
|
|
||||||
import {DataListItemHostDefaultComponent} from './data-list-item-host-default.component';
|
import {DataListItemHostDefaultComponent} from './data-list-item-host-default.component';
|
||||||
import {ArticleListItemComponent} from '../types/article/article-item.component';
|
|
||||||
import {DishListItemComponent} from '../types/dish/dish-list-item.component';
|
import {DishListItemComponent} from '../types/dish/dish-list-item.component';
|
||||||
import {JobPostingListItemComponent} from '../types/job-posting/job-posting-list-item.component';
|
import {JobPostingListItemComponent} from '../types/job-posting/job-posting-list-item.component';
|
||||||
|
|
||||||
@@ -51,9 +48,6 @@ const DataListItemIndex: Partial<Record<SCThingType, Type<DataListItem>>> = {
|
|||||||
[SCThingType.Room]: PlaceListItemComponent,
|
[SCThingType.Room]: PlaceListItemComponent,
|
||||||
[SCThingType.Semester]: SemesterListItemComponent,
|
[SCThingType.Semester]: SemesterListItemComponent,
|
||||||
[SCThingType.Video]: VideoListItemComponent,
|
[SCThingType.Video]: VideoListItemComponent,
|
||||||
[SCThingType.Periodical]: PeriodicalListItemComponent,
|
|
||||||
[SCThingType.Book]: BookListItemComponent,
|
|
||||||
[SCThingType.Article]: ArticleListItemComponent,
|
|
||||||
[SCThingType.JobPosting]: JobPostingListItemComponent,
|
[SCThingType.JobPosting]: JobPostingListItemComponent,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
<stapps-search-page
|
<stapps-search-page
|
||||||
[title]="'canteens.title' | translate"
|
[title]="'canteens.title' | translate"
|
||||||
[navigation]="[]"
|
|
||||||
[showDefaultData]="true"
|
[showDefaultData]="true"
|
||||||
[forcedFilter]="forcedFilter"
|
[forcedFilter]="forcedFilter"
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -22,14 +22,7 @@ import {
|
|||||||
ModalController,
|
ModalController,
|
||||||
} from '@ionic/angular/standalone';
|
} from '@ionic/angular/standalone';
|
||||||
import {Capacitor} from '@capacitor/core';
|
import {Capacitor} from '@capacitor/core';
|
||||||
import {
|
import {SCFacet, SCSearchFilter, SCSearchQuery, SCSearchSort, SCThings} from '@openstapps/core';
|
||||||
SCFacet,
|
|
||||||
SCFeatureConfiguration,
|
|
||||||
SCSearchFilter,
|
|
||||||
SCSearchQuery,
|
|
||||||
SCSearchSort,
|
|
||||||
SCThings,
|
|
||||||
} from '@openstapps/core';
|
|
||||||
import {NGXLogger} from 'ngx-logger';
|
import {NGXLogger} from 'ngx-logger';
|
||||||
import {combineLatest, Subject} from 'rxjs';
|
import {combineLatest, Subject} from 'rxjs';
|
||||||
import {debounceTime, distinctUntilChanged, startWith} from 'rxjs/operators';
|
import {debounceTime, distinctUntilChanged, startWith} from 'rxjs/operators';
|
||||||
@@ -67,14 +60,6 @@ export class SearchPageComponent implements OnInit {
|
|||||||
*/
|
*/
|
||||||
loading = false;
|
loading = false;
|
||||||
|
|
||||||
/**
|
|
||||||
* Navigation elements between search pages
|
|
||||||
*/
|
|
||||||
@Input() navigation: Array<{label: string; routerLink?: string[]}> = [
|
|
||||||
{label: 'search.type'},
|
|
||||||
{label: 'hebisSearch.type', routerLink: ['/hebis-search']},
|
|
||||||
];
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Show default data (e.g. when there is user interaction)
|
* Show default data (e.g. when there is user interaction)
|
||||||
*/
|
*/
|
||||||
@@ -353,17 +338,6 @@ export class SearchPageComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
try {
|
|
||||||
// TODO: make this hack more generic
|
|
||||||
if (this.navigation[1]?.routerLink?.[0] === '/hebis-search') {
|
|
||||||
const features = this.configProvider.getValue('features') as SCFeatureConfiguration;
|
|
||||||
if (features.plugins?.['hebis-plugin']?.urlPath === undefined) {
|
|
||||||
this.navigation = [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
this.logger.error(error);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -43,26 +43,6 @@
|
|||||||
</ion-menu-button>
|
</ion-menu-button>
|
||||||
}
|
}
|
||||||
</ion-toolbar>
|
</ion-toolbar>
|
||||||
@if (navigation.length > 0) {
|
|
||||||
<ion-toolbar color="primary" class="category-tab">
|
|
||||||
<ion-buttons class="ion-justify-content-between">
|
|
||||||
@for (target of navigation; track target) {
|
|
||||||
@if (target.routerLink) {
|
|
||||||
<ion-button
|
|
||||||
[routerLink]="target.routerLink"
|
|
||||||
queryParamsHandling="merge"
|
|
||||||
[routerAnimation]="routeAnimation"
|
|
||||||
fill="outline"
|
|
||||||
size="large"
|
|
||||||
>{{ target.label | translate }}
|
|
||||||
</ion-button>
|
|
||||||
} @else {
|
|
||||||
<ion-button class="button-active" size="large">{{ target.label | translate }}</ion-button>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</ion-buttons>
|
|
||||||
</ion-toolbar>
|
|
||||||
}
|
|
||||||
</ion-header>
|
</ion-header>
|
||||||
|
|
||||||
<ion-content class="content">
|
<ion-content class="content">
|
||||||
|
|||||||
@@ -1,24 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2019 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 {Component, Input} from '@angular/core';
|
|
||||||
import {SCArticle} from '@openstapps/core';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'stapps-article-detail-content',
|
|
||||||
templateUrl: 'article-detail-content.html',
|
|
||||||
})
|
|
||||||
export class ArticleDetailContentComponent {
|
|
||||||
@Input() item: SCArticle;
|
|
||||||
}
|
|
||||||
@@ -1,105 +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/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
@if (item.sameAs) {
|
|
||||||
<ion-card>
|
|
||||||
<ion-card-header>{{ 'hebisSearch.detail.title' | translate | sentencecase }}</ion-card-header>
|
|
||||||
<ion-card-content>
|
|
||||||
<stapps-external-link
|
|
||||||
[text]="'name' | thingTranslate: item"
|
|
||||||
[link]="item.sameAs"
|
|
||||||
></stapps-external-link>
|
|
||||||
</ion-card-content>
|
|
||||||
</ion-card>
|
|
||||||
}
|
|
||||||
@if (!item.sameAs) {
|
|
||||||
<stapps-simple-card
|
|
||||||
[title]="'name' | propertyNameTranslate: item | sentencecase"
|
|
||||||
[content]="'name' | thingTranslate: item"
|
|
||||||
>
|
|
||||||
</stapps-simple-card>
|
|
||||||
}
|
|
||||||
@if (item.description) {
|
|
||||||
<stapps-simple-card
|
|
||||||
[title]="'hebisSearch.detail.description' | translate | sentencecase"
|
|
||||||
[content]="item.description"
|
|
||||||
></stapps-simple-card>
|
|
||||||
}
|
|
||||||
@if (item.sourceOrganization) {
|
|
||||||
<stapps-simple-card
|
|
||||||
[title]="'sourceOrganization' | propertyNameTranslate: item | sentencecase"
|
|
||||||
[content]="item.sourceOrganization"
|
|
||||||
></stapps-simple-card>
|
|
||||||
}
|
|
||||||
@if (item.authors && item.authors.length > 0) {
|
|
||||||
<ion-card>
|
|
||||||
<ion-card-header>{{ 'authors' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
|
|
||||||
<ion-card-content>
|
|
||||||
@for (author of item.authors; track author) {
|
|
||||||
<ion-label>{{ 'name' | thingTranslate: author }}</ion-label>
|
|
||||||
}
|
|
||||||
</ion-card-content>
|
|
||||||
</ion-card>
|
|
||||||
}
|
|
||||||
@if (item.firstPublished && !item.lastPublished) {
|
|
||||||
<stapps-simple-card
|
|
||||||
[title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
|
|
||||||
[content]="item.firstPublished"
|
|
||||||
>
|
|
||||||
</stapps-simple-card>
|
|
||||||
}
|
|
||||||
@if (item.firstPublished && item.lastPublished) {
|
|
||||||
<stapps-simple-card
|
|
||||||
[title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
|
|
||||||
[content]="[item.firstPublished, item.lastPublished] | join: ' - '"
|
|
||||||
>
|
|
||||||
</stapps-simple-card>
|
|
||||||
}
|
|
||||||
@if (item.publications) {
|
|
||||||
<ion-card>
|
|
||||||
<ion-card-header>{{ 'publications' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
|
|
||||||
<ion-card-content>
|
|
||||||
@for (publication of item.publications; track publication) {
|
|
||||||
<p>
|
|
||||||
{{ publication.locations | join: ', ' }}
|
|
||||||
{{ publication.locations && publication.publisher ? ':' : '' }} {{ publication.publisher }}
|
|
||||||
</p>
|
|
||||||
}
|
|
||||||
</ion-card-content>
|
|
||||||
</ion-card>
|
|
||||||
}
|
|
||||||
@if (item.reference) {
|
|
||||||
<stapps-simple-card
|
|
||||||
[title]="'reference' | propertyNameTranslate: item | sentencecase"
|
|
||||||
[content]="item.reference"
|
|
||||||
></stapps-simple-card>
|
|
||||||
}
|
|
||||||
@if (item.isPartOf) {
|
|
||||||
<stapps-simple-card
|
|
||||||
[title]="'isPartOf' | propertyNameTranslate: item | sentencecase"
|
|
||||||
[content]="item.isPartOf.name"
|
|
||||||
></stapps-simple-card>
|
|
||||||
}
|
|
||||||
@if (item.categories) {
|
|
||||||
<ion-card>
|
|
||||||
<ion-card-header>{{ 'categories' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
|
|
||||||
<ion-card-content>
|
|
||||||
<ion-chip [color]="'primary'">
|
|
||||||
<ion-icon [name]="item.type | dataIcon"></ion-icon>
|
|
||||||
<ion-label>{{ 'categories' | thingTranslate: item }}</ion-label>
|
|
||||||
</ion-chip>
|
|
||||||
</ion-card-content>
|
|
||||||
</ion-card>
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2019 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 {Component, Input} from '@angular/core';
|
|
||||||
import {SCArticle} from '@openstapps/core';
|
|
||||||
import {DataListItemComponent} from '../../list/data-list-item.component';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* TODO
|
|
||||||
*/
|
|
||||||
@Component({
|
|
||||||
selector: 'stapps-article-item',
|
|
||||||
templateUrl: 'article-list-item.html',
|
|
||||||
styleUrl: 'article-list-item.scss',
|
|
||||||
})
|
|
||||||
export class ArticleListItemComponent extends DataListItemComponent {
|
|
||||||
/**
|
|
||||||
* TODO
|
|
||||||
*/
|
|
||||||
@Input() item: SCArticle;
|
|
||||||
}
|
|
||||||
@@ -1,32 +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/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<ion-label class="title">{{ 'name' | thingTranslate: item }}</ion-label>
|
|
||||||
<p class="title-sub">
|
|
||||||
@for (author of item.authors; track author) {
|
|
||||||
{{ 'name' | thingTranslate: author }}
|
|
||||||
}
|
|
||||||
@if (item.authors && item.authors && item.firstPublished) {
|
|
||||||
,
|
|
||||||
}
|
|
||||||
@if (item.firstPublished && !item.lastPublished) {
|
|
||||||
{{ item.firstPublished }}
|
|
||||||
} @else {
|
|
||||||
@if (item.firstPublished && item.lastPublished) {
|
|
||||||
{{ [item.firstPublished, item.lastPublished] | join: ' - ' }}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</p>
|
|
||||||
<ion-note> {{ 'categories' | thingTranslate: item }} </ion-note>
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
p.title-sub {
|
|
||||||
white-space: unset;
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2019 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 {Component, Input} from '@angular/core';
|
|
||||||
import {SCBook} from '@openstapps/core';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* TODO
|
|
||||||
*/
|
|
||||||
@Component({
|
|
||||||
selector: 'stapps-book-detail-content',
|
|
||||||
templateUrl: 'book-detail-content.html',
|
|
||||||
})
|
|
||||||
export class BookDetailContentComponent {
|
|
||||||
/**
|
|
||||||
* TODO
|
|
||||||
*/
|
|
||||||
@Input() item: SCBook;
|
|
||||||
}
|
|
||||||
@@ -1,104 +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/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
@if (item.sameAs) {
|
|
||||||
<ion-card>
|
|
||||||
<ion-card-header>{{ 'hebisSearch.detail.title' | translate | sentencecase }}</ion-card-header>
|
|
||||||
<ion-card-content>
|
|
||||||
<stapps-external-link
|
|
||||||
[text]="'name' | thingTranslate: item"
|
|
||||||
[link]="item.sameAs"
|
|
||||||
></stapps-external-link>
|
|
||||||
</ion-card-content>
|
|
||||||
</ion-card>
|
|
||||||
}
|
|
||||||
@if (!item.sameAs) {
|
|
||||||
<stapps-simple-card
|
|
||||||
[title]="'name' | propertyNameTranslate: item | sentencecase"
|
|
||||||
[content]="'name' | thingTranslate: item"
|
|
||||||
>
|
|
||||||
</stapps-simple-card>
|
|
||||||
}
|
|
||||||
@if (item.edition) {
|
|
||||||
<stapps-simple-card
|
|
||||||
[title]="'edition' | propertyNameTranslate: item | sentencecase"
|
|
||||||
[content]="'edition' | thingTranslate: item"
|
|
||||||
>
|
|
||||||
</stapps-simple-card>
|
|
||||||
}
|
|
||||||
@if (item.description) {
|
|
||||||
<stapps-simple-card
|
|
||||||
[title]="'hebisSearch.detail.description' | translate | sentencecase"
|
|
||||||
[content]="item.description"
|
|
||||||
></stapps-simple-card>
|
|
||||||
}
|
|
||||||
@if (item.sourceOrganization) {
|
|
||||||
<stapps-simple-card
|
|
||||||
[title]="'sourceOrganization' | propertyNameTranslate: item | sentencecase"
|
|
||||||
[content]="item.sourceOrganization"
|
|
||||||
></stapps-simple-card>
|
|
||||||
}
|
|
||||||
@if (item.authors && item.authors.length > 0) {
|
|
||||||
<ion-card>
|
|
||||||
<ion-card-header>{{ 'authors' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
|
|
||||||
<ion-card-content>
|
|
||||||
@for (author of item.authors; track author) {
|
|
||||||
<ion-label>{{ 'name' | thingTranslate: author }}</ion-label>
|
|
||||||
}
|
|
||||||
</ion-card-content>
|
|
||||||
</ion-card>
|
|
||||||
}
|
|
||||||
@if (item.ISBNs) {
|
|
||||||
<stapps-simple-card [title]="'ISBNs' | propertyNameTranslate: item | sentencecase" [content]="item.ISBNs">
|
|
||||||
</stapps-simple-card>
|
|
||||||
}
|
|
||||||
@if (item.firstPublished && !item.lastPublished) {
|
|
||||||
<stapps-simple-card
|
|
||||||
[title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
|
|
||||||
[content]="item.firstPublished"
|
|
||||||
>
|
|
||||||
</stapps-simple-card>
|
|
||||||
}
|
|
||||||
@if (item.firstPublished && item.lastPublished) {
|
|
||||||
<stapps-simple-card
|
|
||||||
[title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
|
|
||||||
[content]="[item.firstPublished, item.lastPublished] | join: ' - '"
|
|
||||||
>
|
|
||||||
</stapps-simple-card>
|
|
||||||
}
|
|
||||||
@if (item.publications) {
|
|
||||||
<ion-card>
|
|
||||||
<ion-card-header>{{ 'publications' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
|
|
||||||
<ion-card-content>
|
|
||||||
@for (publication of item.publications; track publication) {
|
|
||||||
<p>
|
|
||||||
{{ publication.locations | join: ', ' }}
|
|
||||||
{{ publication.locations && publication.publisher ? ':' : '' }} {{ publication.publisher }}
|
|
||||||
</p>
|
|
||||||
}
|
|
||||||
</ion-card-content>
|
|
||||||
</ion-card>
|
|
||||||
}
|
|
||||||
@if (item.categories) {
|
|
||||||
<ion-card>
|
|
||||||
<ion-card-header>{{ 'categories' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
|
|
||||||
<ion-card-content>
|
|
||||||
<ion-chip [color]="'primary'">
|
|
||||||
<ion-icon [name]="item.type | dataIcon"></ion-icon>
|
|
||||||
<ion-label>{{ 'categories' | thingTranslate: item }}</ion-label>
|
|
||||||
</ion-chip>
|
|
||||||
</ion-card-content>
|
|
||||||
</ion-card>
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2019 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 {Component, Input} from '@angular/core';
|
|
||||||
import {SCBook} from '@openstapps/core';
|
|
||||||
import {DataListItemComponent} from '../../list/data-list-item.component';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* TODO
|
|
||||||
*/
|
|
||||||
@Component({
|
|
||||||
selector: 'stapps-book-list-item',
|
|
||||||
templateUrl: 'book-list-item.html',
|
|
||||||
styleUrl: 'book-list-item.scss',
|
|
||||||
})
|
|
||||||
export class BookListItemComponent extends DataListItemComponent {
|
|
||||||
/**
|
|
||||||
* TODO
|
|
||||||
*/
|
|
||||||
@Input() item: SCBook;
|
|
||||||
}
|
|
||||||
@@ -1,32 +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/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<ion-label class="title">{{ 'name' | thingTranslate: item }}</ion-label>
|
|
||||||
<p class="title-sub">
|
|
||||||
@for (author of item.authors; track author) {
|
|
||||||
{{ 'name' | thingTranslate: author }}
|
|
||||||
}
|
|
||||||
@if (item.authors && item.authors && item.firstPublished) {
|
|
||||||
,
|
|
||||||
}
|
|
||||||
@if (item.firstPublished && !item.lastPublished) {
|
|
||||||
{{ item.firstPublished }}
|
|
||||||
} @else {
|
|
||||||
@if (item.firstPublished && item.lastPublished) {
|
|
||||||
{{ [item.firstPublished, item.lastPublished] | join: ' - ' }}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</p>
|
|
||||||
<ion-note> {{ 'categories' | thingTranslate: item }} </ion-note>
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
p.title-sub {
|
|
||||||
white-space: unset;
|
|
||||||
}
|
|
||||||
-30
@@ -1,30 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2019 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 {Component, Input} from '@angular/core';
|
|
||||||
import {SCPeriodical} from '@openstapps/core';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* TODO
|
|
||||||
*/
|
|
||||||
@Component({
|
|
||||||
selector: 'stapps-periodical-detail-content',
|
|
||||||
templateUrl: 'periodical-detail-content.html',
|
|
||||||
})
|
|
||||||
export class PeriodicalDetailContentComponent {
|
|
||||||
/**
|
|
||||||
* TODO
|
|
||||||
*/
|
|
||||||
@Input() item: SCPeriodical;
|
|
||||||
}
|
|
||||||
@@ -1,100 +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/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
@if (item.sameAs) {
|
|
||||||
<ion-card>
|
|
||||||
<ion-card-header>{{ 'hebisSearch.detail.title' | translate | sentencecase }}</ion-card-header>
|
|
||||||
<ion-card-content>
|
|
||||||
<stapps-external-link
|
|
||||||
[text]="'name' | thingTranslate: item"
|
|
||||||
[link]="item.sameAs"
|
|
||||||
></stapps-external-link>
|
|
||||||
</ion-card-content>
|
|
||||||
</ion-card>
|
|
||||||
}
|
|
||||||
@if (!item.sameAs) {
|
|
||||||
<stapps-simple-card
|
|
||||||
[title]="'name' | propertyNameTranslate: item | sentencecase"
|
|
||||||
[content]="'name' | thingTranslate: item"
|
|
||||||
>
|
|
||||||
</stapps-simple-card>
|
|
||||||
}
|
|
||||||
@if (item.description) {
|
|
||||||
<stapps-simple-card
|
|
||||||
[title]="'hebisSearch.detail.description' | translate | sentencecase"
|
|
||||||
[content]="item.description"
|
|
||||||
></stapps-simple-card>
|
|
||||||
}
|
|
||||||
@if (item.sourceOrganization) {
|
|
||||||
<stapps-simple-card
|
|
||||||
[title]="'sourceOrganization' | propertyNameTranslate: item | sentencecase"
|
|
||||||
[content]="item.sourceOrganization"
|
|
||||||
></stapps-simple-card>
|
|
||||||
}
|
|
||||||
@if (item.authors && item.authors.length > 0) {
|
|
||||||
<ion-card>
|
|
||||||
<ion-card-header>{{ 'authors' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
|
|
||||||
<ion-card-content>
|
|
||||||
@for (author of item.authors; track author) {
|
|
||||||
<ion-label>{{ 'name' | thingTranslate: author }}</ion-label>
|
|
||||||
}
|
|
||||||
</ion-card-content>
|
|
||||||
</ion-card>
|
|
||||||
}
|
|
||||||
@if (item.firstPublished && !item.lastPublished) {
|
|
||||||
<stapps-simple-card
|
|
||||||
[title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
|
|
||||||
[content]="item.firstPublished + '-'"
|
|
||||||
>
|
|
||||||
</stapps-simple-card>
|
|
||||||
}
|
|
||||||
@if (item.firstPublished && item.lastPublished) {
|
|
||||||
<stapps-simple-card
|
|
||||||
[title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
|
|
||||||
[content]="[item.firstPublished, item.lastPublished] | join: ' - '"
|
|
||||||
>
|
|
||||||
</stapps-simple-card>
|
|
||||||
}
|
|
||||||
@if (item.publications) {
|
|
||||||
<ion-card>
|
|
||||||
<ion-card-header>{{ 'publications' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
|
|
||||||
<ion-card-content>
|
|
||||||
@for (publication of item.publications; track publication) {
|
|
||||||
<p>
|
|
||||||
{{ publication.locations | join: ', ' }}
|
|
||||||
{{ publication.locations && publication.publisher ? ':' : '' }} {{ publication.publisher }}
|
|
||||||
</p>
|
|
||||||
}
|
|
||||||
</ion-card-content>
|
|
||||||
</ion-card>
|
|
||||||
}
|
|
||||||
@if (item.categories) {
|
|
||||||
<ion-card>
|
|
||||||
<ion-card-header>{{ 'categories' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
|
|
||||||
<ion-card-content>
|
|
||||||
<ion-chip [color]="'primary'">
|
|
||||||
<ion-icon [name]="item.type | dataIcon"></ion-icon>
|
|
||||||
<ion-label>{{ 'categories' | thingTranslate: item }}</ion-label>
|
|
||||||
</ion-chip>
|
|
||||||
</ion-card-content>
|
|
||||||
</ion-card>
|
|
||||||
}
|
|
||||||
@if (item.ISSNs) {
|
|
||||||
<stapps-simple-card
|
|
||||||
[title]="'ISSNs' | propertyNameTranslate: item | sentencecase"
|
|
||||||
[content]="item.ISSNs | join: ', '"
|
|
||||||
>
|
|
||||||
</stapps-simple-card>
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2019 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 {Component, Input} from '@angular/core';
|
|
||||||
import {SCPeriodical} from '@openstapps/core';
|
|
||||||
import {DataListItemComponent} from '../../list/data-list-item.component';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* TODO
|
|
||||||
*/
|
|
||||||
@Component({
|
|
||||||
selector: 'stapps-periodical-list-item',
|
|
||||||
templateUrl: 'periodical-list-item.html',
|
|
||||||
styleUrl: 'periodical-list-item.scss',
|
|
||||||
})
|
|
||||||
export class PeriodicalListItemComponent extends DataListItemComponent {
|
|
||||||
/**
|
|
||||||
* TODO
|
|
||||||
*/
|
|
||||||
@Input() item: SCPeriodical;
|
|
||||||
}
|
|
||||||
@@ -1,32 +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/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<ion-label class="title">{{ 'name' | thingTranslate: item }}</ion-label>
|
|
||||||
<p class="title-sub">
|
|
||||||
@for (author of item.authors; track author) {
|
|
||||||
{{ 'name' | thingTranslate: author }}
|
|
||||||
}
|
|
||||||
@if (item.authors && item.authors && item.firstPublished) {
|
|
||||||
,
|
|
||||||
}
|
|
||||||
@if (item.firstPublished && !item.lastPublished) {
|
|
||||||
{{ item.firstPublished }}
|
|
||||||
} @else {
|
|
||||||
@if (item.firstPublished && item.lastPublished) {
|
|
||||||
{{ [item.firstPublished, item.lastPublished] | join: ' - ' }}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</p>
|
|
||||||
<ion-note> {{ 'categories' | thingTranslate: item }} </ion-note>
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
p.title-sub {
|
|
||||||
white-space: unset;
|
|
||||||
}
|
|
||||||
@@ -18,7 +18,6 @@ import {ActivatedRoute, Router} from '@angular/router';
|
|||||||
import {NGXLogger} from 'ngx-logger';
|
import {NGXLogger} from 'ngx-logger';
|
||||||
import {debounceTime, distinctUntilChanged, startWith, take} from 'rxjs/operators';
|
import {debounceTime, distinctUntilChanged, startWith, take} from 'rxjs/operators';
|
||||||
import {combineLatest} from 'rxjs';
|
import {combineLatest} from 'rxjs';
|
||||||
import {SCThingType} from '@openstapps/core';
|
|
||||||
import {FavoritesService} from './favorites.service';
|
import {FavoritesService} from './favorites.service';
|
||||||
import {DataRoutingService} from '../data/data-routing.service';
|
import {DataRoutingService} from '../data/data-routing.service';
|
||||||
import {ContextMenuService} from '../menu/context/context-menu.service';
|
import {ContextMenuService} from '../menu/context/context-menu.service';
|
||||||
@@ -113,17 +112,7 @@ export class FavoritesPageComponent extends SearchPageComponent implements OnIni
|
|||||||
.pipe(takeUntilDestroyed(this.destroy$))
|
.pipe(takeUntilDestroyed(this.destroy$))
|
||||||
.subscribe(item => {
|
.subscribe(item => {
|
||||||
if (this.itemRouting) {
|
if (this.itemRouting) {
|
||||||
if ([SCThingType.Book, SCThingType.Periodical, SCThingType.Article].includes(item.type)) {
|
void this.router.navigate(['data-detail', item.uid], {state: {item}});
|
||||||
void this.router.navigate(
|
|
||||||
[
|
|
||||||
'hebis-detail',
|
|
||||||
(item.origin && 'originalId' in item.origin && item.origin['originalId']) || '',
|
|
||||||
],
|
|
||||||
{state: {item}},
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
void this.router.navigate(['data-detail', item.uid], {state: {item}});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
-120
@@ -1,120 +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/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* eslint-disable @typescript-eslint/no-non-null-assertion,@typescript-eslint/no-explicit-any */
|
|
||||||
import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
|
|
||||||
import {ComponentFixture, TestBed} from '@angular/core/testing';
|
|
||||||
import {ActivatedRoute, RouterModule} from '@angular/router';
|
|
||||||
import {TranslateLoader, TranslateModule, TranslateService} from '@ngx-translate/core';
|
|
||||||
import {sampleThingsMap} from '../../../_helpers/data/sample-things';
|
|
||||||
import {HebisRoutingModule} from '../hebis-routing.module';
|
|
||||||
import {HebisModule} from '../hebis.module';
|
|
||||||
import {DaiaAvailabilityComponent} from './daia-availability.component';
|
|
||||||
import {Observable, of} from 'rxjs';
|
|
||||||
import {StorageProvider} from '../../storage/storage.provider';
|
|
||||||
import {DaiaDataProvider} from '../daia-data.provider';
|
|
||||||
import {ConfigProvider} from '../../config/config.provider';
|
|
||||||
import {LoggerTestingModule} from 'ngx-logger/testing';
|
|
||||||
import {provideIonicAngular} from '@ionic/angular/standalone';
|
|
||||||
|
|
||||||
const translations: any = {data: {detail: {TITLE: 'Foo'}}};
|
|
||||||
|
|
||||||
class TranslateFakeLoader implements TranslateLoader {
|
|
||||||
getTranslation(_lang: string): Observable<any> {
|
|
||||||
return of(translations);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('DaiaAvailabilityComponent', () => {
|
|
||||||
let comp: DaiaAvailabilityComponent;
|
|
||||||
let fixture: ComponentFixture<DaiaAvailabilityComponent>;
|
|
||||||
let dataProvider: DaiaDataProvider;
|
|
||||||
const sampleThing = sampleThingsMap.book[0];
|
|
||||||
let translateService: TranslateService;
|
|
||||||
let configProviderMock: jasmine.SpyObj<ConfigProvider>;
|
|
||||||
|
|
||||||
// @Component({ selector: 'stapps-data-list-item', template: '' })
|
|
||||||
// class DataListItemComponent {
|
|
||||||
// @Input() item;
|
|
||||||
// }
|
|
||||||
|
|
||||||
const fakeActivatedRoute = {
|
|
||||||
snapshot: {
|
|
||||||
paramMap: {
|
|
||||||
get: () => {
|
|
||||||
return sampleThing.uid;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
const storageProviderSpy = jasmine.createSpyObj('StorageProvider', ['init', 'get', 'has', 'put', 'search']);
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
configProviderMock = jasmine.createSpyObj('ConfigProvider', ['init', 'getValue', 'getAnyValue']);
|
|
||||||
TestBed.configureTestingModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forRoot([]),
|
|
||||||
HebisRoutingModule,
|
|
||||||
HebisModule,
|
|
||||||
TranslateModule.forRoot({
|
|
||||||
loader: {provide: TranslateLoader, useClass: TranslateFakeLoader},
|
|
||||||
}),
|
|
||||||
LoggerTestingModule,
|
|
||||||
],
|
|
||||||
providers: [
|
|
||||||
provideIonicAngular(),
|
|
||||||
{
|
|
||||||
provide: ActivatedRoute,
|
|
||||||
useValue: fakeActivatedRoute,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
provide: StorageProvider,
|
|
||||||
useValue: storageProviderSpy,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
provide: ConfigProvider,
|
|
||||||
useValue: configProviderMock,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
schemas: [CUSTOM_ELEMENTS_SCHEMA],
|
|
||||||
}).compileComponents();
|
|
||||||
});
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
|
||||||
dataProvider = TestBed.inject(DaiaDataProvider);
|
|
||||||
const workingDAIAurl = 'https://daia.hebis.de/DAIA2/UB_Frankfurt';
|
|
||||||
dataProvider.daiaServiceUrl = workingDAIAurl;
|
|
||||||
translateService = TestBed.inject(TranslateService);
|
|
||||||
spyOn(dataProvider, 'getAvailability' as any).and.returnValue(Promise.resolve([]));
|
|
||||||
spyOn(DaiaAvailabilityComponent.prototype, 'getAvailability').and.callThrough();
|
|
||||||
fixture = await TestBed.createComponent(DaiaAvailabilityComponent);
|
|
||||||
comp = fixture.componentInstance;
|
|
||||||
translateService.use('foo');
|
|
||||||
fixture.detectChanges();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should create component', () => expect(comp).toBeDefined());
|
|
||||||
|
|
||||||
it('should get the availability of an item', () => {
|
|
||||||
comp.getAvailability(sampleThing.uid);
|
|
||||||
expect(DaiaAvailabilityComponent.prototype.getAvailability).toHaveBeenCalledWith(sampleThing.uid);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should get the availability of an item when the view is entered', () => {
|
|
||||||
comp.ngOnInit();
|
|
||||||
expect(DaiaAvailabilityComponent.prototype.getAvailability).toHaveBeenCalledWith(sampleThing.uid);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,59 +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 {Component, inject, OnInit} from '@angular/core';
|
|
||||||
import {SCUuid} from '@openstapps/core';
|
|
||||||
import {DataDetailComponent} from '../../data/detail/data-detail.component';
|
|
||||||
import {DaiaDataProvider} from '../daia-data.provider';
|
|
||||||
import {DaiaHolding} from '../protocol/response';
|
|
||||||
import {groupByStable} from '@openstapps/collection-utils';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A Component to display an SCThing detailed
|
|
||||||
*/
|
|
||||||
@Component({
|
|
||||||
selector: 'stapps-daia-availability',
|
|
||||||
styleUrls: ['daia-availability.scss'],
|
|
||||||
templateUrl: 'daia-availability.html',
|
|
||||||
})
|
|
||||||
export class DaiaAvailabilityComponent extends DataDetailComponent implements OnInit {
|
|
||||||
holdings?: DaiaHolding[];
|
|
||||||
|
|
||||||
holdingsByDepartments?: Map<DaiaHolding['department']['id'], DaiaHolding[]>;
|
|
||||||
|
|
||||||
private daiaDataProvider = inject(DaiaDataProvider);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @override
|
|
||||||
*/
|
|
||||||
async ngOnInit() {
|
|
||||||
const uid = this.route.snapshot.paramMap.get('uid');
|
|
||||||
if (uid) {
|
|
||||||
await this.getAvailability(uid);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Provides data item with given UID
|
|
||||||
* @param uid Unique identifier of a thing
|
|
||||||
*/
|
|
||||||
async getAvailability(uid: SCUuid) {
|
|
||||||
this.daiaDataProvider.getAvailability(uid).then(holdings => {
|
|
||||||
if (holdings !== undefined) {
|
|
||||||
this.holdings = holdings;
|
|
||||||
this.holdingsByDepartments = groupByStable(holdings, holding => holding.department.id);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,44 +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/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<ng-container>
|
|
||||||
<ion-card>
|
|
||||||
<ion-card-header> {{ 'hebisSearch.daia.availability' | translate }} </ion-card-header>
|
|
||||||
<ion-card-content>
|
|
||||||
@if (holdingsByDepartments) {
|
|
||||||
@for (holdingsByDepartment of holdingsByDepartments | keyvalue; track holdingsByDepartment) {
|
|
||||||
<ion-label>
|
|
||||||
@if (holdingsByDepartment.value[0].department.href) {
|
|
||||||
<stapps-external-link
|
|
||||||
[text]="holdingsByDepartment.value[0].department.content"
|
|
||||||
[link]="holdingsByDepartment.value[0].department.href"
|
|
||||||
>
|
|
||||||
</stapps-external-link>
|
|
||||||
}
|
|
||||||
</ion-label>
|
|
||||||
@for (holding of holdingsByDepartment.value; track holding) {
|
|
||||||
<stapps-daia-holding [holding]="holding"></stapps-daia-holding>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@if (!holdings) {
|
|
||||||
<ion-label> {{ 'hebisSearch.daia.unavailableAvailability' | translate }} </ion-label>
|
|
||||||
}
|
|
||||||
@if (holdings?.length === 0) {
|
|
||||||
<ion-label> {{ 'hebisSearch.daia.unknownAvailability' | translate }} </ion-label>
|
|
||||||
}
|
|
||||||
</ion-card-content>
|
|
||||||
</ion-card>
|
|
||||||
</ng-container>
|
|
||||||
@@ -1,34 +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/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
:host ion-card {
|
|
||||||
margin: 0;
|
|
||||||
box-shadow: none;
|
|
||||||
|
|
||||||
ion-card-content {
|
|
||||||
padding-bottom: 8px;
|
|
||||||
|
|
||||||
h1 {
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ion-card-header {
|
|
||||||
padding-top: 8px;
|
|
||||||
padding-bottom: 4px;
|
|
||||||
font-weight: bold;
|
|
||||||
color: var(--ion-color-dark);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,35 +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 {Component, Input, OnInit} from '@angular/core';
|
|
||||||
import {DaiaHolding} from '../protocol/response';
|
|
||||||
import {DaiaDataProvider} from '../daia-data.provider';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'stapps-daia-holding',
|
|
||||||
templateUrl: './daia-holding.html',
|
|
||||||
styleUrls: ['./daia-holding.scss'],
|
|
||||||
})
|
|
||||||
export class DaiaHoldingComponent implements OnInit {
|
|
||||||
@Input() holding: DaiaHolding;
|
|
||||||
|
|
||||||
constructor(private daiaDataProvider: DaiaDataProvider) {}
|
|
||||||
|
|
||||||
resourceLink?: string;
|
|
||||||
|
|
||||||
ngOnInit(): void {
|
|
||||||
this.resourceLink = this.daiaDataProvider.getHoldingLink(this.holding, this.holding.open);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,89 +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/>.
|
|
||||||
-->
|
|
||||||
<ion-grid>
|
|
||||||
@if (holding.storage && holding.storage.content) {
|
|
||||||
<ion-row>
|
|
||||||
<ion-col size="3">{{ 'hebisSearch.daia.location' | translate }}</ion-col>
|
|
||||||
<ion-col size="9" [innerHTML]="holding.storage.content"></ion-col>
|
|
||||||
</ion-row>
|
|
||||||
}
|
|
||||||
@if (holding.signature && !holding.online) {
|
|
||||||
<ion-row>
|
|
||||||
<ion-col size="3">{{ 'hebisSearch.daia.signature' | translate }}</ion-col>
|
|
||||||
<ion-col size="9">{{ holding.signature }}</ion-col>
|
|
||||||
</ion-row>
|
|
||||||
}
|
|
||||||
@if (holding.holdings) {
|
|
||||||
<ion-row>
|
|
||||||
<ion-col size="3">{{ 'hebisSearch.daia.holdings' | translate }}</ion-col>
|
|
||||||
<ion-col size="9">{{ holding.holdings }}</ion-col>
|
|
||||||
</ion-row>
|
|
||||||
}
|
|
||||||
@if (holding.about) {
|
|
||||||
<ion-row>
|
|
||||||
<ion-col size="3">{{ 'hebisSearch.daia.comment' | translate }}</ion-col>
|
|
||||||
<ion-col size="9" [innerHTML]="holding.about"></ion-col>
|
|
||||||
</ion-row>
|
|
||||||
}
|
|
||||||
@if (holding.available && holding.online && resourceLink) {
|
|
||||||
<ion-row>
|
|
||||||
<ion-col size="3">{{ 'Online' }}</ion-col>
|
|
||||||
<ion-col size="9">
|
|
||||||
<stapps-external-link
|
|
||||||
[link]="resourceLink"
|
|
||||||
[text]="'hebisSearch.daia.fulltext' | translate"
|
|
||||||
></stapps-external-link
|
|
||||||
></ion-col>
|
|
||||||
</ion-row>
|
|
||||||
}
|
|
||||||
@if (holding.status) {
|
|
||||||
<ion-row>
|
|
||||||
<ion-col size="3">{{ 'hebisSearch.daia.status' | translate }}</ion-col>
|
|
||||||
<ion-col size="9">
|
|
||||||
@if (holding.status === 'available') {
|
|
||||||
<ion-icon name="check_circle" color="success"></ion-icon>
|
|
||||||
}
|
|
||||||
@if (holding.status === 'library_only') {
|
|
||||||
<ion-icon name="check_circle" color="warning"></ion-icon>
|
|
||||||
}
|
|
||||||
@if (['checked_out', 'not_yet_available', 'not_available'].indexOf(holding.status) > -1) {
|
|
||||||
<ion-icon name="cancel" color="danger"> </ion-icon>
|
|
||||||
}
|
|
||||||
{{ 'hebisSearch.daia.status_states' + '.' + holding.status | translate }}
|
|
||||||
@if (
|
|
||||||
(holding.status === 'available' || holding.status === 'library_only') &&
|
|
||||||
holding.available &&
|
|
||||||
holding.available.href
|
|
||||||
) {
|
|
||||||
<stapps-external-link [text]="'hebisSearch.daia.order' | translate" [link]="holding.available.href">
|
|
||||||
</stapps-external-link>
|
|
||||||
}
|
|
||||||
@if (holding.status === 'checked_out' && holding.unavailable && holding.unavailable.href) {
|
|
||||||
<stapps-external-link
|
|
||||||
[text]="'hebisSearch.daia.reserve' | translate"
|
|
||||||
[link]="holding.unavailable.href"
|
|
||||||
>
|
|
||||||
</stapps-external-link>
|
|
||||||
}
|
|
||||||
</ion-col>
|
|
||||||
</ion-row>
|
|
||||||
}
|
|
||||||
@if (holding.dueDate) {
|
|
||||||
<ion-row>
|
|
||||||
<ion-col size="3">{{ 'hebisSearch.daia.dueDate' | translate }}</ion-col>
|
|
||||||
<ion-col size="9">{{ holding.dueDate | amDateFormat: 'll' }}</ion-col>
|
|
||||||
</ion-row>
|
|
||||||
}
|
|
||||||
</ion-grid>
|
|
||||||
@@ -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/>.
|
|
||||||
*/
|
|
||||||
ion-label a {
|
|
||||||
display: block;
|
|
||||||
|
|
||||||
margin: 20px 0 5px;
|
|
||||||
|
|
||||||
font-weight: 700;
|
|
||||||
color: var(--ion-color-primary);
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
ion-grid {
|
|
||||||
margin: 5px;
|
|
||||||
padding: 0;
|
|
||||||
|
|
||||||
ion-row {
|
|
||||||
color: var(--ion-color-light-contrast);
|
|
||||||
background-color: var(--ion-color-light);
|
|
||||||
border-bottom: 1px solid #fff;
|
|
||||||
|
|
||||||
ion-col:first-child {
|
|
||||||
font-weight: 700;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ion-icon {
|
|
||||||
--fill: 1;
|
|
||||||
}
|
|
||||||
@@ -1,231 +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/>.
|
|
||||||
*/
|
|
||||||
/* eslint-disable @typescript-eslint/no-non-null-assertion, @typescript-eslint/no-explicit-any, unicorn/no-thenable */
|
|
||||||
import {TestBed} from '@angular/core/testing';
|
|
||||||
import {DaiaDataProvider} from './daia-data.provider';
|
|
||||||
import {HebisModule} from './hebis.module';
|
|
||||||
import {ConfigProvider} from '../config/config.provider';
|
|
||||||
import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
|
|
||||||
import {StorageProvider} from '../storage/storage.provider';
|
|
||||||
import {LoggerTestingModule} from 'ngx-logger/testing';
|
|
||||||
import {MapModule} from '../map/map.module';
|
|
||||||
import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
|
|
||||||
import {StorageModule} from '../storage/storage.module';
|
|
||||||
import {DaiaHolding, DaiaService} from './protocol/response';
|
|
||||||
import {Observable, of} from 'rxjs';
|
|
||||||
import {TranslateLoader, TranslateModule} from '@ngx-translate/core';
|
|
||||||
|
|
||||||
const translations: any = {data: {detail: {TITLE: 'Foo'}}};
|
|
||||||
|
|
||||||
class TranslateFakeLoader implements TranslateLoader {
|
|
||||||
getTranslation(_lang: string): Observable<any> {
|
|
||||||
return of(translations);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('DaiaDataProvider', () => {
|
|
||||||
let daiaDataProvider: DaiaDataProvider;
|
|
||||||
let configProvider: ConfigProvider;
|
|
||||||
const proxyUrl = 'https://some-proxy.com?q=';
|
|
||||||
const getProxifiedUrl = (url: string) => `${proxyUrl}${encodeURIComponent(url)}`;
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
|
||||||
configProvider = jasmine.createSpyObj('ConfigProvider', ['getValue']);
|
|
||||||
TestBed.configureTestingModule({
|
|
||||||
imports: [
|
|
||||||
HebisModule,
|
|
||||||
MapModule,
|
|
||||||
StorageModule,
|
|
||||||
LoggerTestingModule,
|
|
||||||
TranslateModule.forRoot({
|
|
||||||
loader: {provide: TranslateLoader, useClass: TranslateFakeLoader},
|
|
||||||
}),
|
|
||||||
],
|
|
||||||
providers: [
|
|
||||||
{
|
|
||||||
provide: ConfigProvider,
|
|
||||||
useValue: configProvider,
|
|
||||||
},
|
|
||||||
StAppsWebHttpClient,
|
|
||||||
StorageProvider,
|
|
||||||
DaiaDataProvider,
|
|
||||||
provideHttpClient(withInterceptorsFromDi()),
|
|
||||||
],
|
|
||||||
});
|
|
||||||
daiaDataProvider = TestBed.inject(DaiaDataProvider);
|
|
||||||
daiaDataProvider.hebisProxyUrl = proxyUrl;
|
|
||||||
});
|
|
||||||
describe('getResourceLink', () => {
|
|
||||||
it('should return link with proxy when open property is undefined', () => {
|
|
||||||
const available: DaiaService = {
|
|
||||||
delay: '',
|
|
||||||
expected: '',
|
|
||||||
href: 'https://some-url.com',
|
|
||||||
limitations: [],
|
|
||||||
service: 'presentation',
|
|
||||||
};
|
|
||||||
const holding: DaiaHolding = {
|
|
||||||
department: {id: '', content: ''},
|
|
||||||
id: '',
|
|
||||||
online: false,
|
|
||||||
signature: '',
|
|
||||||
available: available,
|
|
||||||
};
|
|
||||||
|
|
||||||
expect(daiaDataProvider.getHoldingLink(holding, holding.open)).toEqual(
|
|
||||||
getProxifiedUrl(available.href as string),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should return the resource link without proxy when the resource is open', () => {
|
|
||||||
const available: DaiaService = {
|
|
||||||
delay: '',
|
|
||||||
expected: '',
|
|
||||||
href: 'https://some-url.com',
|
|
||||||
limitations: [],
|
|
||||||
service: 'other',
|
|
||||||
};
|
|
||||||
const holding: DaiaHolding = {
|
|
||||||
department: {id: '', content: ''},
|
|
||||||
id: '',
|
|
||||||
online: false,
|
|
||||||
open: true,
|
|
||||||
signature: '',
|
|
||||||
available: available,
|
|
||||||
};
|
|
||||||
|
|
||||||
expect(daiaDataProvider.getHoldingLink(holding, holding.open)).toEqual(available.href as string);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should return the resource link with proxy when the resource is not open', () => {
|
|
||||||
const available: DaiaService = {
|
|
||||||
delay: '',
|
|
||||||
expected: '',
|
|
||||||
href: 'https://some-url.com',
|
|
||||||
limitations: [],
|
|
||||||
service: 'other',
|
|
||||||
};
|
|
||||||
const holding: DaiaHolding = {
|
|
||||||
department: {id: '', content: ''},
|
|
||||||
id: '',
|
|
||||||
online: false,
|
|
||||||
open: false,
|
|
||||||
signature: '',
|
|
||||||
available: available,
|
|
||||||
};
|
|
||||||
|
|
||||||
expect(daiaDataProvider.getHoldingLink(holding, holding.open)).toEqual(
|
|
||||||
getProxifiedUrl(available.href as string),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('getResourceStatus', () => {
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
||||||
// let available, unavalable: SCDaiaService[];
|
|
||||||
|
|
||||||
const checkedOut: DaiaService = {
|
|
||||||
expected: '2022-09-01',
|
|
||||||
limitations: [],
|
|
||||||
service: 'loan',
|
|
||||||
};
|
|
||||||
|
|
||||||
const notYetAvailableOnBuy: DaiaService = {
|
|
||||||
limitations: [{id: 'OnBuy', content: ''}],
|
|
||||||
service: 'loan',
|
|
||||||
};
|
|
||||||
|
|
||||||
const notYetAvailableJustReturned: DaiaService = {
|
|
||||||
limitations: [{id: 'JustReturned', content: ''}],
|
|
||||||
service: 'loan',
|
|
||||||
};
|
|
||||||
|
|
||||||
const notAvailableCopyIsMissing: DaiaService = {
|
|
||||||
limitations: [{id: 'CopyIsMissing', content: ''}],
|
|
||||||
service: 'loan',
|
|
||||||
};
|
|
||||||
|
|
||||||
const notAvailableCanceled: DaiaService = {
|
|
||||||
limitations: [{id: 'Canceled', content: ''}],
|
|
||||||
service: 'loan',
|
|
||||||
};
|
|
||||||
|
|
||||||
const libraryOnlyOnlyInHouse: DaiaService = {
|
|
||||||
limitations: [{id: 'OnlyInHouse', content: ''}],
|
|
||||||
service: 'loan',
|
|
||||||
};
|
|
||||||
|
|
||||||
const libraryOnlyExternalLoan: DaiaService = {
|
|
||||||
limitations: [{id: 'ExternalLoan', content: ''}],
|
|
||||||
service: 'loan',
|
|
||||||
};
|
|
||||||
|
|
||||||
const libraryOnlyPresentation: DaiaService = {
|
|
||||||
service: 'presentation',
|
|
||||||
};
|
|
||||||
|
|
||||||
const availableLimitationsUndefined: DaiaService = {
|
|
||||||
service: 'loan',
|
|
||||||
};
|
|
||||||
|
|
||||||
const availableLimitationsEmpty: DaiaService = {
|
|
||||||
limitations: [],
|
|
||||||
service: 'loan',
|
|
||||||
};
|
|
||||||
|
|
||||||
it('should return check out', () => {
|
|
||||||
expect(daiaDataProvider.getHoldingStatus([], [checkedOut])).toEqual('checked_out');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should return not yet available', () => {
|
|
||||||
expect(daiaDataProvider.getHoldingStatus([], [notYetAvailableOnBuy])).toEqual('not_yet_available');
|
|
||||||
expect(daiaDataProvider.getHoldingStatus([], [notYetAvailableJustReturned])).toEqual(
|
|
||||||
'not_yet_available',
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should return not available', () => {
|
|
||||||
expect(daiaDataProvider.getHoldingStatus([], [notAvailableCopyIsMissing])).toEqual('not_available');
|
|
||||||
expect(daiaDataProvider.getHoldingStatus([], [notAvailableCanceled])).toEqual('not_available');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should return library only', () => {
|
|
||||||
expect(daiaDataProvider.getHoldingStatus([], [libraryOnlyOnlyInHouse])).toEqual('library_only');
|
|
||||||
expect(daiaDataProvider.getHoldingStatus([libraryOnlyExternalLoan], [])).toEqual('library_only');
|
|
||||||
expect(daiaDataProvider.getHoldingStatus([libraryOnlyPresentation], [])).toEqual('library_only');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should return available', () => {
|
|
||||||
expect(
|
|
||||||
daiaDataProvider.getHoldingStatus([availableLimitationsUndefined, libraryOnlyPresentation], []),
|
|
||||||
).toEqual('available');
|
|
||||||
expect(
|
|
||||||
daiaDataProvider.getHoldingStatus([availableLimitationsEmpty, libraryOnlyPresentation], []),
|
|
||||||
).toEqual('available');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should return unknown otherwise', () => {
|
|
||||||
const withoutLoan: DaiaService = {
|
|
||||||
limitations: [],
|
|
||||||
service: 'anything else',
|
|
||||||
};
|
|
||||||
|
|
||||||
expect(daiaDataProvider.getHoldingStatus([withoutLoan], [])).toEqual('unknown');
|
|
||||||
expect(daiaDataProvider.getHoldingStatus([], [withoutLoan])).toEqual('unknown');
|
|
||||||
expect(daiaDataProvider.getHoldingStatus([], [availableLimitationsUndefined])).toEqual('unknown');
|
|
||||||
expect(daiaDataProvider.getHoldingStatus([], [availableLimitationsEmpty])).toEqual('unknown');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,231 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2023 StApps
|
|
||||||
* This program is free software: you can redistribute it and/or modify it
|
|
||||||
* under the terms of the GNU General Public License as published by the Free
|
|
||||||
* Software Foundation, version 3.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
||||||
* more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along with
|
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
import {Injectable} from '@angular/core';
|
|
||||||
import {DaiaAvailabilityResponse, DaiaHolding, DaiaService} from './protocol/response';
|
|
||||||
import {StorageProvider} from '../storage/storage.provider';
|
|
||||||
import {HttpClient, HttpHeaders} from '@angular/common/http';
|
|
||||||
import {ConfigProvider} from '../config/config.provider';
|
|
||||||
import {SCFeatureConfiguration} from '@openstapps/core';
|
|
||||||
import {NGXLogger} from 'ngx-logger';
|
|
||||||
import {TranslateService} from '@ngx-translate/core';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Generated class for the DataProvider provider.
|
|
||||||
*
|
|
||||||
* See https://angular.io/guide/dependency-injection for more info on providers
|
|
||||||
* and Angular DI.
|
|
||||||
*/
|
|
||||||
@Injectable({
|
|
||||||
providedIn: 'root',
|
|
||||||
})
|
|
||||||
export class DaiaDataProvider {
|
|
||||||
/**
|
|
||||||
* TODO
|
|
||||||
*/
|
|
||||||
storageProvider: StorageProvider;
|
|
||||||
|
|
||||||
httpClient: HttpClient;
|
|
||||||
|
|
||||||
daiaServiceUrl?: string;
|
|
||||||
|
|
||||||
hebisProxyUrl?: string;
|
|
||||||
|
|
||||||
clientHeaders = new HttpHeaders();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* TODO
|
|
||||||
* @param storageProvider TODO
|
|
||||||
* @param httpClient TODO
|
|
||||||
* @param configProvider TODO
|
|
||||||
* @param logger TODO
|
|
||||||
* @param translateService TODO
|
|
||||||
*/
|
|
||||||
constructor(
|
|
||||||
storageProvider: StorageProvider,
|
|
||||||
httpClient: HttpClient,
|
|
||||||
private configProvider: ConfigProvider,
|
|
||||||
private readonly logger: NGXLogger,
|
|
||||||
private translateService: TranslateService,
|
|
||||||
) {
|
|
||||||
this.storageProvider = storageProvider;
|
|
||||||
this.httpClient = httpClient;
|
|
||||||
this.clientHeaders = this.clientHeaders.set('Content-Type', 'application/json');
|
|
||||||
}
|
|
||||||
|
|
||||||
async getAvailability(id: string): Promise<DaiaHolding[] | undefined> {
|
|
||||||
if (this.daiaServiceUrl === undefined) {
|
|
||||||
try {
|
|
||||||
const features = this.configProvider.getValue('features') as SCFeatureConfiguration;
|
|
||||||
if (features.extern?.daia?.url) {
|
|
||||||
this.daiaServiceUrl = features.extern?.daia?.url;
|
|
||||||
} else {
|
|
||||||
this.logger.error('Daia service url undefined');
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
if (features.extern?.hebisProxy?.url) {
|
|
||||||
this.hebisProxyUrl = features.extern?.hebisProxy?.url;
|
|
||||||
} else {
|
|
||||||
this.logger.error('HeBIS proxy url undefined');
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
this.logger.error(error);
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return new Promise(resolve =>
|
|
||||||
this.httpClient
|
|
||||||
.get<DaiaAvailabilityResponse>(this.daiaServiceUrl as string, {
|
|
||||||
params: {id, lang: this.translateService.currentLang},
|
|
||||||
})
|
|
||||||
.subscribe(
|
|
||||||
(response: DaiaAvailabilityResponse) => {
|
|
||||||
const holdings: DaiaHolding[] = [];
|
|
||||||
if (response && Array.isArray(response.document)) {
|
|
||||||
response.document.map(document => {
|
|
||||||
Array.isArray(document.item) &&
|
|
||||||
document.item.map(element => {
|
|
||||||
try {
|
|
||||||
const {
|
|
||||||
department: {id: departmentId, content: departmentLabel, href: departmentLink} = {
|
|
||||||
id: 'noDep',
|
|
||||||
content: '',
|
|
||||||
href: '',
|
|
||||||
},
|
|
||||||
label,
|
|
||||||
about,
|
|
||||||
available,
|
|
||||||
storage,
|
|
||||||
chronology,
|
|
||||||
unavailable,
|
|
||||||
} = element;
|
|
||||||
const holdingStatus = this.holdingHasStatus(available || [])
|
|
||||||
? this.getHoldingStatus(available || [], unavailable || [])
|
|
||||||
: undefined;
|
|
||||||
|
|
||||||
const dueDate =
|
|
||||||
holdingStatus === 'checked_out'
|
|
||||||
? (unavailable.find(item => item.service === 'loan') as DaiaService).expected
|
|
||||||
: undefined;
|
|
||||||
|
|
||||||
holdings.push({
|
|
||||||
id: element.id,
|
|
||||||
department: {
|
|
||||||
id: departmentId,
|
|
||||||
content: departmentLabel,
|
|
||||||
href: departmentLink,
|
|
||||||
},
|
|
||||||
signature: label,
|
|
||||||
status: holdingStatus,
|
|
||||||
dueDate: dueDate,
|
|
||||||
online: Array.isArray(available) && available.some(item => item.service === 'remote'),
|
|
||||||
available:
|
|
||||||
(Array.isArray(available) &&
|
|
||||||
available.find(item =>
|
|
||||||
['openaccess', 'loan', 'presentation'].includes(item.service),
|
|
||||||
)) ||
|
|
||||||
undefined,
|
|
||||||
unavailable:
|
|
||||||
(Array.isArray(unavailable) && unavailable.find(item => item.service === 'loan')) ||
|
|
||||||
undefined,
|
|
||||||
storage,
|
|
||||||
about,
|
|
||||||
holdings: chronology?.about,
|
|
||||||
open:
|
|
||||||
(Array.isArray(available) &&
|
|
||||||
available.some(item => item.service === 'openaccess')) ||
|
|
||||||
undefined,
|
|
||||||
});
|
|
||||||
} catch {
|
|
||||||
// No element available
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
resolve(holdings);
|
|
||||||
},
|
|
||||||
error => {
|
|
||||||
// handle "availability info not found" separately from the problems with getting the info
|
|
||||||
if (error.status === 404) resolve([]);
|
|
||||||
// eslint-disable-next-line unicorn/no-useless-undefined
|
|
||||||
resolve(undefined);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
getHoldingLink(holding: DaiaHolding, open = false) {
|
|
||||||
if (this.hebisProxyUrl === undefined) {
|
|
||||||
this.logger.error('HeBIS proxy url undefined');
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const resourceLink = holding.available?.href;
|
|
||||||
return open ? resourceLink : `${this.hebisProxyUrl}${encodeURIComponent(resourceLink as string)}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
holdingHasStatus(available: DaiaService[]): boolean {
|
|
||||||
return !available.some(item => item.service === 'remote');
|
|
||||||
}
|
|
||||||
|
|
||||||
getHoldingStatus(available: DaiaService[], unavailable: DaiaService[]): DaiaHolding['status'] {
|
|
||||||
const loan: {available: number; unavailable: number} = {
|
|
||||||
available: available.findIndex(item => item.service === 'loan'),
|
|
||||||
unavailable: unavailable.findIndex(item => item.service === 'loan'),
|
|
||||||
};
|
|
||||||
const presentation: {available: number; unavailable: number} = {
|
|
||||||
available: available.findIndex(item => item.service === 'presentation'),
|
|
||||||
unavailable: unavailable.findIndex(item => item.service === 'presentation'),
|
|
||||||
};
|
|
||||||
|
|
||||||
if (loan.unavailable !== -1 && unavailable[loan.unavailable].expected !== undefined) {
|
|
||||||
return 'checked_out';
|
|
||||||
}
|
|
||||||
|
|
||||||
if (
|
|
||||||
loan.unavailable !== -1 &&
|
|
||||||
unavailable[loan.unavailable].limitations?.some(limitation =>
|
|
||||||
['OnBuy', 'JustReturned'].includes(limitation.id),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
return 'not_yet_available';
|
|
||||||
|
|
||||||
if (
|
|
||||||
loan.unavailable !== -1 &&
|
|
||||||
unavailable[loan.unavailable].limitations?.some(limitation =>
|
|
||||||
['CopyIsMissing', 'Canceled'].includes(limitation.id),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
return 'not_available';
|
|
||||||
|
|
||||||
if (
|
|
||||||
(loan.unavailable !== -1 &&
|
|
||||||
unavailable[loan.unavailable].limitations?.some(limitation =>
|
|
||||||
['OnlyInHouse'].includes(limitation.id),
|
|
||||||
)) ||
|
|
||||||
(loan.available !== -1 &&
|
|
||||||
available[loan.available].limitations?.some(limitation =>
|
|
||||||
['ExternalLoan'].includes(limitation.id),
|
|
||||||
)) ||
|
|
||||||
(loan.available === -1 && presentation.available !== -1 && presentation.unavailable === -1)
|
|
||||||
)
|
|
||||||
return 'library_only';
|
|
||||||
|
|
||||||
if (loan.available !== -1) return 'available';
|
|
||||||
|
|
||||||
return 'unknown';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,114 +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 {Injectable} from '@angular/core';
|
|
||||||
import {Client} from '@openstapps/api';
|
|
||||||
import {SCHebisSearchRequest} from './protocol/request';
|
|
||||||
import {HebisSearchResponse} from './protocol/response';
|
|
||||||
import {StorageProvider} from '../storage/storage.provider';
|
|
||||||
import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
|
|
||||||
import {HttpClient} from '@angular/common/http';
|
|
||||||
import {DataProvider} from '../data/data.provider';
|
|
||||||
import {SCHebisSearchRoute} from './protocol/route';
|
|
||||||
import {SCSearchRequest, SCSearchResponse} from '@openstapps/core';
|
|
||||||
|
|
||||||
const HEBIS_PREFIX = 'HEB';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Generated class for the DataProvider provider.
|
|
||||||
*
|
|
||||||
* See https://angular.io/guide/dependency-injection for more info on providers
|
|
||||||
* and Angular DI.
|
|
||||||
*/
|
|
||||||
@Injectable({
|
|
||||||
providedIn: 'root',
|
|
||||||
})
|
|
||||||
export class HebisDataProvider extends DataProvider {
|
|
||||||
/**
|
|
||||||
* TODO
|
|
||||||
*/
|
|
||||||
storageProvider: StorageProvider;
|
|
||||||
|
|
||||||
httpClient: HttpClient;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Instance of hebis search request route
|
|
||||||
*/
|
|
||||||
private readonly hebisSearchRoute = new SCHebisSearchRoute();
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
stAppsWebHttpClient: StAppsWebHttpClient,
|
|
||||||
storageProvider: StorageProvider,
|
|
||||||
httpClient: HttpClient,
|
|
||||||
) {
|
|
||||||
super(stAppsWebHttpClient, storageProvider);
|
|
||||||
this.storageProvider = storageProvider;
|
|
||||||
this.httpClient = httpClient;
|
|
||||||
this.client = new Client(stAppsWebHttpClient, this.backendUrl, this.appVersion);
|
|
||||||
}
|
|
||||||
|
|
||||||
override async search(query: SCSearchRequest): Promise<SCSearchResponse> {
|
|
||||||
const response = await this.hebisSearch({
|
|
||||||
query: query.query ?? '',
|
|
||||||
page: query.from,
|
|
||||||
});
|
|
||||||
console.log(response.pagination);
|
|
||||||
|
|
||||||
return {
|
|
||||||
data: response.data,
|
|
||||||
facets: [],
|
|
||||||
pagination: response.pagination,
|
|
||||||
stats: {
|
|
||||||
time: Number.NaN,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send a search request to the backend
|
|
||||||
*
|
|
||||||
* All results will be returned if no size is set in the request.
|
|
||||||
* @param searchRequest Search request
|
|
||||||
* @param options Search options
|
|
||||||
* @param options.addPrefix Add HeBIS prefix (useful when having only an ID, e.g. when using PAIA)
|
|
||||||
*/
|
|
||||||
async hebisSearch(
|
|
||||||
searchRequest: SCHebisSearchRequest,
|
|
||||||
options?: {addPrefix: boolean},
|
|
||||||
): Promise<HebisSearchResponse> {
|
|
||||||
if (options?.addPrefix) {
|
|
||||||
searchRequest.query = [HEBIS_PREFIX, searchRequest.query].join('');
|
|
||||||
}
|
|
||||||
|
|
||||||
let page: number | undefined = searchRequest.page;
|
|
||||||
|
|
||||||
if (page === undefined) {
|
|
||||||
const preFlightResponse = await this.client.invokeRoute<HebisSearchResponse>(
|
|
||||||
this.hebisSearchRoute,
|
|
||||||
undefined,
|
|
||||||
{
|
|
||||||
...searchRequest,
|
|
||||||
page: 0,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
page = preFlightResponse.pagination.total;
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.client.invokeRoute<HebisSearchResponse>(this.hebisSearchRoute, undefined, {
|
|
||||||
...searchRequest,
|
|
||||||
page,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2019 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 {Component, Input} from '@angular/core';
|
|
||||||
import {SCThings} from '@openstapps/core';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* TODO
|
|
||||||
*/
|
|
||||||
@Component({
|
|
||||||
selector: 'stapps-hebis-detail-content',
|
|
||||||
styleUrls: ['hebis-detail-content.scss'],
|
|
||||||
templateUrl: 'hebis-detail-content.html',
|
|
||||||
})
|
|
||||||
export class HebisDetailContentComponent {
|
|
||||||
/**
|
|
||||||
* TODO
|
|
||||||
*/
|
|
||||||
@Input() item: SCThings;
|
|
||||||
}
|
|
||||||
@@ -1,51 +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/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<div>
|
|
||||||
@switch (item.type) {
|
|
||||||
@case ('book') {
|
|
||||||
<stapps-book-detail-content [item]="$any(item)"></stapps-book-detail-content>
|
|
||||||
}
|
|
||||||
@case ('periodical') {
|
|
||||||
<stapps-periodical-detail-content [item]="$any(item)"></stapps-periodical-detail-content>
|
|
||||||
}
|
|
||||||
@case ('article') {
|
|
||||||
<stapps-article-detail-content [item]="$any(item)"></stapps-article-detail-content>
|
|
||||||
}
|
|
||||||
@default {
|
|
||||||
<ion-item class="ion-text-wrap" lines="inset">
|
|
||||||
<ion-thumbnail slot="start" class="ion-margin-end">
|
|
||||||
<ion-icon color="dark" [name]="item.type | dataIcon"></ion-icon>
|
|
||||||
</ion-thumbnail>
|
|
||||||
<ion-grid>
|
|
||||||
<ion-row>
|
|
||||||
<ion-col>
|
|
||||||
<div class="ion-text-wrap">
|
|
||||||
<h2 class="name">{{ item.name }}</h2>
|
|
||||||
<ion-note>{{ item.type }}</ion-note>
|
|
||||||
</div>
|
|
||||||
</ion-col>
|
|
||||||
</ion-row>
|
|
||||||
</ion-grid>
|
|
||||||
</ion-item>
|
|
||||||
@if (item.description) {
|
|
||||||
<stapps-simple-card
|
|
||||||
[title]="'description' | propertyNameTranslate: item | titlecase"
|
|
||||||
[content]="'description' | thingTranslate: item"
|
|
||||||
></stapps-simple-card>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
@@ -1,50 +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/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
:host ::ng-deep {
|
|
||||||
ion-grid,
|
|
||||||
ion-col {
|
|
||||||
padding-top: 0;
|
|
||||||
padding-bottom: 0;
|
|
||||||
padding-inline-start: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
ion-card {
|
|
||||||
margin: 0;
|
|
||||||
box-shadow: none;
|
|
||||||
|
|
||||||
ion-card-content {
|
|
||||||
padding-bottom: 8px;
|
|
||||||
|
|
||||||
h1 {
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ion-card-header {
|
|
||||||
padding-top: 8px;
|
|
||||||
padding-bottom: 4px;
|
|
||||||
font-weight: bold;
|
|
||||||
color: var(--ion-color-dark);
|
|
||||||
}
|
|
||||||
|
|
||||||
ion-grid,
|
|
||||||
ion-col {
|
|
||||||
padding-top: 0;
|
|
||||||
padding-bottom: 0;
|
|
||||||
padding-inline-start: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,114 +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/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* eslint-disable @typescript-eslint/no-non-null-assertion,@typescript-eslint/no-explicit-any */
|
|
||||||
/* eslint-disable @typescript-eslint/no-non-null-assertion,@typescript-eslint/no-explicit-any */
|
|
||||||
import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
|
|
||||||
import {ComponentFixture, TestBed} from '@angular/core/testing';
|
|
||||||
import {ActivatedRoute, RouterModule} from '@angular/router';
|
|
||||||
import {TranslateLoader, TranslateModule, TranslateService} from '@ngx-translate/core';
|
|
||||||
import {sampleThingsMap} from '../../../_helpers/data/sample-things';
|
|
||||||
import {HebisRoutingModule} from '../hebis-routing.module';
|
|
||||||
import {HebisModule} from '../hebis.module';
|
|
||||||
import {HebisDataProvider} from '../hebis-data.provider';
|
|
||||||
import {HebisDetailComponent} from './hebis-detail.component';
|
|
||||||
import {Observable, of} from 'rxjs';
|
|
||||||
import {StorageProvider} from '../../storage/storage.provider';
|
|
||||||
import {LoggerModule, NgxLoggerLevel} from 'ngx-logger';
|
|
||||||
import {IonIconDirective} from '../../../util/ion-icon/ion-icon.directive';
|
|
||||||
import {provideIonicAngular} from '@ionic/angular/standalone';
|
|
||||||
|
|
||||||
const translations: any = {data: {detail: {TITLE: 'Foo'}}};
|
|
||||||
|
|
||||||
class TranslateFakeLoader implements TranslateLoader {
|
|
||||||
getTranslation(_lang: string): Observable<any> {
|
|
||||||
return of(translations);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('HebisDetailComponent', () => {
|
|
||||||
let comp: HebisDetailComponent;
|
|
||||||
let fixture: ComponentFixture<HebisDetailComponent>;
|
|
||||||
let dataProvider: HebisDataProvider;
|
|
||||||
const sampleThing = sampleThingsMap.book[0];
|
|
||||||
let translateService: TranslateService;
|
|
||||||
|
|
||||||
// @Component({ selector: 'stapps-data-list-item', template: '' })
|
|
||||||
// class DataListItemComponent {
|
|
||||||
// @Input() item;
|
|
||||||
// }
|
|
||||||
|
|
||||||
const fakeActivatedRoute = {
|
|
||||||
snapshot: {
|
|
||||||
paramMap: {
|
|
||||||
get: () => {
|
|
||||||
return sampleThing.uid;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
const storageProviderSpy = jasmine.createSpyObj('StorageProvider', ['init', 'get', 'has', 'put', 'search']);
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
TestBed.configureTestingModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forRoot([]),
|
|
||||||
HebisRoutingModule,
|
|
||||||
HebisModule,
|
|
||||||
IonIconDirective,
|
|
||||||
TranslateModule.forRoot({
|
|
||||||
loader: {provide: TranslateLoader, useClass: TranslateFakeLoader},
|
|
||||||
}),
|
|
||||||
LoggerModule.forRoot({level: NgxLoggerLevel.TRACE}),
|
|
||||||
],
|
|
||||||
providers: [
|
|
||||||
provideIonicAngular(),
|
|
||||||
{
|
|
||||||
provide: ActivatedRoute,
|
|
||||||
useValue: fakeActivatedRoute,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
provide: StorageProvider,
|
|
||||||
useValue: storageProviderSpy,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
schemas: [CUSTOM_ELEMENTS_SCHEMA],
|
|
||||||
}).compileComponents();
|
|
||||||
});
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
dataProvider = TestBed.inject(HebisDataProvider);
|
|
||||||
translateService = TestBed.inject(TranslateService);
|
|
||||||
spyOn(dataProvider, 'get' as any).and.returnValue(Promise.resolve(sampleThing));
|
|
||||||
spyOn(HebisDetailComponent.prototype, 'getItem').and.callThrough();
|
|
||||||
fixture = TestBed.createComponent(HebisDetailComponent);
|
|
||||||
comp = fixture.componentInstance;
|
|
||||||
translateService.use('foo');
|
|
||||||
fixture.detectChanges();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should create component', () => expect(comp).toBeDefined());
|
|
||||||
|
|
||||||
it('should get a data item', () => {
|
|
||||||
comp.getItem(sampleThing.uid, false);
|
|
||||||
expect(HebisDetailComponent.prototype.getItem).toHaveBeenCalledWith(sampleThing.uid, false);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should get a data item when initialized', () => {
|
|
||||||
comp.ngOnInit();
|
|
||||||
expect(HebisDetailComponent.prototype.getItem).toHaveBeenCalledWith(sampleThing.uid, false);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,55 +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 {Component, inject, OnInit} from '@angular/core';
|
|
||||||
import {SCUuid} from '@openstapps/core';
|
|
||||||
import {HebisDataProvider} from '../hebis-data.provider';
|
|
||||||
import {DataDetailComponent} from '../../data/detail/data-detail.component';
|
|
||||||
import {DaiaHolding} from '../protocol/response';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A Component to display an SCThing detailed
|
|
||||||
*/
|
|
||||||
@Component({
|
|
||||||
selector: 'stapps-hebis-detail',
|
|
||||||
styleUrls: ['hebis-detail.scss'],
|
|
||||||
templateUrl: 'hebis-detail.html',
|
|
||||||
})
|
|
||||||
export class HebisDetailComponent extends DataDetailComponent implements OnInit {
|
|
||||||
holdings: DaiaHolding[];
|
|
||||||
|
|
||||||
private hebisDataProvider = inject(HebisDataProvider);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @override
|
|
||||||
*/
|
|
||||||
async ngOnInit() {
|
|
||||||
const uid = this.route.snapshot.paramMap.get('uid') || '';
|
|
||||||
await this.getItem(uid ?? '', false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Provides data item with given UID
|
|
||||||
* @param uid Unique identifier of a thing
|
|
||||||
* @param _forceReload Ignore any cached data
|
|
||||||
*/
|
|
||||||
async getItem(uid: SCUuid, _forceReload: boolean) {
|
|
||||||
this.item = await (this.inputItem ??
|
|
||||||
this.hebisDataProvider.hebisSearch({query: uid, page: 0}).then(
|
|
||||||
result =>
|
|
||||||
// eslint-disable-next-line unicorn/no-null
|
|
||||||
(result.data && result.data[0]) || null,
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,58 +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/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<ion-header>
|
|
||||||
<ion-toolbar color="primary" mode="ios">
|
|
||||||
<ion-buttons slot="start">
|
|
||||||
<ion-back-button></ion-back-button>
|
|
||||||
</ion-buttons>
|
|
||||||
<ion-title>{{ 'data.detail.TITLE' | translate }}</ion-title>
|
|
||||||
<ion-buttons slot="primary">
|
|
||||||
@if (item) {
|
|
||||||
<stapps-favorite-button [item]="$any(item)"></stapps-favorite-button>
|
|
||||||
}
|
|
||||||
</ion-buttons>
|
|
||||||
</ion-toolbar>
|
|
||||||
</ion-header>
|
|
||||||
<ion-content class="ion-no-padding">
|
|
||||||
<div>
|
|
||||||
@switch (true) {
|
|
||||||
@case (!item && (isDisconnected | async)) {
|
|
||||||
<div class="centered-message-container">
|
|
||||||
<ion-icon name="signal_disconnected"></ion-icon>
|
|
||||||
<ion-label> {{ 'data.detail.COULD_NOT_CONNECT' | translate }} </ion-label>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
@case (item === null) {
|
|
||||||
<div class="centered-message-container">
|
|
||||||
<ion-icon name="link_off"></ion-icon>
|
|
||||||
<ion-label> {{ 'data.detail.NOT_FOUND' | translate }} </ion-label>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
@case (!item && item !== null) {
|
|
||||||
<stapps-skeleton-list-item></stapps-skeleton-list-item>
|
|
||||||
<stapps-skeleton-simple-card></stapps-skeleton-simple-card>
|
|
||||||
}
|
|
||||||
@default {
|
|
||||||
@if (item) {
|
|
||||||
<stapps-hebis-detail-content [item]="item"></stapps-hebis-detail-content>
|
|
||||||
}
|
|
||||||
@if (item) {
|
|
||||||
<stapps-daia-availability></stapps-daia-availability>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
</ion-content>
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
::ng-deep {
|
|
||||||
ion-card-header {
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,32 +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 {NgModule} from '@angular/core';
|
|
||||||
import {RouterModule, Routes} from '@angular/router';
|
|
||||||
import {HebisDetailComponent} from './hebis-detail/hebis-detail.component';
|
|
||||||
import {HebisSearchPageComponent} from './list/hebis-search-page.component';
|
|
||||||
|
|
||||||
const hebisRoutes: Routes = [
|
|
||||||
{path: 'hebis-search', component: HebisSearchPageComponent},
|
|
||||||
{path: 'hebis-detail/:uid', component: HebisDetailComponent},
|
|
||||||
];
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Module defining routes for data module
|
|
||||||
*/
|
|
||||||
@NgModule({
|
|
||||||
exports: [RouterModule],
|
|
||||||
imports: [RouterModule.forChild(hebisRoutes)],
|
|
||||||
})
|
|
||||||
export class HebisRoutingModule {}
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2022 StApps
|
|
||||||
* This program is free software: you can redistribute it and/or modify it
|
|
||||||
* under the terms of the GNU General Public License as published by the Free
|
|
||||||
* Software Foundation, version 3.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
||||||
* more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along with
|
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import {Injectable} from '@angular/core';
|
|
||||||
|
|
||||||
@Injectable({
|
|
||||||
providedIn: 'root',
|
|
||||||
})
|
|
||||||
export class HebisSearchProvider {}
|
|
||||||
@@ -1,112 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2018-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 {ScrollingModule} from '@angular/cdk/scrolling';
|
|
||||||
import {CommonModule} from '@angular/common';
|
|
||||||
import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
|
|
||||||
import {NgModule} from '@angular/core';
|
|
||||||
import {FormsModule} from '@angular/forms';
|
|
||||||
import {TranslateModule} from '@ngx-translate/core';
|
|
||||||
import {MarkdownModule} from 'ngx-markdown';
|
|
||||||
import {MomentModule} from 'ngx-moment';
|
|
||||||
import {ThingTranslateModule} from '../../translation/thing-translate.module';
|
|
||||||
import {MenuModule} from '../menu/menu.module';
|
|
||||||
import {StorageModule} from '../storage/storage.module';
|
|
||||||
import {HebisDetailComponent} from './hebis-detail/hebis-detail.component';
|
|
||||||
import {HebisDetailContentComponent} from './hebis-detail/hebis-detail-content.component';
|
|
||||||
import {HebisSearchPageComponent} from './list/hebis-search-page.component';
|
|
||||||
import {HebisDataProvider} from './hebis-data.provider';
|
|
||||||
import {DaiaDataProvider} from './daia-data.provider';
|
|
||||||
import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
|
|
||||||
import {HebisRoutingModule} from './hebis-routing.module';
|
|
||||||
import {DataModule} from '../data/data.module';
|
|
||||||
import {DaiaAvailabilityComponent} from './daia-availability/daia-availability.component';
|
|
||||||
import {UtilModule} from '../../util/util.module';
|
|
||||||
import {DaiaHoldingComponent} from './daia-availability/daia-holding.component';
|
|
||||||
import {
|
|
||||||
IonBackButton,
|
|
||||||
IonButton,
|
|
||||||
IonButtons,
|
|
||||||
IonCard,
|
|
||||||
IonCardContent,
|
|
||||||
IonCardHeader,
|
|
||||||
IonCol,
|
|
||||||
IonContent,
|
|
||||||
IonGrid,
|
|
||||||
IonHeader,
|
|
||||||
IonItem,
|
|
||||||
IonLabel,
|
|
||||||
IonNote,
|
|
||||||
IonRow,
|
|
||||||
IonThumbnail,
|
|
||||||
IonTitle,
|
|
||||||
IonToolbar,
|
|
||||||
} from '@ionic/angular/standalone';
|
|
||||||
import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Module for handling data
|
|
||||||
*/
|
|
||||||
@NgModule({
|
|
||||||
declarations: [
|
|
||||||
HebisSearchPageComponent,
|
|
||||||
HebisDetailComponent,
|
|
||||||
HebisDetailContentComponent,
|
|
||||||
DaiaAvailabilityComponent,
|
|
||||||
DaiaHoldingComponent,
|
|
||||||
],
|
|
||||||
imports: [
|
|
||||||
CommonModule,
|
|
||||||
DataModule,
|
|
||||||
FormsModule,
|
|
||||||
HebisRoutingModule,
|
|
||||||
IonIconDirective,
|
|
||||||
MarkdownModule.forRoot(),
|
|
||||||
MenuModule,
|
|
||||||
MomentModule.forRoot({
|
|
||||||
relativeTimeThresholdOptions: {
|
|
||||||
m: 59,
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
ScrollingModule,
|
|
||||||
StorageModule,
|
|
||||||
TranslateModule.forChild(),
|
|
||||||
ThingTranslateModule.forChild(),
|
|
||||||
UtilModule,
|
|
||||||
IonBackButton,
|
|
||||||
IonLabel,
|
|
||||||
IonButton,
|
|
||||||
IonContent,
|
|
||||||
IonButtons,
|
|
||||||
IonTitle,
|
|
||||||
IonToolbar,
|
|
||||||
IonNote,
|
|
||||||
IonHeader,
|
|
||||||
IonGrid,
|
|
||||||
IonRow,
|
|
||||||
IonCol,
|
|
||||||
IonCard,
|
|
||||||
IonCardContent,
|
|
||||||
IonCardHeader,
|
|
||||||
IonItem,
|
|
||||||
IonThumbnail,
|
|
||||||
],
|
|
||||||
providers: [
|
|
||||||
HebisDataProvider,
|
|
||||||
DaiaDataProvider,
|
|
||||||
StAppsWebHttpClient,
|
|
||||||
provideHttpClient(withInterceptorsFromDi()),
|
|
||||||
],
|
|
||||||
})
|
|
||||||
export class HebisModule {}
|
|
||||||
@@ -1,43 +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 {Component} from '@angular/core';
|
|
||||||
import {HebisDataProvider} from '../hebis-data.provider';
|
|
||||||
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
|
||||||
import {DataProvider} from '../../data/data.provider';
|
|
||||||
import {DataRoutingService} from '../../data/data-routing.service';
|
|
||||||
import {Router} from '@angular/router';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* HebisSearchPageComponent queries things and shows list of things as search results and filter as context menu
|
|
||||||
*/
|
|
||||||
@Component({
|
|
||||||
selector: 'stapps-hebissearch-page',
|
|
||||||
templateUrl: 'hebis-search-page.html',
|
|
||||||
styleUrls: ['../../data/list/search-page.scss'],
|
|
||||||
providers: [{provide: DataProvider, useClass: HebisDataProvider}],
|
|
||||||
})
|
|
||||||
export class HebisSearchPageComponent {
|
|
||||||
constructor(dataRoutingService: DataRoutingService, router: Router) {
|
|
||||||
dataRoutingService
|
|
||||||
.itemSelectListener()
|
|
||||||
.pipe(takeUntilDestroyed())
|
|
||||||
.subscribe(async item => {
|
|
||||||
void router.navigate(
|
|
||||||
['hebis-detail', (item.origin && 'originalId' in item.origin && item.origin['originalId']) || ''],
|
|
||||||
{state: {item}},
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,25 +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/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<stapps-search-page
|
|
||||||
[placeholder]="'hebisSearch.search_bar.placeholder' | translate"
|
|
||||||
[title]="'hebisSearch.title' | translate"
|
|
||||||
[searchInstruction]="'hebisSearch.instruction' | translate"
|
|
||||||
[itemRouting]="false"
|
|
||||||
[showContextMenu]="false"
|
|
||||||
[pageSize]="1"
|
|
||||||
[navigation]="[{label: 'search.type', routerLink: ['/search']}, {label: 'hebisSearch.type'}]"
|
|
||||||
>
|
|
||||||
</stapps-search-page>
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
import {SCLicensePlate} from '@openstapps/core';
|
|
||||||
|
|
||||||
export interface SCHebisSearchRequest {
|
|
||||||
/**
|
|
||||||
* HDS2 will supply results for the speficied insitute / university if available (Defaults to f-u)
|
|
||||||
*/
|
|
||||||
institute?: SCLicensePlate;
|
|
||||||
/**
|
|
||||||
* Simple pagination support (Defaults to 0)
|
|
||||||
*/
|
|
||||||
page?: number;
|
|
||||||
/**
|
|
||||||
* Search query for HDS
|
|
||||||
*/
|
|
||||||
query: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface SCDaiaAvailabilityRequest {
|
|
||||||
id: string;
|
|
||||||
}
|
|
||||||
@@ -1,77 +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 {SCArticle, SCBook, SCPeriodical, SCSearchResultPagination} from '@openstapps/core';
|
|
||||||
|
|
||||||
export interface HebisSearchResponse {
|
|
||||||
/**
|
|
||||||
* Response Array of SCBook type or Object
|
|
||||||
*/
|
|
||||||
data: Array<SCBook | SCArticle | SCPeriodical>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Pagination information
|
|
||||||
*/
|
|
||||||
pagination: SCSearchResultPagination;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface DaiaAvailabilityResponse {
|
|
||||||
document: Array<{
|
|
||||||
item: Array<{
|
|
||||||
id: string;
|
|
||||||
label: string;
|
|
||||||
chronology?: {
|
|
||||||
about?: string;
|
|
||||||
};
|
|
||||||
department: DaiaSimpleContent;
|
|
||||||
available: DaiaService[];
|
|
||||||
unavailable: DaiaService[];
|
|
||||||
debugInfo: string;
|
|
||||||
about?: string;
|
|
||||||
storage?: DaiaSimpleContent;
|
|
||||||
}>;
|
|
||||||
}>;
|
|
||||||
institution: DaiaSimpleContent;
|
|
||||||
timestamp: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface DaiaSimpleContent {
|
|
||||||
id: string;
|
|
||||||
content: string;
|
|
||||||
href?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface DaiaService {
|
|
||||||
delay?: string;
|
|
||||||
href?: string;
|
|
||||||
service: string;
|
|
||||||
expected?: string;
|
|
||||||
limitations?: DaiaSimpleContent[];
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface DaiaHolding {
|
|
||||||
id: string;
|
|
||||||
department: DaiaSimpleContent;
|
|
||||||
signature: string;
|
|
||||||
storage?: DaiaSimpleContent;
|
|
||||||
available?: DaiaService;
|
|
||||||
unavailable?: DaiaService;
|
|
||||||
about?: string;
|
|
||||||
online: boolean;
|
|
||||||
open?: boolean;
|
|
||||||
dueDate?: string;
|
|
||||||
holdings?: string;
|
|
||||||
status?: 'checked_out' | 'not_yet_available' | 'not_available' | 'library_only' | 'available' | 'unknown';
|
|
||||||
}
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
import {
|
|
||||||
SCAbstractRoute,
|
|
||||||
SCRouteHttpVerbs,
|
|
||||||
SCInternalServerErrorResponse,
|
|
||||||
SCMethodNotAllowedErrorResponse,
|
|
||||||
SCRequestBodyTooLargeErrorResponse,
|
|
||||||
SCSyntaxErrorResponse,
|
|
||||||
SCUnsupportedMediaTypeErrorResponse,
|
|
||||||
SCValidationErrorResponse,
|
|
||||||
} from '@openstapps/core';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Route for searching things
|
|
||||||
*/
|
|
||||||
export class SCHebisSearchRoute extends SCAbstractRoute {
|
|
||||||
constructor() {
|
|
||||||
super();
|
|
||||||
this.errorNames = [
|
|
||||||
SCInternalServerErrorResponse,
|
|
||||||
SCMethodNotAllowedErrorResponse,
|
|
||||||
SCRequestBodyTooLargeErrorResponse,
|
|
||||||
SCSyntaxErrorResponse,
|
|
||||||
SCUnsupportedMediaTypeErrorResponse,
|
|
||||||
SCValidationErrorResponse,
|
|
||||||
];
|
|
||||||
this.method = SCRouteHttpVerbs.POST;
|
|
||||||
this.requestBodyName = 'SCHebisSearchRequest';
|
|
||||||
this.responseBodyName = 'SCHebisSearchResponse';
|
|
||||||
this.statusCodeSuccess = 200;
|
|
||||||
this.urlPath = '/hebissearch';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Route for availability
|
|
||||||
*/
|
|
||||||
export class SCDaiaRoute extends SCAbstractRoute {
|
|
||||||
constructor() {
|
|
||||||
super();
|
|
||||||
this.errorNames = [
|
|
||||||
SCInternalServerErrorResponse,
|
|
||||||
SCMethodNotAllowedErrorResponse,
|
|
||||||
SCRequestBodyTooLargeErrorResponse,
|
|
||||||
SCSyntaxErrorResponse,
|
|
||||||
SCUnsupportedMediaTypeErrorResponse,
|
|
||||||
SCValidationErrorResponse,
|
|
||||||
];
|
|
||||||
this.method = SCRouteHttpVerbs.GET;
|
|
||||||
this.requestBodyName = 'SCDaiaAvailabilityRequest';
|
|
||||||
this.responseBodyName = 'SCDaiaAvailabilityResponse';
|
|
||||||
this.statusCodeSuccess = 200;
|
|
||||||
this.urlPath = '/UB_Frankfurt';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,7 +2,6 @@
|
|||||||
[title]="'jobs.title' | translate"
|
[title]="'jobs.title' | translate"
|
||||||
[placeholder]="'jobs.placeholder' | translate"
|
[placeholder]="'jobs.placeholder' | translate"
|
||||||
[showDefaultData]="true"
|
[showDefaultData]="true"
|
||||||
[navigation]="[]"
|
|
||||||
[forcedFilter]="forcedFilter"
|
[forcedFilter]="forcedFilter"
|
||||||
[backUrl]="'/'"
|
[backUrl]="'/'"
|
||||||
></stapps-search-page>
|
></stapps-search-page>
|
||||||
|
|||||||
@@ -1,50 +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/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<ion-header>
|
|
||||||
<ion-toolbar color="primary" mode="ios">
|
|
||||||
<ion-buttons slot="start">
|
|
||||||
<ion-back-button></ion-back-button>
|
|
||||||
</ion-buttons>
|
|
||||||
<ion-title>{{ 'library.account.title' | translate | titlecase }}</ion-title>
|
|
||||||
</ion-toolbar>
|
|
||||||
</ion-header>
|
|
||||||
|
|
||||||
<ion-content>
|
|
||||||
@if (name) {
|
|
||||||
<p>
|
|
||||||
{{ 'library.account.greeting' | translate }} {{ name | firstLastName }}!
|
|
||||||
{{ 'library.account.login.success' | translate }}
|
|
||||||
</p>
|
|
||||||
} @else {
|
|
||||||
<p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
|
|
||||||
}
|
|
||||||
<ion-item [routerLink]="['profile']">
|
|
||||||
<ion-icon name="account_circle" slot="start"></ion-icon
|
|
||||||
>{{ 'library.account.pages.profile.title' | translate | titlecase }}
|
|
||||||
</ion-item>
|
|
||||||
<ion-item [routerLink]="['holds']">
|
|
||||||
<ion-icon name="collections_bookmark" slot="start"></ion-icon
|
|
||||||
>{{ 'library.account.pages.holds.title' | translate | titlecase }}
|
|
||||||
</ion-item>
|
|
||||||
<ion-item [routerLink]="['checked-out']">
|
|
||||||
<ion-icon name="book" slot="start"></ion-icon
|
|
||||||
>{{ 'library.account.pages.checked_out.title' | translate | titlecase }}
|
|
||||||
</ion-item>
|
|
||||||
<ion-item [routerLink]="['fines']">
|
|
||||||
<ion-icon name="request_quote" slot="start"></ion-icon
|
|
||||||
>{{ 'library.account.pages.fines.title' | translate | titlecase }}
|
|
||||||
</ion-item>
|
|
||||||
</ion-content>
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
ion-content {
|
|
||||||
--padding-start: 8px;
|
|
||||||
--padding-top: 8px;
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
import {Component} from '@angular/core';
|
|
||||||
import {LibraryAccountService} from './library-account.service';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
templateUrl: './account.page.html',
|
|
||||||
styleUrls: ['./account.page.scss'],
|
|
||||||
})
|
|
||||||
export class LibraryAccountPageComponent {
|
|
||||||
name?: string;
|
|
||||||
|
|
||||||
constructor(private readonly libraryAccountService: LibraryAccountService) {}
|
|
||||||
|
|
||||||
async ionViewWillEnter(): Promise<void> {
|
|
||||||
const patron = await this.libraryAccountService.getPatron();
|
|
||||||
this.name = patron?.name;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-51
@@ -1,51 +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 {Component} from '@angular/core';
|
|
||||||
import {DocumentAction, PAIADocument, PAIADocumentStatus} from '../../types';
|
|
||||||
import {LibraryAccountService} from '../library-account.service';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'app-checked-out',
|
|
||||||
templateUrl: './checked-out-page.html',
|
|
||||||
styleUrls: ['./checked-out-page.scss'],
|
|
||||||
})
|
|
||||||
export class CheckedOutPageComponent {
|
|
||||||
checkedOutItems?: PAIADocument[];
|
|
||||||
|
|
||||||
constructor(private readonly libraryAccountService: LibraryAccountService) {}
|
|
||||||
|
|
||||||
async ionViewWillEnter(): Promise<void> {
|
|
||||||
await this.fetchItems();
|
|
||||||
}
|
|
||||||
|
|
||||||
async onDocumentAction(documentAction: DocumentAction) {
|
|
||||||
const answer = await this.libraryAccountService.handleDocumentAction(documentAction);
|
|
||||||
|
|
||||||
if (answer) await this.fetchItems();
|
|
||||||
}
|
|
||||||
|
|
||||||
async fetchItems() {
|
|
||||||
try {
|
|
||||||
// Prepare patron (status) for the items
|
|
||||||
await this.libraryAccountService.getPatron();
|
|
||||||
this.checkedOutItems = undefined;
|
|
||||||
this.checkedOutItems = await this.libraryAccountService.getFilteredItems([PAIADocumentStatus.Held]);
|
|
||||||
} catch {
|
|
||||||
await this.libraryAccountService.handleError();
|
|
||||||
this.checkedOutItems = [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,43 +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/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<ion-header>
|
|
||||||
<ion-toolbar color="primary" mode="ios">
|
|
||||||
<ion-buttons slot="start">
|
|
||||||
<ion-back-button></ion-back-button>
|
|
||||||
</ion-buttons>
|
|
||||||
<ion-title>{{ 'library.account.pages.checked_out.title' | translate | titlecase }}</ion-title>
|
|
||||||
</ion-toolbar>
|
|
||||||
</ion-header>
|
|
||||||
|
|
||||||
<ion-content>
|
|
||||||
@if (checkedOutItems) {
|
|
||||||
@for (checkedOutItem of checkedOutItems; track checkedOutItem) {
|
|
||||||
<stapps-paia-item
|
|
||||||
[item]="checkedOutItem"
|
|
||||||
[propertiesToShow]="['label', 'renewals', 'duedate']"
|
|
||||||
(documentAction)="onDocumentAction($event)"
|
|
||||||
listName="checked_out"
|
|
||||||
>
|
|
||||||
</stapps-paia-item>
|
|
||||||
} @empty {
|
|
||||||
<ion-label class="centered-message-container">
|
|
||||||
{{ 'search.nothing_found' | translate | titlecase }}
|
|
||||||
</ion-label>
|
|
||||||
}
|
|
||||||
} @else {
|
|
||||||
<stapps-skeleton-list-item [hideThumbnail]="true"></stapps-skeleton-list-item>
|
|
||||||
}
|
|
||||||
</ion-content>
|
|
||||||
@@ -1,51 +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 {Component, Input} from '@angular/core';
|
|
||||||
import {PAIAFee} from '../../../types';
|
|
||||||
import {SCArticle, SCBook, SCPeriodical} from '@openstapps/core';
|
|
||||||
import {LibraryAccountService} from '../../library-account.service';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'stapps-fee-item',
|
|
||||||
templateUrl: './fee-item.html',
|
|
||||||
styleUrls: ['./fee-item.scss'],
|
|
||||||
})
|
|
||||||
export class FeeItemComponent {
|
|
||||||
_fee: PAIAFee;
|
|
||||||
|
|
||||||
book?: SCBook | SCPeriodical | SCArticle;
|
|
||||||
|
|
||||||
hasEdition = false;
|
|
||||||
|
|
||||||
@Input()
|
|
||||||
set fee(fee: PAIAFee) {
|
|
||||||
this.hasEdition = !fee.edition?.includes('null');
|
|
||||||
this._fee = fee;
|
|
||||||
if (this.hasEdition) {
|
|
||||||
this.libraryAccountService.getDocumentFromHDS(fee.edition as string).then(book => {
|
|
||||||
this.book = book;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
get fee() {
|
|
||||||
return this._fee;
|
|
||||||
}
|
|
||||||
|
|
||||||
propertiesToShow: (keyof PAIAFee)[] = ['about', 'date', 'amount'];
|
|
||||||
|
|
||||||
constructor(private readonly libraryAccountService: LibraryAccountService) {}
|
|
||||||
}
|
|
||||||
@@ -1,40 +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/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<ion-item>
|
|
||||||
<ion-label class="ion-text-wrap">
|
|
||||||
@if (hasEdition) {
|
|
||||||
@if (book) {
|
|
||||||
<h2 class="name">{{ 'library.account.pages.fines.labels.edition' | translate }}: {{ book.name }}</h2>
|
|
||||||
} @else {
|
|
||||||
<h2>
|
|
||||||
<ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
|
|
||||||
</h2>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@for (property of propertiesToShow; track property) {
|
|
||||||
@if (fee[property]) {
|
|
||||||
<p>
|
|
||||||
{{ 'library.account.pages.fines.labels' + '.' + property | translate }}:
|
|
||||||
@if (!['date'].includes(property)) {
|
|
||||||
{{ fee[property] }}
|
|
||||||
} @else {
|
|
||||||
{{ fee[property] | amDateFormat: 'll' }}
|
|
||||||
}
|
|
||||||
</p>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</ion-label>
|
|
||||||
</ion-item>
|
|
||||||
@@ -1,76 +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 {Component, EventEmitter, Input, Output} from '@angular/core';
|
|
||||||
import {DocumentAction, PAIADocument, PAIADocumentStatus, PAIADocumentVisualStatus} from '../../../types';
|
|
||||||
import {LibraryAccountService} from '../../library-account.service';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'stapps-paia-item',
|
|
||||||
templateUrl: './paiaitem.html',
|
|
||||||
styleUrls: ['./paiaitem.scss'],
|
|
||||||
})
|
|
||||||
export class PAIAItemComponent {
|
|
||||||
private _item: PAIADocument;
|
|
||||||
|
|
||||||
renewable: boolean;
|
|
||||||
|
|
||||||
visualStatus?: PAIADocumentVisualStatus;
|
|
||||||
|
|
||||||
constructor(private readonly libraryAccountService: LibraryAccountService) {}
|
|
||||||
|
|
||||||
@Input()
|
|
||||||
set item(value: PAIADocument) {
|
|
||||||
this._item = value;
|
|
||||||
void this.setRenewable();
|
|
||||||
this.visualStatus = this.getVisualStatus(Number(this.item.status));
|
|
||||||
}
|
|
||||||
|
|
||||||
get item(): PAIADocument {
|
|
||||||
return this._item;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Input()
|
|
||||||
propertiesToShow: (keyof PAIADocument)[];
|
|
||||||
|
|
||||||
@Input()
|
|
||||||
listName: string;
|
|
||||||
|
|
||||||
@Output()
|
|
||||||
documentAction: EventEmitter<DocumentAction> = new EventEmitter<DocumentAction>();
|
|
||||||
|
|
||||||
async onClick(action: DocumentAction['action']) {
|
|
||||||
this.documentAction.emit({doc: this.item, action});
|
|
||||||
}
|
|
||||||
|
|
||||||
private async setRenewable() {
|
|
||||||
const isActive = await this.libraryAccountService.isActivePatron();
|
|
||||||
this.renewable = isActive && Number(this.item.status) === PAIADocumentStatus.Held;
|
|
||||||
}
|
|
||||||
|
|
||||||
private getVisualStatus(status: PAIADocumentStatus): PAIADocumentVisualStatus | undefined {
|
|
||||||
switch (status) {
|
|
||||||
case PAIADocumentStatus.Ordered: {
|
|
||||||
return {color: 'warning', status: status, statusText: 'ordered'};
|
|
||||||
}
|
|
||||||
case PAIADocumentStatus.Provided: {
|
|
||||||
return {color: 'success', status: status, statusText: 'ready'};
|
|
||||||
}
|
|
||||||
default: {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user