Merge pull request #117 from stelselim/master

[MOO-1090] Token Store's file storing functions updated.
mendix · Aug 18, 2023 · b6a492c · b6a492c
2 parents 82bcd1a + 02eae06
commit b6a492c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -19,6 +19,8 @@ This project can be used to create a templated Phonegap Build package, as used w
     - Windows: install from [nodejs.org](https://nodejs.org/en/download/)
     - MacOS: use [Brew](https://brew.sh/) to install `Node.js`: `brew install node`
     - Linux, BSD, etc: install using the available package manager, e.g. on Debian: `sudo apt-get install node`
+- To customize the runtime behavior, include the following configuration: Set [com.mendix.core.SameSiteCookies](https://docs.mendix.com/refguide/custom-settings/#commendixcoreSameSiteCookies) to `None` in Studio Pro.
+- Deploy and test the application using HTTPS.
 
 ### Build
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mendix/mendix-hybrid-app-base",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "Mendix PhoneGap Build base package",
   "scripts": {
     "appbase": "node ./node_modules/webpack/bin/webpack --config ./webpack.config.appbase.js",
@@ -57,4 +57,4 @@
   "devDependencies": {
     "prettier": "^2.5.1"
   }
-}
+}
diff --git a/src/config.xml.mustache b/src/config.xml.mustache
@@ -193,6 +193,10 @@
                 <application android:exported="true" />
             </edit-config>
 
+            <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">
+                <application android:requestLegacyExternalStorage="true"/>
+            </edit-config>
+
             {{#androidImages}}
                 <!-- Icon definitions - for more details: http://developer.android.com/guide/topics/resources/providing-resources.html -->
                 {{#density}}

diff --git a/src/www/scripts/file-store.js b/src/www/scripts/file-store.js
@@ -3,11 +3,10 @@
 export default (function () {
     var remove = function (namespace, key) {
         return new Promise(function (resolve, reject) {
-            window.requestFileSystem(
-                LocalFileSystem.PERSISTENT,
-                0,
+            window.resolveLocalFileSystemURL(
+                cordova.file.dataDirectory,
                 function (fs) {
-                    fs.root.getFile(
+                    fs.getFile(
                         ".mx-token",
                         { create: false },
                         function (fileEntry) {
@@ -23,11 +22,10 @@ export default (function () {
 
     var set = function (namespace, key, value) {
         return new Promise(function (resolve, reject) {
-            window.requestFileSystem(
-                LocalFileSystem.PERSISTENT,
-                0,
+            window.resolveLocalFileSystemURL(
+                cordova.file.dataDirectory,
                 function (fs) {
-                    fs.root.getFile(
+                    fs.getFile(
                         ".mx-token",
                         { create: true, exclusive: false },
                         function (fileEntry) {
@@ -50,12 +48,11 @@ export default (function () {
 
     var get = function (namespace, key) {
         return new Promise(function (resolve, reject) {
-            window.requestFileSystem(
-                LocalFileSystem.PERSISTENT,
-                0,
+            window.resolveLocalFileSystemURL(
+                cordova.file.dataDirectory,
                 function (fs) {
                     console.log("file system open: " + fs.name);
-                    fs.root.getFile(
+                    fs.getFile(
                         ".mx-token",
                         { create: false },
                         function (fileEntry) {