display white list of email domain

Author: ety001

helpers/errortypes.js

@@ -4,16 +4,22 @@ class ApiError extends Error {
         field = 'general',
         status = 400,
         cause,
+        data,
     }) {
         super(`${field}:${type}`);
         this.type = type;
         this.field = field;
         this.status = status;
         this.cause = cause;
+        this.data = data;
     }
 
     toJSON() {
-        return { type: this.type, field: this.field };
+        const result = { type: this.type, field: this.field };
+        if (this.data !== undefined) {
+            result.data = this.data;
+        }
+        return result;
     }
 }
 

routes/apiHandlers.js

@@ -917,6 +917,7 @@ async function handleRequestEmailCode(ip, email, log, locale) {
         throw new ApiError({
             type: 'error_api_email_domain',
             field: 'email',
+            data: { whiteEmailDomains },
         });
     }
 

src/components/Form/Signup/UserInfo.js

@@ -227,12 +227,22 @@ class UserInfo extends React.Component {
                 }, 1000);
             })
             .catch(error => {
+                let errorMessage = intl.formatMessage({ id: error.type });
+                // If email domain error and contains allowed domain list, show domain list
+                if (
+                    error.type === 'error_api_email_domain' &&
+                    error.data &&
+                    error.data.whiteEmailDomains &&
+                    Array.isArray(error.data.whiteEmailDomains) &&
+                    error.data.whiteEmailDomains.length > 0
+                ) {
+                    const domainsList = error.data.whiteEmailDomains.join(', ');
+                    errorMessage = `${errorMessage} (${domainsList})`;
+                }
                 this.props.form.setFields({
                     email: {
                         value: email,
-                        errors: [
-                            new Error(intl.formatMessage({ id: error.type })),
-                        ],
+                        errors: [new Error(errorMessage)],
                     },
                 });
                 window.email_code_count_seconds = 0;

src/utils/api.js

@@ -30,6 +30,7 @@ export default async function apiCall(path, payload, reqType = 'POST') {
         const error = new Error('ApiError');
         error.type = responseData.error.type;
         error.field = responseData.error.field;
+        error.data = responseData.error.data;
         throw error;
     }
     return responseData;