password-service 0.0.3 → 0.0.4

package/lib/index.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
   });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-  var _ = { label: 0, sent: function () { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-  return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function () { return this; }), g;
+  var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+  return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
   function verb(n) { return function (v) { return step([n, v]); }; }
   function step(op) {
     if (f) throw new TypeError("Generator is already executing.");
@@ -88,7 +88,7 @@ var PasswordService = (function () {
               return [2, 0];
             }
             if (!(this.duplicateCount > 0)) return [3, 5];
-            return [4, this.repository.getHistory(user.id, this.duplicateCount - 1)];
+            return [4, this.repository.getHistory(user.id, this.duplicateCount)];
           case 3:
             histories = _a.sent();
             return [4, this.duplicate(pass.password, this.duplicateCount, user.password, histories)];
@@ -218,7 +218,7 @@ var PasswordService = (function () {
           case 6:
             newPassword = _a.sent();
             if (!(this.duplicateCount > 0)) return [3, 9];
-            return [4, this.repository.getHistory(user.id, this.duplicateCount - 1)];
+            return [4, this.repository.getHistory(user.id, this.duplicateCount)];
           case 7:
             histories = _a.sent();
             return [4, this.duplicate(pass.password, this.duplicateCount, user.password, histories)];
@@ -261,7 +261,7 @@ var PasswordService = (function () {
             _a.label = 2;
           case 2:
             if (!(histories && histories.length > 0)) return [3, 6];
-            length = Math.min(count - 2, histories.length);
+            length = Math.min(count, histories.length);
             l = histories.length;
             i = 1;
             _a.label = 3;
@@ -362,7 +362,7 @@ var Repository = (function () {
     this.tables = tables;
     this.changedTime = changedTime;
     this.failCount = failCount;
-    this.max = (max !== undefined ? max : 8);
+    this.max = (max !== undefined ? max + 1 : 8);
     this.id = (id && id.length > 0 ? id : 'id');
     this.username = (username && username.length > 0 ? username : 'username');
     this.contact = (contact && contact.length > 0 ? contact : 'email');
@@ -373,13 +373,13 @@ var Repository = (function () {
     this.getHistory = this.getHistory.bind(this);
   }
   Repository.prototype.getUser = function (userNameOrEmail, exludePassword) {
-    var query = "\n        select " + this.id + " as id, " + this.username + " as username, " + this.contact + " as contact from " + this.tables.user + " where " + this.username + " = " + this.db.param(1) + " union\n        select " + this.id + " as id, " + this.username + " as username, " + this.contact + " as contact from " + this.tables.user + " where " + this.contact + " = " + this.db.param(2);
+    var query = "\n    select " + this.id + " as id, " + this.username + " as username, " + this.contact + " as contact from " + this.tables.user + " where " + this.username + " = " + this.db.param(1) + " union\n    select " + this.id + " as id, " + this.username + " as username, " + this.contact + " as contact from " + this.tables.user + " where " + this.contact + " = " + this.db.param(2);
     if (!exludePassword) {
       if (this.tables.user === this.tables.password) {
-        query = "\n          select " + this.id + " as id, " + this.username + " as username, " + this.contact + " as contact, " + this.password + " as password from " + this.tables.user + " where " + this.username + " = " + this.db.param(1) + " union\n          select " + this.id + " as id, " + this.username + " as username, " + this.contact + " as contact, " + this.password + " as password from " + this.tables.user + " where " + this.contact + " = " + this.db.param(2);
+        query = "\n      select " + this.id + " as id, " + this.username + " as username, " + this.contact + " as contact, " + this.password + " as password from " + this.tables.user + " where " + this.username + " = " + this.db.param(1) + " union\n      select " + this.id + " as id, " + this.username + " as username, " + this.contact + " as contact, " + this.password + " as password from " + this.tables.user + " where " + this.contact + " = " + this.db.param(2);
       }
       else {
-        query = "\n          select u." + this.id + " as id, u." + this.username + " as username, u." + this.contact + " as contact, p." + this.password + " as password\n          from " + this.tables.user + " as u\n          left join " + this.tables.password + " as p\n            on u." + this.id + " = p." + this.id + "\n          where " + this.username + " = " + this.db.param(1) + "\n          union\n          select u." + this.id + " as id, u." + this.username + " as username, u." + this.contact + " as contact, p." + this.password + " as password\n          from " + this.tables.user + " as u\n          left join " + this.tables.password + " as p\n            on u." + this.id + " = p." + this.id + "\n          where " + this.contact + " = " + this.db.param(2);
+        query = "\n      select u." + this.id + " as id, u." + this.username + " as username, u." + this.contact + " as contact, p." + this.password + " as password\n      from " + this.tables.user + " as u\n      left join " + this.tables.password + " as p\n      on u." + this.id + " = p." + this.id + "\n      where " + this.username + " = " + this.db.param(1) + "\n      union\n      select u." + this.id + " as id, u." + this.username + " as username, u." + this.contact + " as contact, p." + this.password + " as password\n      from " + this.tables.user + " as u\n      left join " + this.tables.password + " as p\n      on u." + this.id + " = p." + this.id + "\n      where " + this.contact + " = " + this.db.param(2);
       }
     }
     return this.db.query(query, [userNameOrEmail, userNameOrEmail]).then(function (v) {

package/package.json

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

package/src/index.ts

@@ -130,7 +130,7 @@ export class PasswordService<ID> {
       return 0;
     }
     if (this.duplicateCount > 0) {
-      const histories = await this.repository.getHistory(user.id, this.duplicateCount - 1);
+      const histories = await this.repository.getHistory(user.id, this.duplicateCount);
       const isDuplicate = await this.duplicate(pass.password, this.duplicateCount, user.password, histories);
       if (isDuplicate) {
         return -1;
@@ -221,7 +221,7 @@ export class PasswordService<ID> {
     }
     const newPassword = await this.comparator.hash(pass.password);
     if (this.duplicateCount > 0) {
-      const histories = await this.repository.getHistory(user.id, this.duplicateCount - 1);
+      const histories = await this.repository.getHistory(user.id, this.duplicateCount);
       const isDuplicate = await this.duplicate(pass.password, this.duplicateCount, user.password, histories);
       if (isDuplicate) {
         return -1;
@@ -246,7 +246,7 @@ export class PasswordService<ID> {
       }
     }
     if (histories && histories.length > 0) {
-      const length = Math.min(count - 2, histories.length);
+      const length = Math.min(count, histories.length);
       const l = histories.length;
       for (let i = 1; i <= length; i++) {
         const equal = await this.comparator.compare(newPassword, histories[l - i]);
@@ -370,7 +370,7 @@ export class Repository<ID> {
     public failCount?: string,
     max?: number,
   ) {
-    this.max = (max !== undefined ? max : 8);
+    this.max = (max !== undefined ? max + 1: 8);
     this.id = (id && id.length > 0 ? id : 'id');
     this.username = (username && username.length > 0 ? username : 'username');
     this.contact = (contact && contact.length > 0 ? contact : 'email');
@@ -512,7 +512,7 @@ export function buildUpdateTable<ID, T>(pass: T, buildParam: (i: number) => stri
   return stmt;
 }
 export function buildUpdate<T>(obj: T, buildParam: (i: number) => string): Statement {
-  const keys = Object.keys(obj);
+  const keys = Object.keys(obj as any);
   const cols: string[] = [];
   const params: any[] = [];
   const o: any = obj;