From 0c12c14148bdb8347d7f8ea6c90a863bb95eec3d Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Fri, 15 Sep 2023 13:26:45 +0200
Subject: [PATCH 1/2] patch portunus to make givenname optional

---
 .../ldap/0004-make-givenName-optional.patch   | 34 +++++++++++++++++++
 modules/ldap/default.nix                      |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 modules/ldap/0004-make-givenName-optional.patch

diff --git a/modules/ldap/0004-make-givenName-optional.patch b/modules/ldap/0004-make-givenName-optional.patch
new file mode 100644
index 0000000..50a5d80
--- /dev/null
+++ b/modules/ldap/0004-make-givenName-optional.patch
@@ -0,0 +1,34 @@
+From 8856035c40104c6d0b9183d3ff1d209a805b5a45 Mon Sep 17 00:00:00 2001
+From: Rouven Seifert <rouven@rfive.de>
+Date: Fri, 15 Sep 2023 13:24:25 +0200
+Subject: [PATCH] make givenName optional
+
+---
+ internal/core/user.go | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/internal/core/user.go b/internal/core/user.go
+index c70f9c8..c4b08d7 100644
+--- a/internal/core/user.go
++++ b/internal/core/user.go
+@@ -76,7 +76,6 @@ func (u User) RenderToLDAP(suffix string, allGroups map[string]Group) LDAPObject
+ 			"uid":          {u.LoginName},
+ 			"cn":           {u.FullName()},
+ 			"sn":           {u.FamilyName},
+-			"givenName":    {u.GivenName},
+ 			"userPassword": {u.PasswordHash},
+ 			"isMemberOf":   memberOfGroupDNames,
+ 			"objectClass":  {"portunusPerson", "inetOrgPerson", "organizationalPerson", "person", "top"},
+@@ -86,6 +85,9 @@ func (u User) RenderToLDAP(suffix string, allGroups map[string]Group) LDAPObject
+ 	if u.EMailAddress != "" {
+ 		obj.Attributes["mail"] = []string{u.EMailAddress}
+ 	}
++	if u.GivenName != "" {
++		obj.Attributes["givenName"] = []string{u.GivenName}
++	}
+ 	if len(u.SSHPublicKeys) > 0 {
+ 		obj.Attributes["sshPublicKey"] = u.SSHPublicKeys
+ 	}
+-- 
+2.41.0
+
diff --git a/modules/ldap/default.nix b/modules/ldap/default.nix
index 7766f6a..933145d 100644
--- a/modules/ldap/default.nix
+++ b/modules/ldap/default.nix
@@ -60,6 +60,7 @@ in
         ./0001-update-user-validation-regex.patch
         ./0002-both-ldap-and-ldaps.patch
         ./0003-gecos-ascii-escape.patch
+        ./0004-make-givenName-optional.patch
       ];
     });
 

From 460f9c46b3155b685edb965e6dd217fa0b4bc62d Mon Sep 17 00:00:00 2001
From: Fugi <me@fugi.dev>
Date: Fri, 15 Sep 2023 19:24:27 +0200
Subject: [PATCH 2/2] make givenname optional in web interface

---
 .../ldap/0004-make-givenName-optional.patch   | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/ldap/0004-make-givenName-optional.patch b/modules/ldap/0004-make-givenName-optional.patch
index 50a5d80..4131252 100644
--- a/modules/ldap/0004-make-givenName-optional.patch
+++ b/modules/ldap/0004-make-givenName-optional.patch
@@ -1,17 +1,8 @@
-From 8856035c40104c6d0b9183d3ff1d209a805b5a45 Mon Sep 17 00:00:00 2001
-From: Rouven Seifert <rouven@rfive.de>
-Date: Fri, 15 Sep 2023 13:24:25 +0200
-Subject: [PATCH] make givenName optional
-
----
- internal/core/user.go | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
 diff --git a/internal/core/user.go b/internal/core/user.go
-index c70f9c8..c4b08d7 100644
+index e74ccfe..ce03eeb 100644
 --- a/internal/core/user.go
 +++ b/internal/core/user.go
-@@ -76,7 +76,6 @@ func (u User) RenderToLDAP(suffix string, allGroups map[string]Group) LDAPObject
+@@ -64,7 +64,6 @@ func (u User) RenderToLDAP(suffix string, allGroups map[string]Group) LDAPObject
  			"uid":          {u.LoginName},
  			"cn":           {u.FullName()},
  			"sn":           {u.FamilyName},
@@ -19,7 +10,7 @@ index c70f9c8..c4b08d7 100644
  			"userPassword": {u.PasswordHash},
  			"isMemberOf":   memberOfGroupDNames,
  			"objectClass":  {"portunusPerson", "inetOrgPerson", "organizationalPerson", "person", "top"},
-@@ -86,6 +85,9 @@ func (u User) RenderToLDAP(suffix string, allGroups map[string]Group) LDAPObject
+@@ -74,6 +73,9 @@ func (u User) RenderToLDAP(suffix string, allGroups map[string]Group) LDAPObject
  	if u.EMailAddress != "" {
  		obj.Attributes["mail"] = []string{u.EMailAddress}
  	}
@@ -29,6 +20,15 @@ index c70f9c8..c4b08d7 100644
  	if len(u.SSHPublicKeys) > 0 {
  		obj.Attributes["sshPublicKey"] = u.SSHPublicKeys
  	}
--- 
-2.41.0
-
+diff --git a/internal/frontend/users.go b/internal/frontend/users.go
+index 225c5b3..1a961ca 100644
+--- a/internal/frontend/users.go
++++ b/internal/frontend/users.go
+@@ -168,7 +168,6 @@ func buildUserMasterdataFieldset(e core.Engine, u *core.User, state *h.FormState
+ 			Name:      "given_name",
+ 			Label:     "Given name",
+ 			Rules: []h.ValidationRule{
+-				core.MustNotBeEmpty,
+ 				core.MustNotHaveSurroundingSpaces,
+ 			},
+ 		},