refactor

Author: mtrezza

spec/ParseUser.spec.js

@@ -4431,40 +4431,34 @@ describe('allowClientClassCreation option', () => {
   });
 });
 
-describe('custom log levels for user errors', () => {
-  it('should respect custom log levels for username already exists error', async () => {
-    const logger = require('../lib/logger').logger;
-    const warnSpy = spyOn(logger, 'warn').and.callThrough();
-    const errorSpy = spyOn(logger, 'error').and.callThrough();
-    const infoSpy = spyOn(logger, 'info').and.callThrough();
-
-    const logLevels = ['warn', 'info'];
+fdescribe('log levels', () => {
+  const logLevels = ['warn', 'info', 'error'];
 
+  it_id('bd3929eb-85dd-4955-ac1d-5ba59ab1b9a3')(it)('should use log level for username already exists error', async () => {
     for (const logLevel of logLevels) {
       await reconfigureServer({
         logLevels: {
           usernameAlreadyExists: logLevel,
         },
       });
 
-      const username = `existingUser_${logLevel}`;
-      await Parse.User.signUp(username, 'password');
+      const logger = require('../lib/logger').logger;
+      spyOn(logger, 'warn').and.callFake(() => {});
+      spyOn(logger, 'error').and.callFake(() => {});
+      spyOn(logger, 'info').and.callFake(() => {});
 
-      try {
-        await Parse.User.signUp(username, 'password');
-      } catch (error) {
-        expect(error.code).toBe(Parse.Error.USERNAME_TAKEN);
-        expect(logger[logLevel]).toHaveBeenCalled();
-        ['warn', 'error', 'info'].forEach(level => {
-          if (level !== logLevel) {
-            expect(logger[level]).not.toHaveBeenCalled();
-          }
-        });
-      }
+      await Parse.User.signUp('user', 'pass');
+      await expectAsync(Parse.User.signUp('user', 'pass')).toBeRejectedWith(
+        new Parse.Error(
+          Parse.Error.USERNAME_TAKEN,
+          'Account already exists for this username.'
+        )
+      );
 
-      warnSpy.calls.reset();
-      errorSpy.calls.reset();
-      infoSpy.calls.reset();
+      logLevels.forEach(level => {
+        expect(logger[level]).toHaveBeenCalledTimes(level === logLevel ? 1 : 0);
+        logger[level].calls.reset();
+      });
     }
   });
 });

spec/helper.js

@@ -150,6 +150,7 @@ if (silent) {
     triggerAfter: 'silent',
     triggerBeforeError: 'silent',
     triggerBeforeSuccess: 'silent',
+    usernameAlreadyExists: 'silent',
   };
 }
 

src/RestWrite.js

@@ -739,10 +739,14 @@ RestWrite.prototype._validateUserName = function () {
     )
     .then(results => {
       if (results.length > 0) {
-        throw new Parse.Error(
+        const usernameError = new Parse.Error(
           Parse.Error.USERNAME_TAKEN,
           'Account already exists for this username.'
         );
+        if (this.config.logLevels.usernameAlreadyExists !== 'silent') {
+          logger[this.config.logLevels.usernameAlreadyExists](JSON.stringify(usernameError));
+        }
+        throw usernameError;
       }
       return;
     });
@@ -1561,10 +1565,10 @@ RestWrite.prototype.runDatabaseOperation = function () {
             Parse.Error.USERNAME_TAKEN,
             'Account already exists for this username.'
           );
-
-          return this.config.loggerController[this.config.logLevels.usernameAlreadyExists](
-            JSON.stringify(usernameError)
-          );
+          if (this.config.logLevels.usernameAlreadyExists !== 'silent') {
+            logger[this.config.logLevels.usernameAlreadyExists](JSON.stringify(usernameError));
+          }
+          throw usernameError;
         }
 
         if (error && error.userInfo && error.userInfo.duplicated_field === 'email') {
@@ -1589,10 +1593,14 @@ RestWrite.prototype.runDatabaseOperation = function () {
           )
           .then(results => {
             if (results.length > 0) {
-              throw new Parse.Error(
+              const usernameError = new Parse.Error(
                 Parse.Error.USERNAME_TAKEN,
                 'Account already exists for this username.'
               );
+              if (this.config.logLevels.usernameAlreadyExists !== 'silent') {
+                logger[this.config.logLevels.usernameAlreadyExists](JSON.stringify(usernameError));
+              }
+              throw usernameError;
             }
             return this.config.database.find(
               this.className,