Fixed registration error for empty email address

squidfunk · squidfunk · commit 8e5a2bdd01cc · 2018-09-09T19:52:03.000+02:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+terraform-aws-cognito-auth-0.x.x (2018-xx-xx)
+
+  * Switched to admin-only user creation (API doesn't allow otherwise)
+  * Fixed registration error for empty email address
+
 terraform-aws-cognito-auth-0.3.0 (2018-09-09)
 
   * Added identity token expires timestamp to hash fragment
diff --git a/modules/api/lambda/package-lock.json b/modules/api/lambda/package-lock.json
diff --git a/modules/api/lambda/package.json b/modules/api/lambda/package.json
@@ -28,6 +28,7 @@
   },
   "dependencies": {
     "cookie": "^0.3.1",
+    "email-validator": "^2.0.4",
     "jsonschema": "^1.2.4",
     "password-rules": "0.0.3",
     "uuid": "^3.2.1"
diff --git a/modules/api/lambda/src/clients/authentication/index.ts b/modules/api/lambda/src/clients/authentication/index.ts
@@ -21,6 +21,7 @@
  */
 
 import { AWSError } from "aws-sdk"
+import { validate } from "email-validator"
 import * as uuid from "uuid/v4"
 
 import { Client } from "clients"
@@ -106,6 +107,10 @@ export class AuthenticationClient extends Client {
   ): Promise<VerificationCode> {
     const username = uuid()
 
+    /* Check if email address is valid */
+    if (!validate(email))
+      throw new Error("Invalid email address")
+
     /* Register user with Cognito */
     await this.cognito.signUp({
       ClientId: process.env.COGNITO_USER_POOL_CLIENT_ID!,
diff --git a/modules/api/lambda/tests/suites/unit/clients/authentication/index.spec.ts b/modules/api/lambda/tests/suites/unit/clients/authentication/index.spec.ts
@@ -162,6 +162,20 @@ describe("clients/authentication", () => {
           }))
       })
 
+      /* Test: should reject on invalid email address */
+      it("should reject on invalid email address", async done => {
+        mockCognitoSignUpWithSuccess()
+        mockVerificationIssueWithResult()
+        try {
+          const auth = new AuthenticationClient()
+          await auth.register(chance.string(), password)
+          done.fail()
+        } catch (err) {
+          expect(err).toEqual(new Error("Invalid email address"))
+          done()
+        }
+      })
+
       /* Test: should reject on verification error */
       it("should reject on verification error", async done => {
         const errMock = new Error()
diff --git a/modules/web/app/dist/index.html b/modules/web/app/dist/index.html
@@ -1 +1 @@
- <!doctype html> <html lang="en"> <head> <meta charset="utf-8"/> <meta name="viewport" content="width=device-width,initial-scale=1"/> <meta name="robots" content="noindex, nofollow"/> <title>${cognito_identity_pool_name}</title> <base href="/"/> <meta name="config:api_base_path" content="${api_base_path}"/> <meta name="config:app_origin" content="${app_origin}"/> <meta name="config:cognito_identity_pool_name" content="${cognito_identity_pool_name}"/> <style>#root,body,html{height:100%;margin:0}</style> </head> <body> <div id="root"></div> <script type="text/javascript" src="vendor.7b8792aa00e545d8b454.bundle.js"></script><script type="text/javascript" src="main.3882070cea37393da427.bundle.js"></script></body> </html> 
+ <!doctype html> <html lang="en"> <head> <meta charset="utf-8"/> <meta name="viewport" content="width=device-width,initial-scale=1"/> <meta name="robots" content="noindex, nofollow"/> <title>${cognito_identity_pool_name}</title> <base href="/"/> <meta name="config:api_base_path" content="${api_base_path}"/> <meta name="config:app_origin" content="${app_origin}"/> <meta name="config:cognito_identity_pool_name" content="${cognito_identity_pool_name}"/> <style>#root,body,html{height:100%;margin:0}html{background:#fafafa}@media (max-width:599.95px){html{background:0 0}}</style> </head> <body> <div id="root"></div> <script type="text/javascript" src="vendor.7b8792aa00e545d8b454.bundle.js"></script><script type="text/javascript" src="main.3882070cea37393da427.bundle.js"></script></body> </html> 
diff --git a/modules/web/app/src/index.html b/modules/web/app/src/index.html
@@ -38,6 +38,14 @@
         height: 100%;
         margin: 0;
       }
+      html {
+        background: #fafafa;
+      }
+      @media (max-width: 599.95px) {
+        html {
+          background: none;
+        }
+      }
     </style>
   </head>
   <body>

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		- <!doctype html> <html lang="en"> <head> <meta charset="utf-8"/> <meta name="viewport" content="width=device-width,initial-scale=1"/> <meta name="robots" content="noindex, nofollow"/> <title>${cognito_identity_pool_name}</title> <base href="/"/> <meta name="config:api_base_path" content="${api_base_path}"/> <meta name="config:app_origin" content="${app_origin}"/> <meta name="config:cognito_identity_pool_name" content="${cognito_identity_pool_name}"/> <style>#root,body,html{height:100%;margin:0}</style> </head> <body> <div id="root"></div> <script type="text/javascript" src="vendor.7b8792aa00e545d8b454.bundle.js"></script><script type="text/javascript" src="main.3882070cea37393da427.bundle.js"></script></body> </html>
	`1`	+ <!doctype html> <html lang="en"> <head> <meta charset="utf-8"/> <meta name="viewport" content="width=device-width,initial-scale=1"/> <meta name="robots" content="noindex, nofollow"/> <title>${cognito_identity_pool_name}</title> <base href="/"/> <meta name="config:api_base_path" content="${api_base_path}"/> <meta name="config:app_origin" content="${app_origin}"/> <meta name="config:cognito_identity_pool_name" content="${cognito_identity_pool_name}"/> <style>#root,body,html{height:100%;margin:0}html{background:#fafafa}@media (max-width:599.95px){html{background:0 0}}</style> </head> <body> <div id="root"></div> <script type="text/javascript" src="vendor.7b8792aa00e545d8b454.bundle.js"></script><script type="text/javascript" src="main.3882070cea37393da427.bundle.js"></script></body> </html>