Skip to content

Commit

Permalink
Merge pull request #128 from mendix/fix/sso_url_fix_and_mobile_content
Browse files Browse the repository at this point in the history
[MOO-1461] Fix for iPad User and SSO Login URL fix
  • Loading branch information
vadymv-mendix authored Jun 25, 2024
2 parents 51cfb8f + 6c6a278 commit 9eaeb5a
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
1 change: 1 addition & 0 deletions src/config.xml.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
<platform name="ios">
<preference name="scheme" value="app" />
<preference name="hostname" value="localhost" />
<preference name="PreferredContentMode" value="mobile" />

{{#iosImages}}
<{{{tag}}} src="{{{filename}}}" width="{{{width}}}" height="{{{height}}}" />
Expand Down
4 changes: 3 additions & 1 deletion src/www/scripts/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,9 @@ 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.
// 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
Expand Down

0 comments on commit 9eaeb5a

Please sign in to comment.