password-service 0.0.1 → 0.0.2

package/lib/index.js

@@ -99,16 +99,13 @@ var PasswordService = (function () {
             }
             _a.label = 5;
           case 5:
-            if (!this.hasTwoFactors) return [3, 15];
+            if (!this.hasTwoFactors) return [3, 16];
             return [4, this.hasTwoFactors(user.id)];
           case 6:
             required = _a.sent();
-            if (!required) return [3, 15];
-            if (!pass.passcode || pass.passcode.length === 0) {
-              return [2, 0];
-            }
+            if (!required) return [3, 16];
             repo = (this.passcodeRepository ? this.passcodeRepository : this.resetCodeRepository);
-            if (!(!pass.step || pass.step <= 0)) return [3, 11];
+            if (!(!pass.step || pass.step <= 1)) return [3, 11];
             sentCode = this.generate();
             return [4, this.comparator.hash(sentCode)];
           case 7:
@@ -124,8 +121,12 @@ var PasswordService = (function () {
           case 9:
             _a.sent();
             return [2, 2];
-          case 10: return [3, 15];
-          case 11: return [4, repo.load(user.id)];
+          case 10: return [3, 16];
+          case 11:
+            if (!pass.passcode || pass.passcode.length === 0) {
+              return [2, 0];
+            }
+            return [4, repo.load(user.id)];
           case 12:
             code = _a.sent();
             if (!code) {
@@ -137,25 +138,26 @@ var PasswordService = (function () {
             return [4, this.comparator.compare(pass.passcode, code.code)];
           case 13:
             validPasscode = _a.sent();
-            if (!!validPasscode) return [3, 15];
-            return [4, repo.delete(user.id)];
-          case 14:
-            _a.sent();
+            if (!!validPasscode) return [3, 14];
             return [2, 0];
-          case 15: return [4, this.comparator.hash(pass.password)];
-          case 16:
+          case 14: return [4, repo.delete(user.id)];
+          case 15:
+            _a.sent();
+            _a.label = 16;
+          case 16: return [4, this.comparator.hash(pass.password)];
+          case 17:
             newPassword = _a.sent();
             return [4, this.repository.update(user.id, newPassword, user.password)];
-          case 17:
+          case 18:
             res = _a.sent();
-            if (!(res > 0)) return [3, 20];
-            if (!this.revokeTokens) return [3, 19];
+            if (!(res > 0)) return [3, 21];
+            if (!this.revokeTokens) return [3, 20];
             return [4, this.revokeTokens('' + user.id, 'The user has changed password.')];
-          case 18:
+          case 19:
             _a.sent();
-            _a.label = 19;
-          case 19: return [2, 1];
-          case 20: return [2, 0];
+            _a.label = 20;
+          case 20: return [2, 1];
+          case 21: return [2, 0];
         }
       });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "password-service",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "password",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/index.ts

@@ -127,11 +127,8 @@ export class PasswordService<ID> {
     if (this.hasTwoFactors) {
       const required = await this.hasTwoFactors(user.id);
       if (required) {
-        if (!pass.passcode || pass.passcode.length === 0) {
-          return 0;
-        }
         const repo = (this.passcodeRepository ? this.passcodeRepository : this.resetCodeRepository);
-        if (!pass.step || pass.step <= 0) {
+        if (!pass.step || pass.step <= 1) {
           const sentCode = this.generate();
           const savedCode = await this.comparator.hash(sentCode);
           const expires = (this.passwordChangeExpires ? this.passwordChangeExpires : this.expires);
@@ -143,6 +140,9 @@ export class PasswordService<ID> {
             return 2;
           }
         } else {
+          if (!pass.passcode || pass.passcode.length === 0) {
+            return 0;
+          }
           const code = await repo.load(user.id);
           if (!code) {
             return 0;
@@ -152,8 +152,9 @@ export class PasswordService<ID> {
           }
           const validPasscode = await this.comparator.compare(pass.passcode, code.code);
           if (!validPasscode) {
-            await repo.delete(user.id);
             return 0;
+          } else {
+            await repo.delete(user.id);
           }
         }
       }