Theaninova/openstapps
1
0
Fork 0
mirror of https://gitlab.com/openstapps/openstapps.git synced 2026-03-14 10:42:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: failing native http requests with body

Browse Source
This commit is contained in:
Rainer Killinger
2022-10-07 16:40:15 +02:00
parent c712fa17f7
commit fed4f20c3c
10 changed files with 177 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/app/capacitor.build.gradle
View File

@@ -9,7 +9,6 @@ android {
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle" apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
dependencies { dependencies {
implementation project(':capacitor-community-http')
implementation project(':capacitor-app') implementation project(':capacitor-app')
implementation project(':capacitor-browser') implementation project(':capacitor-browser')
implementation project(':capacitor-device') implementation project(':capacitor-device')

5
android/app/src/main/assets/capacitor.config.json
View File

@@ -25,6 +25,9 @@
"splashImmersive": false, "splashImmersive": false,
"useDialog": false "useDialog": false
}, },
"LocalNotifications": {} "LocalNotifications": {},
"CapacitorHttp": {
"enabled": false
}
} }
} }

4
android/app/src/main/assets/capacitor.plugins.json
View File

@@ -1,8 +1,4 @@
[ [
{
"pkg": "@capacitor-community/http",
"classpath": "com.getcapacitor.plugin.http.Http"
},
{ {
"pkg": "@capacitor/app", "pkg": "@capacitor/app",
"classpath": "com.capacitorjs.plugins.app.AppPlugin" "classpath": "com.capacitorjs.plugins.app.AppPlugin"

3
android/capacitor.settings.gradle
View File

@@ -2,9 +2,6 @@
include ':capacitor-android' include ':capacitor-android'
project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor') project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
include ':capacitor-community-http'
project(':capacitor-community-http').projectDir = new File('../node_modules/@capacitor-community/http/android')
include ':capacitor-app' include ':capacitor-app'
project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android') project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')

3
capacitor.config.ts
View File

@@ -30,6 +30,9 @@ const config: CapacitorConfig = {
LocalNotifications: { LocalNotifications: {
// TODO // TODO
}, },
CapacitorHttp: {
enabled: false,
},
}, },
}; };

5
ios/App/App/capacitor.config.json
View File

@@ -25,6 +25,9 @@
"splashImmersive": false, "splashImmersive": false,
"useDialog": false "useDialog": false
}, },
"LocalNotifications": {} "LocalNotifications": {},
"CapacitorHttp": {
"enabled": false
}
} }
} }

1
ios/App/Podfile
View File

@@ -11,7 +11,6 @@ install! 'cocoapods', :disable_input_output_paths => true
def capacitor_pods def capacitor_pods
pod 'Capacitor', :path => '../../node_modules/@capacitor/ios' pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios' pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
pod 'CapacitorCommunityHttp', :path => '../../node_modules/@capacitor-community/http'
pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app' pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app'
pod 'CapacitorBrowser', :path => '../../node_modules/@capacitor/browser' pod 'CapacitorBrowser', :path => '../../node_modules/@capacitor/browser'
pod 'CapacitorDevice', :path => '../../node_modules/@capacitor/device' pod 'CapacitorDevice', :path => '../../node_modules/@capacitor/device'

258
package-lock.json generated
View File

@@ -626,9 +626,9 @@
} }
}, },
"magic-string": { "magic-string": {
"version": "0.26.5", "version": "0.26.6",
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.5.tgz", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.6.tgz",
"integrity": "sha512-yXUIYOOQnEHKHOftp5shMWpB9ImfgfDJpapa38j/qMtTj5QHWucvxP4lUtuRmHT9vAzvtpHkWKXW9xBwimXeNg==", "integrity": "sha512-6d+3bFybzyQFJYSoRsl9ZC0wheze8M1LrQC7tNMRqXR4izUTDOLMd9BtSuExK9iAukFh+s5K0WAhc/dlQ+HKYA==",
"dev": true, "dev": true,
"requires": { "requires": {
"sourcemap-codec": "^1.4.8" "sourcemap-codec": "^1.4.8"
@@ -2060,42 +2060,6 @@
"to-fast-properties": "^2.0.0" "to-fast-properties": "^2.0.0"
} }
}, },
"@capacitor-community/http": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/@capacitor-community/http/-/http-1.4.1.tgz",
"integrity": "sha512-+pCkBXrwfm97UfjOgjV950H/qZ8SE36Mrcb46BlL1ps3VIsGuIO+AulL8GqTC6LewheRVtGJpRspNtneXQotNA==",
"requires": {
"@capacitor/android": "^3.0.0",
"@capacitor/core": "^3.0.0",
"@capacitor/filesystem": "^1.0.0",
"@capacitor/ios": "^3.0.0"
},
"dependencies": {
"@capacitor/android": {
"version": "3.8.0",
"resolved": "https://registry.npmjs.org/@capacitor/android/-/android-3.8.0.tgz",
"integrity": "sha512-FwHCiWOkPmqI/K4rnIBSyRUy39zqDmgK62yR3DSfEMVgXVvUkzRgYQfDxCn+lq8vPiT/CbnI/iEoudBorJFQkw=="
},
"@capacitor/core": {
"version": "3.8.0",
"resolved": "https://registry.npmjs.org/@capacitor/core/-/core-3.8.0.tgz",
"integrity": "sha512-Z7iHM+1CBbuIK+74bS4ZjpPUOdcKb7Gf7j8xK9WegcrUeHZQl4O6hAAn6nT60kDoeAyutsr3PP25542Ur0wLBg==",
"requires": {
"tslib": "^2.1.0"
}
},
"@capacitor/filesystem": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/@capacitor/filesystem/-/filesystem-1.1.0.tgz",
"integrity": "sha512-8O3UuvL8HNUEJvZnmn8yUmvgB1evtXfcF0oxIo3YbSlylqywJwS3JTiuhKmsvSxCdpbTy8IaTsutVh3gZgWbKg=="
},
"@capacitor/ios": {
"version": "3.8.0",
"resolved": "https://registry.npmjs.org/@capacitor/ios/-/ios-3.8.0.tgz",
"integrity": "sha512-a2/inoVG+4L1diOxTK8oXOMliT5tXwJSg5KelJh8YuouYjH8duVRx560qoKQPE9rUbo9VG3pqOK0w3gROSk2yQ=="
}
}
},
"@capacitor/android": { "@capacitor/android": {
"version": "4.3.0", "version": "4.3.0",
"resolved": "https://registry.npmjs.org/@capacitor/android/-/android-4.3.0.tgz", "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-4.3.0.tgz",
@@ -3009,9 +2973,9 @@
} }
}, },
"@ionic/core": { "@ionic/core": {
"version": "6.2.9", "version": "6.3.0",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.2.9.tgz", "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.0.tgz",
"integrity": "sha512-d2KBXYUKBND2AD8aMgash3O/t04IDc/DHHMshcOydfNJ5qqAxwJYzZR7hs96UknCcIlhHk1pb5C29epkv7gOcQ==", "integrity": "sha512-6MR0hOdIM6sQyZyXez3/jWAnHScrZKaQxzGT2XiXXIpBrKztNdeAhqDLXoxbDU1PLyDnXXPWBzT6xZ698gG67g==",
"requires": { "requires": {
"@stencil/core": "^2.18.0", "@stencil/core": "^2.18.0",
"ionicons": "^6.0.3", "ionicons": "^6.0.3",
@@ -3568,6 +3532,15 @@
"which": "^2.0.2" "which": "^2.0.2"
} }
}, },
"nopt": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
"integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
"dev": true,
"requires": {
"abbrev": "1"
}
},
"socks-proxy-agent": { "socks-proxy-agent": {
"version": "6.2.1", "version": "6.2.1",
"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz", "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz",
@@ -3609,21 +3582,21 @@
} }
}, },
"@nrwl/cli": { "@nrwl/cli": {
"version": "14.8.2", "version": "14.8.3",
"resolved": "https://registry.npmjs.org/@nrwl/cli/-/cli-14.8.2.tgz", "resolved": "https://registry.npmjs.org/@nrwl/cli/-/cli-14.8.3.tgz",
"integrity": "sha512-I+oblryFkZJYk9TMsBWNdN0SV7OjsiD80gD1WjA1KXEQiFVfopYgwErBrxoenodncXrMFRCk/QR9U5F+23+Vow==", "integrity": "sha512-a8URAbqyZvegXMYU8pCA3Hfv0UdiDJc6HboazxinCJJgZWyqKYxRIWmKiWnfpXsr+qF6ntmBR/tC6yHbOL22gQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"nx": "14.8.2" "nx": "14.8.3"
}, },
"dependencies": { "dependencies": {
"@nrwl/tao": { "@nrwl/tao": {
"version": "14.8.2", "version": "14.8.3",
"resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-14.8.2.tgz", "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-14.8.3.tgz",
"integrity": "sha512-a4+O307YZJf1H6CDQFGs4DoUvl7xUFSJo2rNHoR9jDlWU+Ug3n0iivX7Fih6Ui0gX4ocEpRwzNMmJhEmEq1BYw==", "integrity": "sha512-lN7+1biSM/7PYMMgh3jjOXJ9fe6VjhVrtZsDcB6lcklpShjXfHXqlpXDM7vjlw19aLeZMdFWHFoU2C5BTBtzgQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"nx": "14.8.2" "nx": "14.8.3"
} }
}, },
"@zkochan/js-yaml": { "@zkochan/js-yaml": {
@@ -3635,6 +3608,15 @@
"argparse": "^2.0.1" "argparse": "^2.0.1"
} }
}, },
"axios": {
"version": "0.21.1",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
"integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
"dev": true,
"requires": {
"follow-redirects": "^1.10.0"
}
},
"chalk": { "chalk": {
"version": "4.1.0", "version": "4.1.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
@@ -3697,17 +3679,18 @@
} }
}, },
"nx": { "nx": {
"version": "14.8.2", "version": "14.8.3",
"resolved": "https://registry.npmjs.org/nx/-/nx-14.8.2.tgz", "resolved": "https://registry.npmjs.org/nx/-/nx-14.8.3.tgz",
"integrity": "sha512-pPijBoeybsIlCD8FMH8WTns+pcIL+0ZOh/+otUX2LfVsi+ppH33GUxO9QVLPrLcyGaoHhwil4hYBxPIQ7Z1r2g==", "integrity": "sha512-6aMYrzlTqE77vHbaE1teI5P1A2oYkJGkuDMIo/zegRwUxCAjRzLAluUgPrmgqhuPTyTDn8p4aDfxAWV3Q0o/2Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"@nrwl/cli": "14.8.2", "@nrwl/cli": "14.8.3",
"@nrwl/tao": "14.8.2", "@nrwl/tao": "14.8.3",
"@parcel/watcher": "2.0.4", "@parcel/watcher": "2.0.4",
"@yarnpkg/lockfile": "^1.1.0", "@yarnpkg/lockfile": "^1.1.0",
"@yarnpkg/parsers": "^3.0.0-rc.18", "@yarnpkg/parsers": "^3.0.0-rc.18",
"@zkochan/js-yaml": "0.0.6", "@zkochan/js-yaml": "0.0.6",
"axios": "0.21.1",
"chalk": "4.1.0", "chalk": "4.1.0",
"chokidar": "^3.5.1", "chokidar": "^3.5.1",
"cli-cursor": "3.1.0", "cli-cursor": "3.1.0",
@@ -3949,6 +3932,24 @@
"commander": "9.4.0", "commander": "9.4.0",
"semver": "7.3.7", "semver": "7.3.7",
"yaml": "1.10.2" "yaml": "1.10.2"
},
"dependencies": {
"lru-cache": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
"requires": {
"yallist": "^4.0.0"
}
},
"semver": {
"version": "7.3.7",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
"requires": {
"lru-cache": "^6.0.0"
}
}
} }
}, },
"@openstapps/core": { "@openstapps/core": {
@@ -4155,9 +4156,9 @@
"dev": true "dev": true
}, },
"@stencil/core": { "@stencil/core": {
"version": "2.18.0", "version": "2.18.1",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.18.0.tgz", "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.18.1.tgz",
"integrity": "sha512-NLEY8Jq59smyiivBAxHKipsp9YkkW/K/Vm90zAyXQqukb12i2SFucWHJ1Ik7ropVlhmMVvigyxXgRfQ9quIqtg==" "integrity": "sha512-/fXkh1lwZ+X9JQCw50mPjhBogzEHOBvVC5pLoDLZqodVYK0DGWILM2YLV4dcIUBNEK8/HMDpO/Rq81/rS3mNOw=="
}, },
"@swc/helpers": { "@swc/helpers": {
"version": "0.4.11", "version": "0.4.11",
@@ -6239,9 +6240,9 @@
} }
}, },
"caniuse-lite": { "caniuse-lite": {
"version": "1.0.30001414", "version": "1.0.30001418",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001414.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001418.tgz",
"integrity": "sha512-t55jfSaWjCdocnFdKQoO+d2ct9C59UZg4dY3OnUlSZ447r8pUtIKdp0hpAzrGFultmTC+Us+KpKi4GZl/LXlFg==", "integrity": "sha512-oIs7+JL3K9JRQ3jPZjlH6qyYDp+nBTCais7hjh0s+fuBwufc7uZ7hPYMXrDOJhV360KGMTcczMRObk0/iMqZRg==",
"dev": true "dev": true
}, },
"capacitor-secure-storage-plugin": { "capacitor-secure-storage-plugin": {
@@ -7223,18 +7224,18 @@
"dev": true "dev": true
}, },
"core-js-compat": { "core-js-compat": {
"version": "3.25.3", "version": "3.25.5",
"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.3.tgz", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.5.tgz",
"integrity": "sha512-xVtYpJQ5grszDHEUU9O7XbjjcZ0ccX3LgQsyqSvTnjX97ZqEgn9F5srmrwwwMtbKzDllyFPL+O+2OFMl1lU4TQ==", "integrity": "sha512-ovcyhs2DEBUIE0MGEKHP4olCUW/XYte3Vroyxuh38rD1wAO4dHohsovUC4eAOuzFxE6b+RXvBU3UZ9o0YhUTkA==",
"dev": true, "dev": true,
"requires": { "requires": {
"browserslist": "^4.21.4" "browserslist": "^4.21.4"
} }
}, },
"core-js-pure": { "core-js-pure": {
"version": "3.25.3", "version": "3.25.5",
"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.25.3.tgz", "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.25.5.tgz",
"integrity": "sha512-T/7qvgv70MEvRkZ8p6BasLZmOVYKzOaWNBEHAU8FmveCJkl4nko2quqPQOmy6AJIp5MBanhz9no3A94NoRb0XA==", "integrity": "sha512-oml3M22pHM+igfWHDfdLVq2ShWmjM2V4L+dQEBs0DWVIqEm9WHCwGAlZ6BmyBQGy5sFrJmcx+856D9lVKyGWYg==",
"dev": true "dev": true
}, },
"core-util-is": { "core-util-is": {
@@ -8035,9 +8036,9 @@
} }
}, },
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.4.269", "version": "1.4.275",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.269.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.275.tgz",
"integrity": "sha512-7mHFONwp7MNvdyto1v70fCwk28NJMFgsK79op+iYHzz1BLE8T66a1B2qW5alb8XgE0yi3FL3ZQjSYZpJpF6snw==", "integrity": "sha512-aJeQQ+Hl9Jyyzv4chBqYJwmVRY46N5i2BEX5Cuyk/5gFCUZ5F3i7Hnba6snZftWla7Gglwc5pIgcd+E7cW+rPg==",
"dev": true "dev": true
}, },
"elementtree": { "elementtree": {
@@ -10308,19 +10309,19 @@
} }
}, },
"i18next": { "i18next": {
"version": "21.9.2", "version": "21.10.0",
"resolved": "https://registry.npmjs.org/i18next/-/i18next-21.9.2.tgz", "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.10.0.tgz",
"integrity": "sha512-00fVrLQOwy45nm3OtC9l1WiLK3nJlIYSljgCt0qzTaAy65aciMdRy9GsuW+a2AtKtdg9/njUGfRH30LRupV7ZQ==", "integrity": "sha512-YeuIBmFsGjUfO3qBmMOc0rQaun4mIpGKET5WDwvu8lU7gvwpcariZLNtL0Fzj+zazcHUrlXHiptcFhBMFaxzfg==",
"requires": { "requires": {
"@babel/runtime": "^7.17.2" "@babel/runtime": "^7.17.2"
} }
}, },
"i18next-browser-languagedetector": { "i18next-browser-languagedetector": {
"version": "6.1.5", "version": "6.1.8",
"resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-6.1.5.tgz", "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-6.1.8.tgz",
"integrity": "sha512-11t7b39oKeZe4uyMxLSPnfw28BCPNLZgUk7zyufex0zKXZ+Bv+JnmJgoB+IfQLZwDt1d71PM8vwBX1NCgliY3g==", "integrity": "sha512-Svm+MduCElO0Meqpj1kJAriTC6OhI41VhlT/A0UPjGoPZBhAHIaGE5EfsHlTpgdH09UVX7rcc72pSDDBeKSQQA==",
"requires": { "requires": {
"@babel/runtime": "^7.18.9" "@babel/runtime": "^7.19.0"
} }
}, },
"iconv-lite": { "iconv-lite": {
@@ -10764,9 +10765,9 @@
"dev": true "dev": true
}, },
"istanbul-lib-instrument": { "istanbul-lib-instrument": {
"version": "5.2.0", "version": "5.2.1",
"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz", "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
"integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==", "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/core": "^7.12.3", "@babel/core": "^7.12.3",
@@ -10986,9 +10987,9 @@
} }
}, },
"js-sdsl": { "js-sdsl": {
"version": "4.1.4", "version": "4.1.5",
"resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz", "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz",
"integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==", "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==",
"dev": true "dev": true
}, },
"js-tokens": { "js-tokens": {
@@ -11922,16 +11923,24 @@
} }
}, },
"log4js": { "log4js": {
"version": "6.6.1", "version": "6.7.0",
"resolved": "https://registry.npmjs.org/log4js/-/log4js-6.6.1.tgz", "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.7.0.tgz",
"integrity": "sha512-J8VYFH2UQq/xucdNu71io4Fo+purYYudyErgBbswWKO0MC6QVOERRomt5su/z6d3RJSmLyTGmXl3Q/XjKCf+/A==", "integrity": "sha512-KA0W9ffgNBLDj6fZCq/lRbgR6ABAodRIDHrZnS48vOtfKa4PzWImb0Md1lmGCdO3n3sbCm/n1/WmrNlZ8kCI3Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"date-format": "^4.0.13", "date-format": "^4.0.14",
"debug": "^4.3.4", "debug": "^4.3.4",
"flatted": "^3.2.6", "flatted": "^3.2.7",
"rfdc": "^1.3.0", "rfdc": "^1.3.0",
"streamroller": "^3.1.2" "streamroller": "^3.1.3"
},
"dependencies": {
"flatted": {
"version": "3.2.7",
"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
"integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
"dev": true
}
} }
}, },
"loglevel": { "loglevel": {
@@ -12043,9 +12052,9 @@
"dev": true "dev": true
}, },
"marked": { "marked": {
"version": "4.1.0", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/marked/-/marked-4.1.0.tgz", "resolved": "https://registry.npmjs.org/marked/-/marked-4.1.1.tgz",
"integrity": "sha512-+Z6KDjSPa6/723PQYyc1axYZpYYpDnECDaU6hkaf5gqBieBkMKYReL5hteF2QizhlMbgbo8umXl/clZ67+GlsA==" "integrity": "sha512-0cNMnTcUJPxbA6uWmCmjWz4NJRe/0Xfk2NhXCUHjew9qJzFN20krFnsUe7QynwqOwa5m1fZ4UDg0ycKFVC0ccw=="
}, },
"material-symbols": { "material-symbols": {
"version": "0.2.8", "version": "0.2.8",
@@ -12681,9 +12690,9 @@
} }
}, },
"node-abi": { "node-abi": {
"version": "3.25.0", "version": "3.26.0",
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.25.0.tgz", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.26.0.tgz",
"integrity": "sha512-p+0xx5ruIQ+8X57CRIMxbTZRT7tU0Tjn2C/aAK68AEMrbGsCo6IjnDdPNhEyyjWCT4bRtzomXchYd3sSgk3BJQ==", "integrity": "sha512-jRVtMFTChbi2i/jqo/i2iP9634KMe+7K1v35mIdj3Mn59i5q27ZYhn+sW6npISM/PQg7HrP2kwtRBMmh5Uvzdg==",
"dev": true, "dev": true,
"requires": { "requires": {
"semver": "^7.3.5" "semver": "^7.3.5"
@@ -12702,15 +12711,15 @@
"dev": true "dev": true
}, },
"node-gyp": { "node-gyp": {
"version": "9.1.0", "version": "9.2.0",
"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.1.0.tgz", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.2.0.tgz",
"integrity": "sha512-HkmN0ZpQJU7FLbJauJTHkHlSVAXlNGDAzH/VYFZGDOnFyn/Na3GlNJfkudmufOdS6/jNFhy88ObzL7ERz9es1g==", "integrity": "sha512-/+/YxGfIJOh/fnMsr4Ep0v6oOIjnO1BgLd2dcDspBX1spTkQU7xSIox5RdRE/2/Uq3ZwK8Z5swRIbMUmPlslmg==",
"requires": { "requires": {
"env-paths": "^2.2.0", "env-paths": "^2.2.0",
"glob": "^7.1.4", "glob": "^7.1.4",
"graceful-fs": "^4.2.6", "graceful-fs": "^4.2.6",
"make-fetch-happen": "^10.0.3", "make-fetch-happen": "^10.0.3",
"nopt": "^5.0.0", "nopt": "^6.0.0",
"npmlog": "^6.0.0", "npmlog": "^6.0.0",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"semver": "^7.3.5", "semver": "^7.3.5",
@@ -12751,11 +12760,11 @@
"integrity": "sha512-2zaTFGqZixVmTxpJRCFC+Vk5eGRd/fYtvIR+dl5u9QXLTQWGIf48x/JXvo58g9sa0bU6To04XUv554Paykum3g==" "integrity": "sha512-2zaTFGqZixVmTxpJRCFC+Vk5eGRd/fYtvIR+dl5u9QXLTQWGIf48x/JXvo58g9sa0bU6To04XUv554Paykum3g=="
}, },
"nopt": { "nopt": {
"version": "5.0.0", "version": "6.0.0",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz",
"integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==",
"requires": { "requires": {
"abbrev": "1" "abbrev": "^1.0.0"
} }
}, },
"normalize-package-data": { "normalize-package-data": {
@@ -15561,9 +15570,9 @@
} }
}, },
"semver": { "semver": {
"version": "7.3.7", "version": "7.3.8",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
"requires": { "requires": {
"lru-cache": "^6.0.0" "lru-cache": "^6.0.0"
}, },
@@ -15910,9 +15919,9 @@
} }
}, },
"socks": { "socks": {
"version": "2.7.0", "version": "2.7.1",
"resolved": "https://registry.npmjs.org/socks/-/socks-2.7.0.tgz", "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
"integrity": "sha512-scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA==", "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
"requires": { "requires": {
"ip": "^2.0.0", "ip": "^2.0.0",
"smart-buffer": "^4.2.0" "smart-buffer": "^4.2.0"
@@ -17246,9 +17255,9 @@
"dev": true "dev": true
}, },
"uglify-js": { "uglify-js": {
"version": "3.17.2", "version": "3.17.3",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.2.tgz", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.3.tgz",
"integrity": "sha512-bbxglRjsGQMchfvXZNusUcYgiB9Hx2K4AHYXQy2DITZ9Rd+JzhX7+hoocE5Winr7z2oHvPsekkBwXtigvxevXg==", "integrity": "sha512-JmMFDME3iufZnBpyKL+uS78LRiC+mK55zWfM5f/pWBJfpOttXAqYfdDGRukYhJuyRinvPVAtUhvy7rlDybNtFg==",
"dev": true, "dev": true,
"optional": true "optional": true
}, },
@@ -17347,9 +17356,9 @@
"dev": true "dev": true
}, },
"update-browserslist-db": { "update-browserslist-db": {
"version": "1.0.9", "version": "1.0.10",
"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
"integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==", "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"escalade": "^3.1.1", "escalade": "^3.1.1",
@@ -17969,12 +17978,12 @@
"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==" "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
}, },
"yargs": { "yargs": {
"version": "17.5.1", "version": "17.6.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.0.tgz",
"integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==", "integrity": "sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==",
"dev": true, "dev": true,
"requires": { "requires": {
"cliui": "^7.0.2", "cliui": "^8.0.1",
"escalade": "^3.1.1", "escalade": "^3.1.1",
"get-caller-file": "^2.0.5", "get-caller-file": "^2.0.5",
"require-directory": "^2.1.1", "require-directory": "^2.1.1",
@@ -17983,6 +17992,17 @@
"yargs-parser": "^21.0.0" "yargs-parser": "^21.0.0"
}, },
"dependencies": { "dependencies": {
"cliui": {
"version": "8.0.1",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
"dev": true,
"requires": {
"string-width": "^4.2.0",
"strip-ansi": "^6.0.1",
"wrap-ansi": "^7.0.0"
}
},
"yargs-parser": { "yargs-parser": {
"version": "21.1.1", "version": "21.1.1",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",

1
package.json
View File

@@ -63,7 +63,6 @@
"@asymmetrik/ngx-leaflet-markercluster": "13.0.1", "@asymmetrik/ngx-leaflet-markercluster": "13.0.1",
"@awesome-cordova-plugins/calendar": "5.45.0", "@awesome-cordova-plugins/calendar": "5.45.0",
"@awesome-cordova-plugins/core": "5.45.0", "@awesome-cordova-plugins/core": "5.45.0",
"@capacitor-community/http": "1.4.1",
"@capacitor/app": "4.0.1", "@capacitor/app": "4.0.1",
"@capacitor/browser": "4.0.1", "@capacitor/browser": "4.0.1",
"@capacitor/core": "4.3.0", "@capacitor/core": "4.3.0",

36
src/app/modules/auth/capacitor-requestor.ts
View File

@@ -1,5 +1,5 @@
import {Requestor} from '@openid/appauth'; import {Requestor} from '@openid/appauth';
import {Http, HttpHeaders, HttpResponse} from '@capacitor-community/http'; import {CapacitorHttp, HttpHeaders, HttpResponse} from '@capacitor/core';
import {XhrSettings} from 'ionic-appauth/lib/cordova'; import {XhrSettings} from 'ionic-appauth/lib/cordova';
// REQUIRES CAPACITOR PLUGIN // REQUIRES CAPACITOR PLUGIN
@@ -25,28 +25,46 @@ export class CapacitorRequestor extends Requestor {
} }
private async get<T>(url: string, headers: HttpHeaders) { private async get<T>(url: string, headers: HttpHeaders) {
return Http.get({url, headers}).then( return CapacitorHttp.get({url, headers}).then(
(response: HttpResponse) => response.data as T, (response: HttpResponse) => response.data as T,
); );
} }
// eslint-disable-next-line @typescript-eslint/no-explicit-any // eslint-disable-next-line @typescript-eslint/no-explicit-any
private async post<T>(url: string, data: any, headers: HttpHeaders) { private async post<T>(url: string, data: any, headers: HttpHeaders) {
return Http.post({url, data: data, headers}).then( return CapacitorHttp.post({
(response: HttpResponse) => response.data as T, url,
); data: this.decodeURLSearchParams(data),
headers,
}).then((response: HttpResponse) => {
return response.data as T;
});
} }
// eslint-disable-next-line @typescript-eslint/no-explicit-any // eslint-disable-next-line @typescript-eslint/no-explicit-any
private async put<T>(url: string, data: any, headers: HttpHeaders) { private async put<T>(url: string, data: any, headers: HttpHeaders) {
return Http.put({url, data, headers}).then( return CapacitorHttp.put({
url,
data: this.decodeURLSearchParams(data),
headers,
}).then((response: HttpResponse) => response.data as T);
}
private async delete<T>(url: string, headers: HttpHeaders) {
return CapacitorHttp.delete({url, headers}).then(
(response: HttpResponse) => response.data as T, (response: HttpResponse) => response.data as T,
); );
} }
private async delete<T>(url: string, headers: HttpHeaders) { private decodeURLSearchParams(parameters: string): Record<string, unknown> {
return Http.del({url, headers}).then( const searchParameters = new URLSearchParams(parameters);
(response: HttpResponse) => response.data as T, return Object.fromEntries(
[...searchParameters.keys()].map(k => [
k,
searchParameters.getAll(k).length === 1
? searchParameters.get(k)
: searchParameters.getAll(k),
]),
); );
} }
} }