Merge pull request #50 from hapinessjs/next

Next

Author: juneil

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hapiness/mongo",
-    "version": "2.0.2",
+    "version": "2.0.3",
     "description": "Hapiness Module for MongoDB usage",
     "main": "commonjs/index.js",
     "types": "index.d.ts",

src/module/adapters/hapiness-mongo-adapter.ts

@@ -64,7 +64,7 @@ export class HapinessMongoAdapter extends EventEmitter {
     }
 
     public tryConnect(): Observable<void> {
-        __debugger.debug('tryConnect', `connecting to ${this._uri}`);
+        __debugger.debug('tryConnect', `connecting to ${UtilFunctions.hideCredentials(this._uri)}`);
         this.emit('connecting', { uri: this._uri });
         return this
             ._tryConnect()
@@ -127,7 +127,7 @@ export class HapinessMongoAdapter extends EventEmitter {
     }
 
     protected onDisconnected(): Observable<void> {
-        __debugger.debug('onDisconnected', `disconnected from ${this._uri}`);
+        __debugger.debug('onDisconnected', `disconnected from ${UtilFunctions.hideCredentials(this._uri)}`);
 
         this.emit('disconnected', { uri: this._uri });
 

src/module/adapters/mongoose-adapter.ts

@@ -3,7 +3,7 @@ import { Connection, Mongoose } from 'mongoose';
 
 import { Observable } from 'rxjs/Observable';
 import { HapinessMongoAdapter } from './hapiness-mongo-adapter';
-import { Debugger } from '../shared';
+import { Debugger, UtilFunctions } from '../shared';
 
 const __debugger = new Debugger('MongooseAdapter');
 
@@ -35,12 +35,12 @@ export class MongooseAdapter extends HapinessMongoAdapter {
                 this._connection = mongoose.createConnection(this._uri, connectOptions);
 
                 this._connection.on('connected', () => {
-                    __debugger.debug('on#connected', `connected to ${this._uri}`);
+                    __debugger.debug('on#connected', `connected to ${UtilFunctions.hideCredentials(this._uri)}`);
                     this.emit('connected', { uri: this._uri });
                 });
 
                 this._connection.on('reconnectFailed', () => {
-                    __debugger.debug('on#reconnectFailed', `reconnectFailed on ${this._uri}`);
+                    __debugger.debug('on#reconnectFailed', `reconnectFailed on ${UtilFunctions.hideCredentials(this._uri)}`);
                     this.emit('reconnectFailed', { uri: this._uri });
                 });
 
@@ -65,7 +65,7 @@ export class MongooseAdapter extends HapinessMongoAdapter {
 
                 this._connection.on('error', (...args) => this.emit('error', ...args));
                 this._connection.on('disconnected', () => {
-                    __debugger.debug('on#disconnected', `disconnected from ${this._uri}`);
+                    __debugger.debug('on#disconnected', `disconnected from ${UtilFunctions.hideCredentials(this._uri)}`);
                     this.emit('disconnected', { uri: this._uri });
                 });
 

src/module/mongo.extension.ts

@@ -65,7 +65,7 @@ export class MongoClientExt implements OnExtensionLoad, OnModuleInstantiated, On
     }
 
     loadAdapters(mongoManager: MongoManager, adaptersToLoad: HapinessLoadAdapterConfig[]): Observable<void> {
-        __debugger.debug('loadAdapters', `Params => ${JSON.stringify(adaptersToLoad, null, 2)}`);
+        __debugger.debug('loadAdapters', '');
         return Observable
             .create(
                 observer => {

src/module/shared/funct.ts

@@ -1,6 +1,15 @@
 import * as Url from 'url';
 
 export class UtilFunctions {
+
+    public static hideCredentials(uri: string): string {
+        if (!uri || !uri.length) {
+            return '';
+        }
+
+        return uri.replace(/\/\/.*@/, '//***:***@');
+    }
+
     public static getMongoUri(dbUrl: string, db?: string) {
         // If no db is provided we wannot append the db in the url
         if (!db) {
@@ -19,4 +28,5 @@ export class UtilFunctions {
 
         return [dbUrl, db].join('/');
     }
+
 }