Merge branch 'release/v1.16.4-1'

Author: ppxl

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.16.4-1] - 2024-10-18
+### Changed
+- Set the page size of user import preview to 25 from 8 [#170]
+- Mails with more than one '@' are not allowed anymore [#171] 
+
 ## [v1.16.3-1] - 2024-09-30
 ### Changed
 - Sort import result translations by line number [#168]

Dockerfile

@@ -75,7 +75,7 @@ FROM registry.cloudogu.com/official/java:8u402-6
 ARG TOMCAT_VERSION
 
 LABEL NAME="official/usermgt" \
-   VERSION="1.16.3-1" \
+   VERSION="1.16.4-1" \
    maintainer="[email protected]"
 
 # mark as webapp for nginx

Makefile

@@ -1,6 +1,6 @@
 # Set these to the desired values
 ARTIFACT_ID=usermgt
-VERSION=1.16.3-1
+VERSION=1.16.4-1
 # overwrite ADDITIONAL_LDFLAGS to disable static compilation
 # this should fix https://github.com/golang/go/issues/13470
 ADDITIONAL_LDFLAGS=""

app/src/main/java/de/triology/universeadm/ValidMailConstraint.java

@@ -6,7 +6,7 @@
 
 public class ValidMailConstraint extends Constraint<User> {
     // simple email validation was chosen after discussing Internationalized domain name (öäü)
-    final Pattern regex = Pattern.compile("^\\S+.+@.+\\S+$");
+    final Pattern regex = Pattern.compile("^[^@ ]+@[^@ ]+$");
 
     @Override
     public boolean violatedBy(User user, Category category) {

app/src/main/ui/src/components/usersImport/UsersImportTable.tsx

@@ -4,10 +4,10 @@ import React from "react";
 export default function UsersImportTable(file: { header: string[], rows: string[][] }) {
     const paginationControl = usePaginationControl(
         {
-            lineCountOptions: [8, 25, 50, 100],
+            lineCountOptions: [25, 50, 100],
             allLineCount: file.rows.length,
             defaultStartPage: 1,
-            defaultLinesPerPage: 8
+            defaultLinesPerPage: 25
         }
     );
 

app/src/test/java/de/triology/universeadm/ValidMailConstraintTest.java

@@ -70,6 +70,12 @@ public void testInvalidMail() {
         assertTrue(validator.violatedBy(user, null));
         user.setMail("@mail.de");
         assertTrue(validator.violatedBy(user, null));
+        user.setMail("test@@mail.de");
+        assertTrue(validator.violatedBy(user, null));
+        user.setMail("test@mail@de");
+        assertTrue(validator.violatedBy(user, null));
+        user.setMail("te@[email protected]");
+        assertTrue(validator.violatedBy(user, null));
         user.setMail("      [email protected]   ");
         assertTrue(validator.violatedBy(user, null));
     }

docs/gui/release_notes_de.md

@@ -4,6 +4,10 @@ Im Folgenden finden Sie die Release Notes für das User Management.
 
 Technische Details zu einem Release finden Sie im zugehörigen [Changelog](https://docs.cloudogu.com/de/docs/dogus/usermgt/CHANGELOG/).
 
+## Release 1.16.4-1
+* Auf der Nutzerimport-Vorschauseite sind nun 25 Einträge pro Seite statt der vorherigen 8 Einträge
+* Mails mit mehr als einem '@' sind nun nicht mehr zulässig
+
 ## Release 1.16.3-1
 * Die Fehler der Nutzer-Importergebnisse sind jetzt korrekt aufsteigend nach der Zeilennummer sortiert.
 

docs/gui/release_notes_en.md

@@ -4,6 +4,10 @@ Below you will find the release notes for User Management.
 
 Technical details on a release can be found in the corresponding [Changelog](https://docs.cloudogu.com/en/docs/dogus/usermgt/CHANGELOG/).
 
+## Release 1.16.4-1
+* On the user import preview page there are now 25 entries per page instead of the previously 8 entries
+* Mails with more than one ‘@’ are no longer allowed
+
 ## Release 1.16.3-1
 * The errors of the user import results are now correctly sorted in ascending order by line number.
 

dogu.json

@@ -1,6 +1,6 @@
 {
   "Name": "official/usermgt",
-  "Version": "1.16.3-1",
+  "Version": "1.16.4-1",
   "DisplayName": "User Management",
   "Description": "User and Group Management.",
   "Category": "Administration Apps",