Merge pull request #18 from JincorTech/develop

Develop to merge

src/entities/user.ts

@@ -9,6 +9,9 @@ import { VerifyMethod } from './verify.action';
 @Index('user_email', () => ({
   email: 1
 }), { unique: true })
+@Index('user_wallets', () => ({
+  'wallets.address': 1
+}), { unique: true })
 export class User {
   @ObjectIdColumn()
   id: ObjectID;

src/helpers/helpers.ts

@@ -1,4 +1,5 @@
 import * as LRU from 'lru-cache';
+import { number } from 'joi';
 
 function escape(str: string): string {
   return str.replace(/\+/g, '-')
@@ -32,6 +33,33 @@ export function chunkArray<T>(srcArray: T[], size: number): T[][] {
   );
 }
 
+/**
+ *
+ * @param items
+ * @param chunkSize
+ * @param mapFunc
+ */
+export async function processAsyncIntRangeByChunks<R>(
+  from: number, to: number, step: number, chunkSize: number, mapFunc: (item: number) => Promise<R>
+): Promise<R[]> {
+  if (from > to) {
+    throw new Error('Invalid range');
+  }
+  let data: R[] = [];
+  let numbers: number[];
+  let j: number;
+
+  while(from <= to) {
+    numbers = [];
+    for(j = 0; j < chunkSize && from <= to; ++j, from += step) {
+      numbers.push(from);
+    }
+    data = data.concat(await Promise.all(numbers.map(mapFunc)));
+  }
+
+  return data;
+}
+
 /**
  *
  * @param items

src/services/app/user/user.account.app.ts

@@ -84,7 +84,7 @@ export class UserAccountApplication {
     const existingUser = await getConnection().getMongoRepository(User).findOne({ email });
 
     if (existingUser) {
-      if (!existingUser.isVerified) {
+      if (!existingUser.isVerified && bcrypt.compareSync(userData.password, existingUser.passwordHash)) {
         return this.initiateCreateAndReturnUser(existingUser, initiateVerification);
       } else {
         throw new UserExists('User already exists');