fixing #17

vitaly-t · Jul 5, 2019 · c2bdcbb · c2bdcbb
1 parent 6aaa71d
commit c2bdcbb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,8 +1,7 @@
 {
   "env": {
     "es6": false,
-    "node": true,
-    "jasmine": true
+    "node": true
   },
   "extends": "eslint:recommended",
   "parserOptions": {

diff --git a/src/index.js b/src/index.js
@@ -168,13 +168,10 @@
         if (this.protocol) {
             s += encode(this.protocol, options).replace(/%3A/g, ':') + '://';
         }
-        if (this.user) {
-            s += encode(this.user, options);
-            if (this.password) {
-                s += ':' + encode(this.password, options);
+        if (this.user || this.password) {
+            if (this.user) {
+                s += encode(this.user, options);
             }
-            s += '@';
-        } else {
             if (this.password) {
                 s += ':';
                 var h = options.passwordHash;
@@ -184,8 +181,8 @@
                 } else {
                     s += encode(this.password, options);
                 }
-                s += '@';
             }
+            s += '@';
         }
         if (Array.isArray(this.hosts)) {
             s += this.hosts.map(function (h) {

diff --git a/test/mainSpec.js b/test/mainSpec.js
@@ -424,7 +424,9 @@ describe('toString', () => {
         expect(a.toString()).toBe('');
     });
     it('must secure passwords', () => {
+        expect(parse('user:abc@').toString({passwordHash: true})).toBe('user:###@');
         expect(parse(':abc@').toString({passwordHash: true})).toBe(':###@');
+        expect(parse('user:abc@').toString({passwordHash: '123'})).toBe('user:111@');
         expect(parse(':abc@').toString({passwordHash: '123'})).toBe(':111@');
     });
 });