From 12701669f0b68eba515a7e715581639901aaf0c4 Mon Sep 17 00:00:00 2001 From: Selim Ustel Date: Tue, 18 Jun 2024 14:03:12 +0200 Subject: [PATCH 1/3] add preference for User Agent fix on iPad --- package-lock.json | 4 ++-- package.json | 2 +- src/config.xml.mustache | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7f783d8..67d9955 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@mendix/mendix-hybrid-app-base", - "version": "8.0.1", + "version": "8.0.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@mendix/mendix-hybrid-app-base", - "version": "8.0.1", + "version": "8.0.2", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.21.4", diff --git a/package.json b/package.json index aa3028c..995c3c1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mendix/mendix-hybrid-app-base", - "version": "8.0.1", + "version": "8.0.2", "description": "Mendix PhoneGap Build base package", "scripts": { "appbase": "node ./node_modules/webpack/bin/webpack --config ./webpack.config.appbase.js", diff --git a/src/config.xml.mustache b/src/config.xml.mustache index a690246..f2f8fa0 100644 --- a/src/config.xml.mustache +++ b/src/config.xml.mustache @@ -121,6 +121,7 @@ + {{#iosImages}} <{{{tag}}} src="{{{filename}}}" width="{{{width}}}" height="{{{height}}}" /> From fe4d912a5de067229feb167b58090b3d6ebb273a Mon Sep 17 00:00:00 2001 From: Selim Ustel Date: Fri, 21 Jun 2024 13:54:00 +0200 Subject: [PATCH 2/3] Unmodified URL added to config --- src/www/scripts/app.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/www/scripts/app.js b/src/www/scripts/app.js index b45bf3b..104b8f9 100644 --- a/src/www/scripts/app.js +++ b/src/www/scripts/app.js @@ -339,7 +339,8 @@ export default (function () { }; } - await emitter.emit("onConfigReady", window.dojoConfig); + // Emit an event with the configuration ready for use, including the unmodified remote URL for SSO functionality. + await emitter.emit("onConfigReady", { ...window.dojoConfig, nonProxiedRemoteUrl: url }); // Because loading all app scripts takes quite a while we do that first and defer removing our // own styles and scripts until mx exists. We need to hold on to our own styles as long as we From 6c6a27824294ce418c80af2b60217990925d1b21 Mon Sep 17 00:00:00 2001 From: Selim Ustel Date: Fri, 21 Jun 2024 14:13:30 +0200 Subject: [PATCH 3/3] adding a small check for remote URL --- src/www/scripts/app.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/www/scripts/app.js b/src/www/scripts/app.js index 104b8f9..0081652 100644 --- a/src/www/scripts/app.js +++ b/src/www/scripts/app.js @@ -340,7 +340,8 @@ export default (function () { } // Emit an event with the configuration ready for use, including the unmodified remote URL for SSO functionality. - await emitter.emit("onConfigReady", { ...window.dojoConfig, nonProxiedRemoteUrl: url }); + // Also, Make sure remote URL always ends with a /. + await emitter.emit("onConfigReady", { ...window.dojoConfig, unmodifiedRemoteUrl: url.replace(/\/?$/, "/") }); // Because loading all app scripts takes quite a while we do that first and defer removing our // own styles and scripts until mx exists. We need to hold on to our own styles as long as we