Fix for wallet validation, added unique wallet/email check on create user, lower log level for sdk on prod

Author: jakapurg

backend/src/config/values.ts

@@ -100,6 +100,8 @@ export enum ValidatorErrorCode {
   EMAIL_OR_WALLET_REQUIRED = 422014,
   DATA_MODEL_STATUS_MISSING = 422100,
   DATA_MODEL_INVALID_STATUS = 422101,
+  DUPLICATED_MAIL = 422102,
+  DUPLICATED_WALLET = 422103,
 }
 
 /**

backend/src/cron.ts

@@ -120,7 +120,10 @@ export class Cron {
                 apiUrl: env.APILLON_API_URL,
                 key: env.APILLON_KEY,
                 secret: env.APILLON_SECRET,
-                logLevel: LogLevel.VERBOSE,
+                logLevel:
+                  env.APP_ENV === 'production'
+                    ? LogLevel.ERROR
+                    : LogLevel.VERBOSE,
               }).collection(env.COLLECTION_UUID)
             : null;
 

backend/src/lib/claim.ts

@@ -10,7 +10,7 @@ export async function claim(user: User): Promise<string> {
     apiUrl: env.APILLON_API_URL,
     key: env.APILLON_KEY,
     secret: env.APILLON_SECRET,
-    logLevel: LogLevel.VERBOSE,
+    logLevel: env.APP_ENV === 'production' ? LogLevel.ERROR : LogLevel.VERBOSE,
   }).collection(env.COLLECTION_UUID);
 
   validateAirdropStatus(user.airdrop_status);

backend/src/lib/job.ts

@@ -96,7 +96,8 @@ const sendClaimEmails = async (job: JobType, mysql: MySql) => {
           apiUrl: env.APILLON_API_URL,
           key: env.APILLON_KEY,
           secret: env.APILLON_SECRET,
-          logLevel: LogLevel.VERBOSE,
+          logLevel:
+            env.APP_ENV === 'production' ? LogLevel.ERROR : LogLevel.VERBOSE,
         }).collection(env.COLLECTION_UUID)
       : null;
 

backend/src/models/user.ts

@@ -208,11 +208,11 @@ export class User extends BaseSqlModel {
       `
       SELECT 1
       FROM user
-      WHERE email <> @email
+      WHERE id <> @id
       AND wallet = @wallet;
     `,
       {
-        email: this.email,
+        id: this.id,
         wallet: this.wallet,
       },
     );

backend/src/routes/create-user.ts

@@ -1,9 +1,9 @@
 import { Application } from 'express';
 import { NextFunction, Request, Response } from '../http';
-import { PopulateStrategy } from '../config/values';
+import { PopulateStrategy, ValidatorErrorCode } from '../config/values';
 import { AuthenticateAdmin } from '../middlewares/authentication';
 import { BatchUsers } from '../models/batch-users';
-import { ValidationError } from '../lib/errors';
+import { ResourceError, ValidationError } from '../lib/errors';
 
 /**
  * Installs new route on the provided application.
@@ -21,6 +21,30 @@ export function inject(app: Application) {
 
 export async function resolve(req: Request, res: Response): Promise<void> {
   const { context, body } = req;
+
+  const usersToCreate = body.users;
+
+  const emailSet = new Set<string>();
+  const walletSet = new Set<string>();
+
+  for (const user of usersToCreate) {
+    const { email, wallet } = user;
+
+    if (email && emailSet.has(email)) {
+      throw new ResourceError(ValidatorErrorCode.DUPLICATED_MAIL);
+    }
+    if (wallet && walletSet.has(wallet)) {
+      throw new ResourceError(ValidatorErrorCode.DUPLICATED_WALLET);
+    }
+
+    if (email) {
+      emailSet.add(email);
+    }
+    if (wallet) {
+      walletSet.add(wallet);
+    }
+  }
+
   const users = new BatchUsers({}, context).populate(
     body,
     PopulateStrategy.ADMIN,

backend/src/scripts/dev/deploy-collection.ts

@@ -6,7 +6,7 @@ import { env } from '../../config/env';
     apiUrl: env.APILLON_API_URL,
     key: env.APILLON_KEY,
     secret: env.APILLON_SECRET,
-    logLevel: LogLevel.VERBOSE,
+    logLevel: env.APP_ENV === 'production' ? LogLevel.ERROR : LogLevel.VERBOSE,
   });
 
   const collection = await nft.create({

frontend/lib/misc/errors.ts

@@ -84,6 +84,8 @@ export const ErrorCodes = {
   422007: 'Captcha error. Please solve the captcha again.',
   422008: 'User has already minted. Duplicate minting is not allowed.',
   422009: 'User with this wallet address already exists. Please use a different wallet.',
+  422102: "Email is duplicated in the request. Please provide unique emails.",
+  422103: "Wallet address is duplicated in the request. Please provide unique wallet addresses.",
   422013: 'Wallet address is not valid.',
   422014: 'Email or wallet address is required. Please provide one of them.',