From e60ea987dda1aa633da78ab91e56d7c26506c4a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 13 Oct 2020 20:40:30 +0200
Subject: [PATCH] Make mail optional for user

---
 scm-ui/ui-types/src/User.ts                                 | 4 ++--
 scm-ui/ui-webapp/src/users/components/UserForm.tsx          | 6 +++---
 .../src/main/java/sonia/scm/api/v2/resources/UserDto.java   | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/scm-ui/ui-types/src/User.ts b/scm-ui/ui-types/src/User.ts
index 43ff64b9fa..29009b5d0d 100644
--- a/scm-ui/ui-types/src/User.ts
+++ b/scm-ui/ui-types/src/User.ts
@@ -27,13 +27,13 @@ import { Links } from "./hal";
 export type DisplayedUser = {
   id: string;
   displayName: string;
-  mail: string;
+  mail?: string;
 };
 
 export type User = {
   displayName: string;
   name: string;
-  mail: string;
+  mail?: string;
   password: string;
   active: boolean;
   type?: string;
diff --git a/scm-ui/ui-webapp/src/users/components/UserForm.tsx b/scm-ui/ui-webapp/src/users/components/UserForm.tsx
index cd0856fa84..9c78ef8476 100644
--- a/scm-ui/ui-webapp/src/users/components/UserForm.tsx
+++ b/scm-ui/ui-webapp/src/users/components/UserForm.tsx
@@ -113,8 +113,7 @@ class UserForm extends React.Component<Props, State> {
       this.editUserComponentsAreUnchanged() ||
       this.state.mailValidationError ||
       this.state.displayNameValidationError ||
-      this.isFalsy(user.displayName) ||
-      this.isFalsy(user.mail)
+      this.isFalsy(user.displayName)
     );
   };
 
@@ -152,6 +151,7 @@ class UserForm extends React.Component<Props, State> {
       // edit existing user
       subtitle = <Subtitle subtitle={t("userForm.subtitle")} />;
     }
+
     return (
       <>
         {subtitle}
@@ -218,7 +218,7 @@ class UserForm extends React.Component<Props, State> {
 
   handleEmailChange = (mail: string) => {
     this.setState({
-      mailValidationError: !validator.isMailValid(mail),
+      mailValidationError: !!mail && !validator.isMailValid(mail),
       user: {
         ...this.state.user,
         mail
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java
index 0e4e9b34c2..027cc59621 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-    
+
 package sonia.scm.api.v2.resources;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -46,7 +46,8 @@ public class UserDto extends HalRepresentation {
   private String displayName;
   @JsonInclude(JsonInclude.Include.NON_NULL)
   private Instant lastModified;
-  @NotEmpty @Email
+  @JsonInclude(JsonInclude.Include.NON_NULL)
+  @Email
   private String mail;
   @Pattern(regexp = ValidationUtil.REGEX_NAME)
   private String name;