@@ -4,13 +4,13 @@ const applyWriteConcern = require('../utils').applyWriteConcern;
4
4
const Code = require ( 'mongodb-core' ) . BSON . Code ;
5
5
const resolveReadPreference = require ( '../utils' ) . resolveReadPreference ;
6
6
const crypto = require ( 'crypto' ) ;
7
- const Db = require ( '../db' ) ;
8
7
const debugOptions = require ( '../utils' ) . debugOptions ;
9
8
const handleCallback = require ( '../utils' ) . handleCallback ;
10
9
const MongoError = require ( 'mongodb-core' ) . MongoError ;
11
10
const parseIndexOptions = require ( '../utils' ) . parseIndexOptions ;
12
11
const ReadPreference = require ( 'mongodb-core' ) . ReadPreference ;
13
12
const toError = require ( '../utils' ) . toError ;
13
+ const CONSTANTS = require ( '../constants' ) ;
14
14
15
15
const count = require ( './collection_ops' ) . count ;
16
16
const findOne = require ( './collection_ops' ) . findOne ;
@@ -64,6 +64,8 @@ const illegalCommandFields = [
64
64
* @param {Db~resultCallback } [callback] The command result callback
65
65
*/
66
66
function addUser ( db , username , password , options , callback ) {
67
+ const Db = require ( '../db' ) ;
68
+
67
69
// Did the user destroy the topology
68
70
if ( db . serverConfig && db . serverConfig . isDestroyed ( ) )
69
71
return callback ( new MongoError ( 'topology was destroyed' ) ) ;
@@ -83,7 +85,7 @@ function addUser(db, username, password, options, callback) {
83
85
const db = options . dbName ? new Db ( options . dbName , db . s . topology , db . s . options ) : db ;
84
86
85
87
// Fetch a user collection
86
- const collection = db . collection ( Db . SYSTEM_USER_COLLECTION ) ;
88
+ const collection = db . collection ( CONSTANTS . SYSTEM_USER_COLLECTION ) ;
87
89
88
90
// Check if we are inserting the first user
89
91
count ( collection , { } , finalOptions , ( err , count ) => {
@@ -296,7 +298,7 @@ function createIndex(db, name, fieldOrSpec, options, callback) {
296
298
finalOptions . checkKeys = false ;
297
299
// Insert document
298
300
db . s . topology . insert (
299
- `${ db . s . databaseName } .${ Db . SYSTEM_INDEX_COLLECTION } ` ,
301
+ `${ db . s . databaseName } .${ CONSTANTS . SYSTEM_INDEX_COLLECTION } ` ,
300
302
doc ,
301
303
finalOptions ,
302
304
( err , result ) => {
@@ -630,6 +632,8 @@ function profilingLevel(db, options, callback) {
630
632
* @param {Db~resultCallback } [callback] The command result callback
631
633
*/
632
634
function removeUser ( db , username , options , callback ) {
635
+ const Db = require ( '../db' ) ;
636
+
633
637
// Attempt to execute command
634
638
executeAuthRemoveUserCommand ( db , username , options , ( err , result ) => {
635
639
if ( err && err . code === - 5000 ) {
@@ -638,7 +642,7 @@ function removeUser(db, username, options, callback) {
638
642
const db = options . dbName ? new Db ( options . dbName , db . s . topology , db . s . options ) : db ;
639
643
640
644
// Fetch a user collection
641
- const collection = db . collection ( Db . SYSTEM_USER_COLLECTION ) ;
645
+ const collection = db . collection ( CONSTANTS . SYSTEM_USER_COLLECTION ) ;
642
646
643
647
// Locate the user
644
648
findOne ( collection , { user : username } , finalOptions , ( err , user ) => {
0 commit comments