From b3bc34aeb3684d10a59501bcd46b87d4391822e4 Mon Sep 17 00:00:00 2001 From: "damian.ionic" Date: Mon, 15 Apr 2024 07:18:38 -0700 Subject: [PATCH 1/3] fix: apply 5.14 --- android/app/build.gradle | 3 ++- android/app/src/main/AndroidManifest.xml | 8 +++++--- android/build.gradle | 5 +++++ ios/App/Podfile.lock | 6 +++--- package-lock.json | 8 ++++---- package.json | 2 +- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index c4f046c..b142b2c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -10,7 +10,8 @@ android { versionCode 3 versionName "1.1" manifestPlaceholders = [ - 'AUTH_URL_SCHEME': 'ionic.cs.appsummit' + 'AUTH_URL_SCHEME': 'ionic.cs.appsummit', + 'AUTH_URL_HOST': 'trifecta.nexusconcepts.com' ] testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 98469c7..9d72b1b 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -19,7 +19,9 @@ - + + - + \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index 37d63ae..5551895 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -24,6 +24,11 @@ allprojects { } } +ext { + AUTH_URL_HOST = "trifecta.nexusconcepts.com" + AUTH_URL_PATH_PREFIX = "" +} + task clean(type: Delete) { delete rootProject.buildDir } diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock index 98144fd..e2223ee 100644 --- a/ios/App/Podfile.lock +++ b/ios/App/Podfile.lock @@ -69,7 +69,7 @@ PODS: - GoogleUtilities/Logger - GoogleUtilities/UserDefaults (7.11.1): - GoogleUtilities/Logger - - IonicEnterpriseAuth (5.1.2): + - IonicEnterpriseAuth (5.1.4-dev-20240412T164838.0): - Capacitor - nanopb (2.30909.0): - nanopb/decode (= 2.30909.0) @@ -160,11 +160,11 @@ SPEC CHECKSUMS: FirebaseMessaging: 06253e9669434df0a40718fc82a90c78090f4704 GoogleDataTransport: f0308f5905a745f94fb91fea9c6cbaf3831cb1bd GoogleUtilities: 9aa0ad5a7bc171f8bae016300bfcfa3fb8425749 - IonicEnterpriseAuth: c73b149efdd27afebe2a308449221accc3f02df3 + IonicEnterpriseAuth: 621d301d42b31cf311451ca7dcd92b664c1281b7 nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef SQLCipher: 905b145f65f349f26da9e60a19901ad24adcd381 PODFILE CHECKSUM: 2d601e3e6bbab999acdfc51e7fdaf19eda544928 -COCOAPODS: 1.14.3 +COCOAPODS: 1.15.2 diff --git a/package-lock.json b/package-lock.json index 4f3536c..7a86c93 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "@capacitor/push-notifications": "5.1.0", "@capacitor/splash-screen": "^5.0.0", "@capacitor/status-bar": "^5.0.0", - "@ionic-enterprise/auth": "5.1.2", + "@ionic-enterprise/auth": "5.1.4-dev-20240412T164838.0", "@ionic-enterprise/identity-vault": "5.12.1", "@ionic-enterprise/secure-storage": "3.0.2", "@ionic/angular": "7.6.3", @@ -3299,9 +3299,9 @@ "dev": true }, "node_modules/@ionic-enterprise/auth": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/@ionic-enterprise/auth/-/auth-5.1.2.tgz", - "integrity": "sha512-yMUfEgVv7s/QZoKpj0DFr38A4joDLO5dhWZQlua2derocDjx5J+ZCgyY5MlVeLubxt/HPwu1/KkwDGnRWhlsAQ==", + "version": "5.1.4-dev-20240412T164838.0", + "resolved": "https://registry.npmjs.org/@ionic-enterprise/auth/-/auth-5.1.4-dev-20240412T164838.0.tgz", + "integrity": "sha512-iZRgG587h5Z1GPZjbTvDDaXkLfbSzCY0tcL73ZfJJy2G83I6FGcScHBA9ikFx4acI7nKk/osRFZZJJyyOI8kVA==", "dependencies": { "js-sha256": "0.9.0", "url-parse": "^1.5.10" diff --git a/package.json b/package.json index 5ea811d..c13f054 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@capacitor/push-notifications": "5.1.0", "@capacitor/splash-screen": "^5.0.0", "@capacitor/status-bar": "^5.0.0", - "@ionic-enterprise/auth": "5.1.2", + "@ionic-enterprise/auth": "5.1.4-dev-20240412T164838.0", "@ionic-enterprise/identity-vault": "5.12.1", "@ionic-enterprise/secure-storage": "3.0.2", "@ionic/angular": "7.6.3", From 12685b7ad45eeaa55f8171035fb7f643bc7cd704 Mon Sep 17 00:00:00 2001 From: "damian.ionic" Date: Mon, 15 Apr 2024 07:59:35 -0700 Subject: [PATCH 2/3] chore: add sha256 for app --- website/.well-known/assetlinks.json | 3 ++- website/index.html | 13 ++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/website/.well-known/assetlinks.json b/website/.well-known/assetlinks.json index c57ed24..6599327 100644 --- a/website/.well-known/assetlinks.json +++ b/website/.well-known/assetlinks.json @@ -8,7 +8,8 @@ "package_name": "io.ionic.cs.appsummit", "sha256_cert_fingerprints": [ "1D:5F:56:BF:CF:93:09:6D:A6:2E:65:67:71:A1:86:E0:5C:B8:93:D0:D9:BA:2B:80:79:CA:86:3D:F9:1A:42:90", - "89:A6:9A:07:7B:0E:36:92:E2:78:92:97:3C:8B:2A:BA:2A:6A:1C:FB:6B:C8:8B:6B:DF:C3:B6:AE:63:33:9A:4B" + "89:A6:9A:07:7B:0E:36:92:E2:78:92:97:3C:8B:2A:BA:2A:6A:1C:FB:6B:C8:8B:6B:DF:C3:B6:AE:63:33:9A:4B", + "94:30:DA:93:39:64:39:B8:3D:B1:37:2A:D9:18:7C:56:74:C1:BB:B6:D4:56:D3:4F:26:75:A8:81:28:9A:88:B3" ] } } diff --git a/website/index.html b/website/index.html index 2aeaae5..3e0eade 100644 --- a/website/index.html +++ b/website/index.html @@ -1,5 +1,12 @@ - -

https://trifecta.nexusconcepts.com

 - + + + +

https://trifecta.nexusconcepts.com

+ + +

If you are stuck on this page then you probably need to have your sha256_cert_fingerprints added to + assetlinks.json for the app.

+ + \ No newline at end of file From 4c5611ab9312a9d2ed4614a584901c9816cf755f Mon Sep 17 00:00:00 2001 From: "damian.ionic" Date: Mon, 15 Apr 2024 08:51:38 -0700 Subject: [PATCH 3/3] chore: remove unused setting --- android/app/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index b142b2c..b5e4325 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -10,8 +10,7 @@ android { versionCode 3 versionName "1.1" manifestPlaceholders = [ - 'AUTH_URL_SCHEME': 'ionic.cs.appsummit', - 'AUTH_URL_HOST': 'trifecta.nexusconcepts.com' + 'AUTH_URL_SCHEME': 'ionic.cs.appsummit', ] testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions {