From 3b831fecb80d6c9bb2fee6012ea7299a192064c2 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Wed, 13 Apr 2022 12:20:41 +0800
Subject: [PATCH] test both max length and pattern if declared

---
 packages/api/src/scalars.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/api/src/scalars.ts b/packages/api/src/scalars.ts
index 454b7c38e..2f0de333a 100644
--- a/packages/api/src/scalars.ts
+++ b/packages/api/src/scalars.ts
@@ -25,7 +25,8 @@ export class SanitizedString extends GraphQLScalarType {
           throw new Error(
             `Specified value cannot be longer than ${maxLength} characters`
           )
-        } else if (pattern && !pattern.test(value)) {
+        }
+        if (pattern && !pattern.test(value)) {
           throw new Error(`Specified value does not match pattern`)
         }
         return sanitize(value, { allowedTags: allowedTags || [] })
@@ -38,7 +39,8 @@ export class SanitizedString extends GraphQLScalarType {
           throw new Error(
             `Specified value cannot be longer than ${maxLength} characters`
           )
-        } else if (pattern && !pattern.test(value)) {
+        }
+        if (pattern && !pattern.test(value)) {
           throw new Error(`Specified value does not match pattern`)
         }
         return sanitize(value, { allowedTags: allowedTags || [] })