Merge pull request #741 from VeliovGroup/dev

📦v1.14.1

.versions

@@ -1,18 +1,18 @@
 [email protected]
-[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
-boilerplate-generator@1.6.0
+boilerplate-generator@1.7.0
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
-[email protected].1
-[email protected].2
+[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
@@ -21,32 +21,32 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
-local-test:ostrio:[email protected].0
+[email protected].1
+local-test:ostrio:[email protected].1
 [email protected]
 [email protected]
-minimongo@1.4.5
-[email protected].4
+minimongo@1.6.0
+[email protected].5
 [email protected]
 [email protected]
-mongo@1.8.0
+mongo@1.10.0
 [email protected]
 [email protected]
 [email protected]
-npm-mongo@3.3.0
+npm-mongo@3.7.0
 [email protected]
 ostrio:[email protected]
-ostrio:[email protected].0
+ostrio:[email protected].1
 [email protected]
-random@1.1.0
+random@1.2.0
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-socket-stream-client@0.2.2
+socket-stream-client@0.3.0
 [email protected]
 [email protected]
 [email protected]
-url@1.2.0
-webapp@1.8.0
+url@1.3.0
+webapp@1.9.1
 [email protected]

client.js

@@ -8,7 +8,7 @@ import FilesCollectionCore from './core.js';
 import { formatFleURL, helpers } from './lib.js';
 
 const NOOP = () => { };
-const allowedParams = ['debug', 'ddp', 'schema', 'public', 'chunkSize', 'downloadRoute', 'collection', 'collectionName', 'namingFunction', 'onBeforeUpload', 'allowClientCode', 'onbeforeunloadMessage', 'disableUpload'];
+const allowedParams = ['debug', 'ddp', 'schema', 'public', 'chunkSize', 'downloadRoute', 'collection', 'collectionName', 'namingFunction', 'onBeforeUpload', 'allowClientCode', 'onbeforeunloadMessage', 'disableUpload', 'allowQueryStringCookies'];
 
 /*
  * @locus Anywhere
@@ -110,6 +110,9 @@ export class FilesCollection extends FilesCollectionCore {
     const setTokenCookie = () => {
       if (Meteor.connection._lastSessionId) {
         cookie.set('x_mtok', Meteor.connection._lastSessionId, { path: '/' });
+        if (Meteor.isCordova && this.allowQueryStringCookies) {
+          cookie.send();
+        }
       }
     };
 

docs/gridfs-migration.md

@@ -1,30 +1,30 @@
-### Migrating files from GridFS between applications
+# Migrating files from GridFS between applications
 
 You can share/migrate files between Meteor applications via DDP on a server/database level **without the need for complex setups**.
 This is due to the circumstance, that GridFS makes use of a normal Mongo.Collection to store metadata and chunks.
 
 This topic can be of relevance for Services or Microservices, that don't share a database but have to share their data.
 
-##### Use Case
+## Use Case
 
 Consider two Meteor applications **C (Consumer)** and **P (Provider)** where C wants to synchronize all files from P.
 The sync will happen without clients (browsers/devices) being involved and the files and documents won't be mutated.
-
 
-##### Step 1 Provide access to the files
+### Step 1 Provide access to the files
 
 First create three Methods in P that each share one of the three crucial Parts of a `FilesCollection`:
 
-* Sharing the `FilesCollection`'s documents
-* Sharing the `fs.files`* metadata for the files' respective subversions
-* Sharing the `fs.chunks`* (the actual data) of all stored files and their subversions
+- Sharing the `FilesCollection`'s documents
+- Sharing the `fs.files`* metadata for the files' respective subversions
+- Sharing the `fs.chunks`* (the actual data) of all stored files and their subversions
 
-*This assumes the [default configuration of your GridFS](https://github.com/VeliovGroup/Meteor-Files/wiki/GridFS-Integration) whichs by default using the `db.fs.files` and `db.fs.chunks` collections.
-For custom configuration you may consult the JS Mongo Driver documentation on [GridFSBucket](http://mongodb.github.io/node-mongodb-native/3.2/api/GridFSBucket.html).
+*This assumes the [default configuration of your GridFS](https://github.com/VeliovGroup/Meteor-Files/wiki/GridFS-Integration) which is by default using the `db.fs.files` and `db.fs.chunks` collections.*
 
-*P/server/sync.js*
+*For custom configuration you may consult the JS Mongo Native Driver documentation on [GridFSBucket](http://mongodb.github.io/node-mongodb-native/3.2/api/GridFSBucket.html).*
 
-```javascript
+#### P/server/sync.js
+
+```js
 import { Meteor } from 'meteor/meteor'
 import { Mongo } from 'meteor/mongo'
 import { FilesCollection } from 'meteor/ostrio:files'
@@ -49,11 +49,11 @@ function getFilesChunks () {
 Meteor.methods({getFilesDocuments, getFilesMetadata, getFilesChunks})
 ```
 
-##### Step 2 Create collections and sync method in C
+### Step 2 Create collections and sync method in C
 
-*C/server/sync.js*
+#### C/server/sync.js
 
-```javascript
+```js
 import { Meteor } from 'meteor/meteor'
 import { Mongo } from 'meteor/mongo'
 import { DDP } from 'meteor/ddp-client'
@@ -109,30 +109,27 @@ function synchronize (trackerComputation) {
 // ... code continues in the next step
 ```
 
-
-##### Step 3 Create a remote DDP connection and run the sync
+### Step 3 Create a remote DDP connection and run the sync
 
 In your Consumer application C you can now connect to the remote app on the server-side.
-
 
-*C/server/sync.js (continued)*
+#### C/server/sync.js (continued)
 
 ```javascript
 Meteor.startup(() => {
   const url = 'p.domain.tld' // get url of P, for example via process.env or Meteor.settings
   remoteConnection = DDP.connect(url)
- 
+
   // use Tracker to run the sync when the remoteConnection is "connected"
   const synchronizeTracker = Meteor.bindEnvironment(synchronize)
   Tracker.autorun(synchronizeTracker)
 })
 
 ```
 
-
-##### Further considerations
+### Further considerations
 
 You may require authentication for the remote connection, which can be added using [`ongoworks:ddp-login`](https://github.com/reactioncommerce/meteor-ddp-login).
 A good pattern is to create a user that is only permitted to run the sync methods in P and login with that user from C. The credentials for login can be passed using `process.env` or `Meteor.settings`.
 
-From this point you can configure your methods to sync only a subset of documents or manipulate them before/after sync or remove them after sync.
+From this point you can configure your methods to sync only a subset of documents or manipulate them before/after sync or remove them after sync.

package.js

@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ostrio:files',
-  version: '1.14.0',
+  version: '1.14.1',
   summary: 'Upload files to Meteor application, with 3rd party storage support: AWS:S3, GridFS and other',
   git: 'https://github.com/VeliovGroup/Meteor-Files',
   documentation: 'README.md'
@@ -9,7 +9,7 @@ Package.describe({
 Npm.depends({
   'fs-extra': '8.1.0',
   request: '2.88.2',
-  'file-type': '14.1.3',
+  'file-type': '14.2.0',
   eventemitter3: '4.0.0'
 });