Merge branch 'fix/no-tld-emails-5410' into 'master'

Improve error handling around email during registration for edge-cases #5410

See merge request minds/front!1842

Author: markharding

src/app/common/services/regex.service.spec.ts

@@ -0,0 +1,73 @@
+import { TestBed } from '@angular/core/testing';
+import { RegexService } from './regex.service';
+
+describe('RegexService', () => {
+  let service: RegexService;
+
+  beforeEach(() => {
+    jasmine.clock().uninstall();
+    jasmine.clock().install();
+
+    TestBed.configureTestingModule({
+      providers: [],
+    });
+
+    service = new RegexService();
+  });
+
+  afterEach(() => {
+    jasmine.clock().uninstall();
+  });
+
+  it('should be instantiated', () => {
+    expect(service).toBeTruthy();
+  });
+
+  // Email
+
+  it('should validate email with just alphabetic characters', () => {
+    expect(service.getRegex('mail').test('[email protected]')).toBeTruthy();
+  });
+
+  it('should validate email with numbers', () => {
+    expect(service.getRegex('mail').test('[email protected]')).toBeTruthy();
+  });
+
+  it('should validate email with multiple numbers in domain', () => {
+    expect(service.getRegex('mail').test('[email protected]')).toBeTruthy();
+  });
+
+  it('should validate email with a mix of numbers and and alphabetic chars', () => {
+    expect(service.getRegex('mail').test('[email protected]')).toBeTruthy();
+  });
+
+  it('should validate email with a mix of numbers and valid alphabetic chars', () => {
+    expect(service.getRegex('mail').test('[email protected]')).toBeTruthy();
+  });
+
+  it('should validate email with a mix of special chars in username', () => {
+    expect(
+      service.getRegex('mail').test('t#e!s$t%1.&[email protected]')
+    ).toBeTruthy();
+  });
+
+  it('should NOT validate an email without a domain name', () => {
+    expect(service.getRegex('mail').test('[email protected]')).toBeFalsy();
+  });
+
+  it('should NOT validate an email without a domain name OR TDL', () => {
+    expect(service.getRegex('mail').test('test@')).toBeFalsy();
+  });
+
+  it('should NOT validate an email without a username', () => {
+    expect(service.getRegex('mail').test('@minds.com')).toBeFalsy();
+  });
+
+  it('should NOT validate an email without a TLD', () => {
+    expect(service.getRegex('mail').test('test@minds')).toBeFalsy();
+  });
+
+  it('should NOT validate @ as an email', () => {
+    expect(service.getRegex('mail').test('@')).toBeFalsy();
+  });
+});

src/app/modules/forms/register/register.ng.scss

@@ -91,7 +91,7 @@
   }
 
   .m-register__formError {
-    margin-top: 20px;
+    margin: 10px 0 10px 0;
   }
 
   .m-register__error {

src/app/modules/forms/register/register.ts

@@ -16,7 +16,6 @@ import {
 
 import { Client } from '../../../services/api';
 import { Session } from '../../../services/session';
-import { ExperimentsService } from '../../experiments/experiments.service';
 import { RouterHistoryService } from '../../../common/services/router-history.service';
 import {
   PopoverComponent,
@@ -70,7 +69,6 @@ export class RegisterForm {
     public client: Client,
     fb: FormBuilder,
     public zone: NgZone,
-    private experiments: ExperimentsService,
     private routerHistoryService: RouterHistoryService,
     private usernameValidator: UsernameValidator
   ) {
@@ -183,7 +181,14 @@ export class RegisterForm {
           this.session.logout();
         } else if (e.status === 'error') {
           // two factor?
-          this.errorMessage = e.message;
+          switch (e?.message) {
+            case 'registration:notemail':
+              this.errorMessage = 'Invalid Email';
+              break;
+            default:
+              this.errorMessage = e.message ?? 'An unknown error has occurred';
+          }
+
           this.session.logout();
         } else {
           this.errorMessage = 'Sorry, there was an error. Please try again.';