diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 1db4f86..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "packages/Meteor-Cookies"]
- path = packages/Meteor-Cookies
- url = https://github.com/VeliovGroup/Meteor-Cookies.git
diff --git a/.meteor/.finished-upgraders b/.meteor/.finished-upgraders
index 4538749..c07b6ff 100644
--- a/.meteor/.finished-upgraders
+++ b/.meteor/.finished-upgraders
@@ -16,3 +16,4 @@ notices-for-facebook-graph-api-2
1.4.3-split-account-service-packages
1.5-add-dynamic-import-package
1.7-split-underscore-from-meteor-base
+1.8.3-split-jquery-from-blaze
diff --git a/.meteor/cordova-plugins b/.meteor/cordova-plugins
new file mode 100644
index 0000000..defeeb3
--- /dev/null
+++ b/.meteor/cordova-plugins
@@ -0,0 +1 @@
+cordova-plugin-webview-proxy@https://github.com/GEDYSIntraWare/cordova-plugin-webview-proxy.git#0e5bfc9274759e0a2af9c89072a59a7230c9dc15
diff --git a/.meteor/packages b/.meteor/packages
index cf56dab..8ec0fef 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -4,15 +4,15 @@
# 'meteor add' and 'meteor remove' will edit this file for you,
# but you can also edit it by hand.
-meteor@1.9.3 # Shared foundation for all Meteor packages
+meteor # Shared foundation for all Meteor packages
static-html # Define static page content in .html files
-standard-minifier-css@1.5.3 # CSS minifier run for production mode
-standard-minifier-js@2.4.1 # JS minifier run for production mode
-es5-shim@4.8.0 # ECMAScript 5 compatibility for older browsers
-ecmascript@0.12.4 # Enable ECMAScript2015+ syntax in app code
-shell-server@0.4.0 # Server-side component of the `meteor shell` command
-webapp@1.7.3 # Serves a Meteor app over HTTP
-server-render@0.3.1 # Support for server-side rendering
+standard-minifier-css # CSS minifier run for production mode
+standard-minifier-js # JS minifier run for production mode
+es5-shim # ECMAScript 5 compatibility for older browsers
+ecmascript # Enable ECMAScript2015+ syntax in app code
+shell-server # Server-side component of the `meteor shell` command
+webapp # Serves a Meteor app over HTTP
+server-render # Support for server-side rendering
ostrio:cookies
http
meteor-base
diff --git a/.meteor/release b/.meteor/release
index 97064e1..d8fd7cf 100644
--- a/.meteor/release
+++ b/.meteor/release
@@ -1 +1 @@
-METEOR@1.8.1
+METEOR@2.2
diff --git a/.meteor/versions b/.meteor/versions
index a9ee2b8..47f872b 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -1,63 +1,63 @@
-autoupdate@1.6.0
-babel-compiler@7.3.4
-babel-runtime@1.3.0
+autoupdate@1.7.0
+babel-compiler@7.6.1
+babel-runtime@1.5.0
base64@1.0.12
-blaze-tools@1.0.10
-boilerplate-generator@1.6.0
+blaze-tools@1.1.1
+boilerplate-generator@1.7.1
browser-policy@1.1.0
browser-policy-common@1.0.11
-browser-policy-content@1.1.0
+browser-policy-content@1.1.1
browser-policy-framing@1.1.0
-caching-compiler@1.2.1
-caching-html-compiler@1.1.3
-callback-hook@1.1.0
+caching-compiler@1.2.2
+caching-html-compiler@1.2.0
+callback-hook@1.3.0
check@1.3.1
ddp@1.4.0
-ddp-client@2.3.3
+ddp-client@2.4.1
ddp-common@1.4.0
-ddp-server@2.3.0
-deps@1.0.12
+ddp-server@2.3.3
diff-sequence@1.1.1
-dynamic-import@0.5.1
-ecmascript@0.12.7
+dynamic-import@0.6.0
+ecmascript@0.15.1
ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.8.0
-ecmascript-runtime-server@0.7.1
-ejson@1.1.0
+ecmascript-runtime-client@0.11.0
+ecmascript-runtime-server@0.10.0
+ejson@1.1.1
es5-shim@4.8.0
fetch@0.1.1
hot-code-push@1.0.4
-html-tools@1.0.11
-htmljs@1.0.11
-http@1.4.2
-id-map@1.1.0
-inter-process-messaging@0.1.0
+html-tools@1.1.1
+htmljs@1.1.0
+http@1.4.3
+id-map@1.1.1
+inter-process-messaging@0.1.1
livedata@1.0.18
-logging@1.1.20
+logging@1.2.0
meteor@1.9.3
meteor-base@1.4.0
-minifier-css@1.4.2
-minifier-js@2.4.1
-modern-browsers@0.1.4
-modules@0.13.0
-modules-runtime@0.10.3
-mongo-id@1.0.7
-ostrio:cookies@2.4.1
+minifier-css@1.5.4
+minifier-js@2.6.0
+modern-browsers@0.1.5
+modules@0.16.0
+modules-runtime@0.12.0
+mongo-id@1.0.8
+ostrio:cookies@2.7.0
promise@0.11.2
-random@1.1.0
-reload@1.3.0
+random@1.2.0
+react-fast-refresh@0.1.1
+reload@1.3.1
retry@1.1.0
routepolicy@1.1.0
server-render@0.3.1
-shell-server@0.4.0
-socket-stream-client@0.2.2
-spacebars-compiler@1.1.3
-standard-minifier-css@1.5.3
-standard-minifier-js@2.4.1
-static-html@1.2.2
-templating-tools@1.1.2
+shell-server@0.5.0
+socket-stream-client@0.3.2
+spacebars-compiler@1.2.1
+standard-minifier-css@1.7.2
+standard-minifier-js@2.6.0
+static-html@1.3.1
+templating-tools@1.2.0
tracker@1.2.0
underscore@1.0.10
-url@1.2.0
-webapp@1.7.4
-webapp-hashing@1.0.9
+url@1.3.1
+webapp@1.10.1
+webapp-hashing@1.1.0
diff --git a/client/main.js b/client/main.js
index 88529d8..321e651 100644
--- a/client/main.js
+++ b/client/main.js
@@ -23,8 +23,13 @@ const runTests = async () => {
const cookieValue = `${Date.now()}`;
const cookieParam = `__TEST_COOKIE__=${cookieValue}`;
const ___expectedCookies___ = encodeURI(cookieParam);
- const cookieResetPath = Meteor.absoluteUrl("/__cookie_reset");
- const cookieTestPath = Meteor.absoluteUrl("/__cookie_match");
+ let cookieResetPath = Meteor.absoluteUrl("/__cookie_reset");
+ let cookieTestPath = Meteor.absoluteUrl("/__cookie_match");
+
+ if (Meteor.isCordova) {
+ //cookieResetPath = window.WebviewProxy.convertProxyUrl(cookieResetPath);
+ //cookieTestPath = window.WebviewProxy.convertProxyUrl(cookieTestPath);
+ }
const cookies = new Cookies({ allowQueryStringCookies: true });
cookies.remove();
@@ -134,6 +139,10 @@ const runTests = async () => {
});
if (Meteor.isCordova) {
+ // Todo: callback not fired
+ // CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK]; should be used
+ // await new Promise((resolve, reject) => window.WebviewProxy.clearCookie(resolve, reject));
+ window.WebviewProxy.clearCookie();
await new Promise(resolve => {
HTTP.get(
cookieTestPath,
@@ -146,7 +155,7 @@ const runTests = async () => {
assertEqual(
res.statusCode,
200,
- "no cookie from cordova with withCredentials = false"
+ "no cookie from cordova on clearCookie"
);
resolve();
}
@@ -186,4 +195,16 @@ const func = () => {
}
};
-func();
+
+if (Meteor.isCordova) {
+ const foo = Meteor.absoluteUrl;
+ Meteor.absoluteUrl = function (url, opts) {
+ return window.WebviewProxy.convertProxyUrl(foo(url, opts));
+ }
+ Meteor.absoluteUrl.defaultOptions = foo.defaultOptions;
+ document.addEventListener('deviceready', () => {
+ func();
+ });
+} else {
+ func();
+}
diff --git a/mobile-config.js b/mobile-config.js
new file mode 100644
index 0000000..a509450
--- /dev/null
+++ b/mobile-config.js
@@ -0,0 +1,19 @@
+App.info({
+ name: 'cookietest',
+});
+
+App.appendToConfig(`
+
+
+
+
+
+`);
+
+// use 'gap' to reuse already configured CSP settings in Meteor
+App.appendToConfig(`
+
+
+
+`);
+
diff --git a/package-lock.json b/package-lock.json
index 88148aa..9853a90 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,65 +4,83 @@
"lockfileVersion": 1,
"dependencies": {
"@babel/runtime": {
- "version": "7.6.3",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.3.tgz",
- "integrity": "sha512-kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA==",
+ "version": "7.14.0",
+ "resolved": "https://npm.rise.tech/@babel%2fruntime/-/runtime-7.14.0.tgz",
+ "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
"requires": {
- "regenerator-runtime": "^0.13.2"
+ "regenerator-runtime": "^0.13.4"
}
},
"meteor-node-stubs": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-0.4.1.tgz",
- "integrity": "sha512-UO2OStvLOKoApmOdIP5eCqoLaa/ritMXRg4ffJVdkNLEsczzPvTjgC0Mxk4cM4R8MZkwll90FYgjDf5qUTJdMA==",
+ "version": "1.0.3",
+ "resolved": "https://npm.rise.tech/meteor-node-stubs/-/meteor-node-stubs-1.0.3.tgz",
+ "integrity": "sha512-JQwIWPfM/Oa2x1Ycwn1Q0wVVQ8b0bOLv+qs4RR/D12b5dPktLlPCRhMzWzRPncZVJtfsnKKBgPLdFmJYUqAwHg==",
"requires": {
"assert": "^1.4.1",
- "browserify-zlib": "^0.1.4",
- "buffer": "^4.9.1",
+ "browserify-zlib": "^0.2.0",
+ "buffer": "^5.2.1",
"console-browserify": "^1.1.0",
"constants-browserify": "^1.0.0",
- "crypto-browserify": "^3.11.0",
- "domain-browser": "^1.1.7",
- "events": "^1.1.1",
- "https-browserify": "0.0.1",
- "os-browserify": "^0.2.1",
- "path-browserify": "0.0.0",
- "process": "^0.11.9",
- "punycode": "^1.4.1",
+ "crypto-browserify": "^3.12.0",
+ "domain-browser": "^1.2.0",
+ "elliptic": "^6.5.4",
+ "events": "^3.0.0",
+ "https-browserify": "^1.0.0",
+ "os-browserify": "^0.3.0",
+ "path-browserify": "^1.0.0",
+ "process": "^0.11.10",
+ "punycode": "^2.1.1",
"querystring-es3": "^0.2.1",
- "readable-stream": "^2.3.6",
- "stream-browserify": "^2.0.1",
- "stream-http": "^2.8.0",
- "string_decoder": "^1.1.0",
- "timers-browserify": "^1.4.2",
- "tty-browserify": "0.0.0",
+ "readable-stream": "^3.3.0",
+ "stream-browserify": "^2.0.2",
+ "stream-http": "^3.0.0",
+ "string_decoder": "^1.2.0",
+ "timers-browserify": "^2.0.10",
+ "tty-browserify": "0.0.1",
"url": "^0.11.0",
- "util": "^0.10.3",
- "vm-browserify": "0.0.4"
+ "util": "^0.11.1",
+ "vm-browserify": "^1.1.0"
},
"dependencies": {
"asn1.js": {
- "version": "4.10.1",
+ "version": "5.4.1",
"bundled": true,
"requires": {
"bn.js": "^4.0.0",
"inherits": "^2.0.1",
- "minimalistic-assert": "^1.0.0"
+ "minimalistic-assert": "^1.0.0",
+ "safer-buffer": "^2.1.0"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.12.0",
+ "bundled": true
+ }
}
},
"assert": {
- "version": "1.4.1",
+ "version": "1.5.0",
"bundled": true,
"requires": {
+ "object-assign": "^4.1.1",
"util": "0.10.3"
+ },
+ "dependencies": {
+ "util": {
+ "version": "0.10.3",
+ "bundled": true,
+ "requires": {
+ "inherits": "2.0.1"
+ }
+ }
}
},
"base64-js": {
- "version": "1.3.0",
+ "version": "1.5.1",
"bundled": true
},
"bn.js": {
- "version": "4.11.8",
+ "version": "5.2.0",
"bundled": true
},
"brorand": {
@@ -91,49 +109,57 @@
}
},
"browserify-des": {
- "version": "1.0.1",
+ "version": "1.0.2",
"bundled": true,
"requires": {
"cipher-base": "^1.0.1",
"des.js": "^1.0.0",
- "inherits": "^2.0.1"
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.1.2"
}
},
"browserify-rsa": {
- "version": "4.0.1",
+ "version": "4.1.0",
"bundled": true,
"requires": {
- "bn.js": "^4.1.0",
+ "bn.js": "^5.0.0",
"randombytes": "^2.0.1"
}
},
"browserify-sign": {
- "version": "4.0.4",
- "bundled": true,
- "requires": {
- "bn.js": "^4.1.1",
- "browserify-rsa": "^4.0.0",
- "create-hash": "^1.1.0",
- "create-hmac": "^1.1.2",
- "elliptic": "^6.0.0",
- "inherits": "^2.0.1",
- "parse-asn1": "^5.0.0"
+ "version": "4.2.1",
+ "bundled": true,
+ "requires": {
+ "bn.js": "^5.1.1",
+ "browserify-rsa": "^4.0.1",
+ "create-hash": "^1.2.0",
+ "create-hmac": "^1.1.7",
+ "elliptic": "^6.5.3",
+ "inherits": "^2.0.4",
+ "parse-asn1": "^5.1.5",
+ "readable-stream": "^3.6.0",
+ "safe-buffer": "^5.2.0"
+ },
+ "dependencies": {
+ "inherits": {
+ "version": "2.0.4",
+ "bundled": true
+ }
}
},
"browserify-zlib": {
- "version": "0.1.4",
+ "version": "0.2.0",
"bundled": true,
"requires": {
- "pako": "~0.2.0"
+ "pako": "~1.0.5"
}
},
"buffer": {
- "version": "4.9.1",
+ "version": "5.7.1",
"bundled": true,
"requires": {
- "base64-js": "^1.0.2",
- "ieee754": "^1.1.4",
- "isarray": "^1.0.0"
+ "base64-js": "^1.3.1",
+ "ieee754": "^1.1.13"
}
},
"buffer-xor": {
@@ -153,11 +179,8 @@
}
},
"console-browserify": {
- "version": "1.1.0",
- "bundled": true,
- "requires": {
- "date-now": "^0.1.4"
- }
+ "version": "1.2.0",
+ "bundled": true
},
"constants-browserify": {
"version": "1.0.0",
@@ -168,11 +191,17 @@
"bundled": true
},
"create-ecdh": {
- "version": "4.0.3",
+ "version": "4.0.4",
"bundled": true,
"requires": {
"bn.js": "^4.1.0",
- "elliptic": "^6.0.0"
+ "elliptic": "^6.5.3"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.12.0",
+ "bundled": true
+ }
}
},
"create-hash": {
@@ -215,12 +244,8 @@
"randomfill": "^1.0.3"
}
},
- "date-now": {
- "version": "0.1.4",
- "bundled": true
- },
"des.js": {
- "version": "1.0.0",
+ "version": "1.0.1",
"bundled": true,
"requires": {
"inherits": "^2.0.1",
@@ -234,6 +259,12 @@
"bn.js": "^4.1.0",
"miller-rabin": "^4.0.0",
"randombytes": "^2.0.0"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.12.0",
+ "bundled": true
+ }
}
},
"domain-browser": {
@@ -241,20 +272,30 @@
"bundled": true
},
"elliptic": {
- "version": "6.4.0",
+ "version": "6.5.4",
"bundled": true,
"requires": {
- "bn.js": "^4.4.0",
- "brorand": "^1.0.1",
+ "bn.js": "^4.11.9",
+ "brorand": "^1.1.0",
"hash.js": "^1.0.0",
- "hmac-drbg": "^1.0.0",
- "inherits": "^2.0.1",
- "minimalistic-assert": "^1.0.0",
- "minimalistic-crypto-utils": "^1.0.0"
+ "hmac-drbg": "^1.0.1",
+ "inherits": "^2.0.4",
+ "minimalistic-assert": "^1.0.1",
+ "minimalistic-crypto-utils": "^1.0.1"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.12.0",
+ "bundled": true
+ },
+ "inherits": {
+ "version": "2.0.4",
+ "bundled": true
+ }
}
},
"events": {
- "version": "1.1.1",
+ "version": "3.3.0",
"bundled": true
},
"evp_bytestokey": {
@@ -266,23 +307,30 @@
}
},
"hash-base": {
- "version": "3.0.4",
+ "version": "3.1.0",
"bundled": true,
"requires": {
- "inherits": "^2.0.1",
- "safe-buffer": "^5.0.1"
+ "inherits": "^2.0.4",
+ "readable-stream": "^3.6.0",
+ "safe-buffer": "^5.2.0"
+ },
+ "dependencies": {
+ "inherits": {
+ "version": "2.0.4",
+ "bundled": true
+ }
}
},
"hash.js": {
- "version": "1.1.3",
+ "version": "1.1.7",
"bundled": true,
"requires": {
"inherits": "^2.0.3",
- "minimalistic-assert": "^1.0.0"
+ "minimalistic-assert": "^1.0.1"
},
"dependencies": {
"inherits": {
- "version": "2.0.3",
+ "version": "2.0.4",
"bundled": true
}
}
@@ -297,15 +345,11 @@
}
},
"https-browserify": {
- "version": "0.0.1",
+ "version": "1.0.0",
"bundled": true
},
"ieee754": {
- "version": "1.1.11",
- "bundled": true
- },
- "indexof": {
- "version": "0.0.1",
+ "version": "1.2.1",
"bundled": true
},
"inherits": {
@@ -317,11 +361,12 @@
"bundled": true
},
"md5.js": {
- "version": "1.3.4",
+ "version": "1.3.5",
"bundled": true,
"requires": {
"hash-base": "^3.0.0",
- "inherits": "^2.0.1"
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.1.2"
}
},
"miller-rabin": {
@@ -330,6 +375,12 @@
"requires": {
"bn.js": "^4.0.0",
"brorand": "^1.0.1"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.12.0",
+ "bundled": true
+ }
}
},
"minimalistic-assert": {
@@ -340,31 +391,35 @@
"version": "1.0.1",
"bundled": true
},
+ "object-assign": {
+ "version": "4.1.1",
+ "bundled": true
+ },
"os-browserify": {
- "version": "0.2.1",
+ "version": "0.3.0",
"bundled": true
},
"pako": {
- "version": "0.2.9",
+ "version": "1.0.11",
"bundled": true
},
"parse-asn1": {
- "version": "5.1.1",
+ "version": "5.1.6",
"bundled": true,
"requires": {
- "asn1.js": "^4.0.0",
+ "asn1.js": "^5.2.0",
"browserify-aes": "^1.0.0",
- "create-hash": "^1.1.0",
"evp_bytestokey": "^1.0.0",
- "pbkdf2": "^3.0.3"
+ "pbkdf2": "^3.0.3",
+ "safe-buffer": "^5.1.1"
}
},
"path-browserify": {
- "version": "0.0.0",
+ "version": "1.0.1",
"bundled": true
},
"pbkdf2": {
- "version": "3.0.16",
+ "version": "3.1.1",
"bundled": true,
"requires": {
"create-hash": "^1.1.2",
@@ -379,22 +434,29 @@
"bundled": true
},
"process-nextick-args": {
- "version": "2.0.0",
+ "version": "2.0.1",
"bundled": true
},
"public-encrypt": {
- "version": "4.0.2",
+ "version": "4.0.3",
"bundled": true,
"requires": {
"bn.js": "^4.1.0",
"browserify-rsa": "^4.0.0",
"create-hash": "^1.1.0",
"parse-asn1": "^5.0.0",
- "randombytes": "^2.0.1"
+ "randombytes": "^2.0.1",
+ "safe-buffer": "^5.1.2"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.12.0",
+ "bundled": true
+ }
}
},
"punycode": {
- "version": "1.4.1",
+ "version": "2.1.1",
"bundled": true
},
"querystring": {
@@ -406,7 +468,7 @@
"bundled": true
},
"randombytes": {
- "version": "2.0.6",
+ "version": "2.1.0",
"bundled": true,
"requires": {
"safe-buffer": "^5.1.0"
@@ -421,20 +483,16 @@
}
},
"readable-stream": {
- "version": "2.3.6",
+ "version": "3.6.0",
"bundled": true,
"requires": {
- "core-util-is": "~1.0.0",
- "inherits": "~2.0.3",
- "isarray": "~1.0.0",
- "process-nextick-args": "~2.0.0",
- "safe-buffer": "~5.1.1",
- "string_decoder": "~1.1.1",
- "util-deprecate": "~1.0.1"
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
},
"dependencies": {
"inherits": {
- "version": "2.0.3",
+ "version": "2.0.4",
"bundled": true
}
}
@@ -448,7 +506,15 @@
}
},
"safe-buffer": {
- "version": "5.1.2",
+ "version": "5.2.1",
+ "bundled": true
+ },
+ "safer-buffer": {
+ "version": "2.1.2",
+ "bundled": true
+ },
+ "setimmediate": {
+ "version": "1.0.5",
"bundled": true
},
"sha.js": {
@@ -460,44 +526,77 @@
}
},
"stream-browserify": {
- "version": "2.0.1",
+ "version": "2.0.2",
"bundled": true,
"requires": {
"inherits": "~2.0.1",
"readable-stream": "^2.0.2"
+ },
+ "dependencies": {
+ "readable-stream": {
+ "version": "2.3.7",
+ "bundled": true,
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ },
+ "dependencies": {
+ "inherits": {
+ "version": "2.0.4",
+ "bundled": true
+ }
+ }
+ },
+ "safe-buffer": {
+ "version": "5.1.2",
+ "bundled": true
+ },
+ "string_decoder": {
+ "version": "1.1.1",
+ "bundled": true,
+ "requires": {
+ "safe-buffer": "~5.1.0"
+ }
+ }
}
},
"stream-http": {
- "version": "2.8.1",
+ "version": "3.1.1",
"bundled": true,
"requires": {
"builtin-status-codes": "^3.0.0",
- "inherits": "^2.0.1",
- "readable-stream": "^2.3.3",
- "to-arraybuffer": "^1.0.0",
- "xtend": "^4.0.0"
+ "inherits": "^2.0.4",
+ "readable-stream": "^3.6.0",
+ "xtend": "^4.0.2"
+ },
+ "dependencies": {
+ "inherits": {
+ "version": "2.0.4",
+ "bundled": true
+ }
}
},
"string_decoder": {
- "version": "1.1.1",
+ "version": "1.3.0",
"bundled": true,
"requires": {
- "safe-buffer": "~5.1.0"
+ "safe-buffer": "~5.2.0"
}
},
"timers-browserify": {
- "version": "1.4.2",
+ "version": "2.0.12",
"bundled": true,
"requires": {
- "process": "~0.11.0"
+ "setimmediate": "^1.0.4"
}
},
- "to-arraybuffer": {
- "version": "1.0.1",
- "bundled": true
- },
"tty-browserify": {
- "version": "0.0.0",
+ "version": "0.0.1",
"bundled": true
},
"url": {
@@ -515,10 +614,16 @@
}
},
"util": {
- "version": "0.10.3",
+ "version": "0.11.1",
"bundled": true,
"requires": {
- "inherits": "2.0.1"
+ "inherits": "2.0.3"
+ },
+ "dependencies": {
+ "inherits": {
+ "version": "2.0.3",
+ "bundled": true
+ }
}
},
"util-deprecate": {
@@ -526,28 +631,25 @@
"bundled": true
},
"vm-browserify": {
- "version": "0.0.4",
- "bundled": true,
- "requires": {
- "indexof": "0.0.1"
- }
+ "version": "1.1.2",
+ "bundled": true
},
"xtend": {
- "version": "4.0.1",
+ "version": "4.0.2",
"bundled": true
}
}
},
"prettier": {
- "version": "1.18.2",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz",
- "integrity": "sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==",
+ "version": "2.3.0",
+ "resolved": "https://npm.rise.tech/prettier/-/prettier-2.3.0.tgz",
+ "integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==",
"dev": true
},
"regenerator-runtime": {
- "version": "0.13.3",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
- "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
+ "version": "0.13.7",
+ "resolved": "https://npm.rise.tech/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+ "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
}
}
}
diff --git a/package.json b/package.json
index c351c9b..577aef3 100644
--- a/package.json
+++ b/package.json
@@ -4,13 +4,13 @@
"scripts": {
"start": "ROOT_URL=http://localhost:3001 meteor run --port 3001",
"start:android": "ROOT_URL=http://localhost:3001 meteor run android --port 3001",
- "start:ios": "ROOT_URL=http://localhost:3001 meteor run ios --port 3001",
+ "start:ios": "ROOT_URL=http://localhost:3001 meteor run ios --port 3001 --mobile-server 192.168.1.48:3001",
"prettier:check": "prettier --check '**/*.js'",
"prettier:write": "prettier --write '**/*.js'"
},
"dependencies": {
- "@babel/runtime": "^7.6.3",
- "meteor-node-stubs": "^0.4.1"
+ "@babel/runtime": "^7.14.0",
+ "meteor-node-stubs": "^1.0.3"
},
"meteor": {
"mainModule": {
@@ -19,6 +19,6 @@
}
},
"devDependencies": {
- "prettier": "^1.18.2"
+ "prettier": "^2.3.0"
}
}
diff --git a/packages/Meteor-Cookies b/packages/Meteor-Cookies
deleted file mode 160000
index 4c00c78..0000000
--- a/packages/Meteor-Cookies
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4c00c782348b8f390af6c48f06f68e4edbdc87c4
diff --git a/server/main.js b/server/main.js
index ec29d8d..fdbf645 100644
--- a/server/main.js
+++ b/server/main.js
@@ -2,7 +2,8 @@ import { Cookies } from "meteor/ostrio:cookies";
new Cookies({
auto: true,
- allowQueryStringCookies: true
+ allowQueryStringCookies: true,
+ allowedCordovaOrigins: true,
});
WebApp.connectHandlers.use("/__cookie_reset", (req, res) => {