feature(redwoodjs#7787) - Fix linting issues

ageddesi · Apr 10, 2023 · 68ab8cc · 68ab8cc
1 parent 6439049
commit 68ab8cc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/packages/auth-providers/dbAuth/api/src/DbAuthHandler.ts b/packages/auth-providers/dbAuth/api/src/DbAuthHandler.ts
@@ -1287,20 +1287,19 @@ export class DbAuthHandler<
       this._validateField('username', username) &&
       this._validateField('password', password)
     ) {
-
       // Each db provider has it owns rules for case insensitive comparison.
       // We are checking if you have defined one for your db choice here
       // https://www.prisma.io/docs/concepts/components/prisma-client/case-sensitivity
-      const usernameMatchFlowOption = (this.options.signup as SignupFlowOptions)?.usernameMatch;
-      const findUniqueUserMatchCriteriaOptions = !usernameMatchFlowOption ?
-        { [this.options.authFields.username]: username }
-        :
-        {
-          [this.options.authFields.username]: {
-            equals: username,
-            mode: usernameMatchFlowOption
+      const usernameMatchFlowOption = (this.options.signup as SignupFlowOptions)
+        ?.usernameMatch
+      const findUniqueUserMatchCriteriaOptions = !usernameMatchFlowOption
+        ? { [this.options.authFields.username]: username }
+        : {
+            [this.options.authFields.username]: {
+              equals: username,
+              mode: usernameMatchFlowOption,
+            },
           }
-        }
 
       const user = await this.dbAccessor.findUnique({
         where: findUniqueUserMatchCriteriaOptions,

diff --git a/packages/auth-providers/dbAuth/api/src/__tests__/DbAuthHandler.test.js b/packages/auth-providers/dbAuth/api/src/__tests__/DbAuthHandler.test.js
@@ -2364,6 +2364,7 @@ describe('dbAuth', () => {
       jest.resetAllMocks()
       jest.clearAllMocks()
 
+      const defaultMessage = options.signup.errors.usernameTaken
       const spy = jest.spyOn(db.user, 'findUnique')
       delete options.signup.usernameMatch
 
@@ -2373,7 +2374,12 @@ describe('dbAuth', () => {
         password: 'password',
       })
       const dbAuth = new DbAuthHandler(event, context, options)
-      await dbAuth._createUser().catch((e) => {})
+      await dbAuth._createUser().catch((e) => {
+        expect(e).toBeInstanceOf(dbAuthError.DuplicateUsernameError)
+        expect(e.message).toEqual(
+          defaultMessage.replace(/\$\{username\}/, dbUser.email)
+        )
+      })
 
       expect(spy).toHaveBeenCalled()
       return expect(spy).not.toHaveBeenCalledWith({