Fixes #649

Author: oharsta

client/src/__tests__/validations/regExps.test.js

@@ -10,6 +10,7 @@ describe('regExps', () => {
     it('Emails formats', () => {
         expect(validEmailRegExp.test("aa")).toBeFalsy();
         expect(validEmailRegExp.test("a!@a.c")).toBeFalsy();
+        expect(validEmailRegExp.test("aa@abc..c")).toBeFalsy();
         expect(validEmailRegExp.test("a!@a.c@")).toBeFalsy();
 
         expect(validEmailRegExp.test("a@a")).toBeTruthy();

client/src/pages/InvitationForm.jsx

@@ -323,9 +323,6 @@ export const InvitationForm = () => {
                     pinnedEmails={[]}
                     removeMail={removeMail}
                     required={true}
-                    maxEmails={null} //TODO is there a internal placeholder identifier? then one.
-                    // See https://github.com/OpenConext/OpenConext-Invite/issues/540
-                    maxEmailsMessage={"TODO : localize Not allowed to add more then one email with external identifier"}
                     error={!initial && isEmpty(invitation.invites)}/>
 
                 {(!initial && isEmpty(invitation.invites)) &&

client/src/pages/Role.jsx

@@ -184,7 +184,9 @@ export const Role = () => {
                             </span>}
                             {!isEmpty(institutionAdmins) && <span dangerouslySetInnerHTML={{
                                 __html: DOMPurify.sanitize(I18n.t("role.institutionAdmin", {
-                                    names: splitListSemantically(institutionAdmins.map(u => u.name), I18n.t("forms.and"))
+                                    names: splitListSemantically(
+                                        institutionAdmins.map(u => `<a href="mailto:${u.email}">${u.name}</a>`),
+                                        I18n.t("forms.and"))
                                 }))
                             }}/>}
                         </div>

client/src/validations/regExps.js

@@ -1,4 +1,4 @@
-export const validEmailRegExp = /^[+a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.?[a-zA-Z]*$/;///^\S+@\S+$/;
+export const validEmailRegExp = /^[+a-zA-Z0-9._-]+@[a-zA-Z0-9]+([.-][a-zA-Z0-9]+)*\.?[a-zA-Z]*$/;///^\S+@\S+$/;
 
 export const validUrlRegExp = /(https?|ssh|ftp):\/\/(((www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.?[a-z]{0,63})|(localhost))\b([-a-zA-Z0-9@:%_+.~#?&/=]*)/i