Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions spec/GridFSBucketStorageAdapter.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -475,4 +475,14 @@ describe_only_db('mongo')('GridFSBucket', () => {
expect(e.message).toEqual('Client must be connected before running operations');
}
});

it('pass metadata to MongoClient', async () => {
const pkg = require('../package.json');
const gfsAdapter = new GridFSBucketAdapter(databaseURI);
await gfsAdapter._connect();
expect(gfsAdapter._client.s.options.driverInfo).toEqual({
name: 'Parse Server',
version: pkg.version,
});
});
});
10 changes: 10 additions & 0 deletions spec/MongoStorageAdapter.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,16 @@ describe_only_db('mongo')('MongoStorageAdapter', () => {
expect(schemaAfterDeletion.fields.test).toBeUndefined();
});

it('pass metadata to MongoClient', async () => {
const pkg = require('../package.json');
const adapter = new MongoStorageAdapter({ uri: databaseURI });
await adapter.connect();
expect(adapter.client.s.options.driverInfo).toEqual({
name: 'Parse Server',
version: pkg.version,
});
});

if (process.env.MONGODB_TOPOLOGY === 'replicaset') {
describe('transactions', () => {
const headers = {
Expand Down
8 changes: 7 additions & 1 deletion src/Adapters/Files/GridFSBucketAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import { MongoClient, GridFSBucket, Db } from 'mongodb';
import { FilesAdapter, validateFilename } from './FilesAdapter';
import defaults, { ParseServerDatabaseOptions } from '../../defaults';
import pkg from '../../../package.json';
const crypto = require('crypto');

export class GridFSBucketAdapter extends FilesAdapter {
Expand Down Expand Up @@ -45,7 +46,12 @@ export class GridFSBucketAdapter extends FilesAdapter {

_connect() {
if (!this._connectionPromise) {
this._connectionPromise = MongoClient.connect(this._databaseURI, this._mongoOptions).then(
// Add wrapping library metadata.
const driverInfo = {
name: 'Parse Server',
version: pkg.version,
};
this._connectionPromise = MongoClient.connect(this._databaseURI, { ...this._mongoOptions, driverInfo }).then(
client => {
this._client = client;
return client.db(client.s.options.dbName);
Expand Down
8 changes: 7 additions & 1 deletion src/Adapters/Storage/Mongo/MongoStorageAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import _ from 'lodash';
import defaults, { ParseServerDatabaseOptions } from '../../../defaults';
import logger from '../../../logger';
import Utils from '../../../Utils';
import pkg from '../../../../package.json';

// @flow-disable-next
const mongodb = require('mongodb');
Expand Down Expand Up @@ -179,7 +180,12 @@ export class MongoStorageAdapter implements StorageAdapter {
// parsing and re-formatting causes the auth value (if there) to get URI
// encoded
const encodedUri = formatUrl(parseUrl(this._uri));
this.connectionPromise = MongoClient.connect(encodedUri, this._mongoOptions)
// Add wrapping library metadata.
const driverInfo = {
name: 'Parse Server',
version: pkg.version,
}
this.connectionPromise = MongoClient.connect(encodedUri, { ...this._mongoOptions, driverInfo })
.then(client => {
// Starting mongoDB 3.0, the MongoClient.connect don't return a DB anymore but a client
// Fortunately, we can get back the options and use them to select the proper DB.
Expand Down
Loading