From 4033ba887db0106588e0c47019c7e9e9bb1d1cc4 Mon Sep 17 00:00:00 2001
From: "A.Unger" <zyxancf@gmail.com>
Date: Wed, 21 Oct 2020 15:14:00 +0200
Subject: [PATCH] set account displayname fallback to userid if not present

---
 ocs/pkg/service/v0/users.go | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/ocs/pkg/service/v0/users.go b/ocs/pkg/service/v0/users.go
index b9f0d46ea..4e257c81b 100644
--- a/ocs/pkg/service/v0/users.go
+++ b/ocs/pkg/service/v0/users.go
@@ -66,7 +66,7 @@ func (o Ocs) GetUser(w http.ResponseWriter, r *http.Request) {
 		enabled = "false"
 	}
 
-	render.Render(w, r, response.DataRender(&data.User{
+	d := &data.User{
 		UserID:            account.PreferredName,
 		DisplayName:       account.DisplayName,
 		LegacyDisplayName: account.DisplayName,
@@ -83,7 +83,8 @@ func (o Ocs) GetUser(w http.ResponseWriter, r *http.Request) {
 			Relative:   0.18,
 			Definition: "default",
 		},
-	}))
+	}
+	render.Render(w, r, response.DataRender(d))
 }
 
 // AddUser creates a new user account
@@ -118,15 +119,11 @@ func (o Ocs) AddUser(w http.ResponseWriter, r *http.Request) {
 
 	// fallbacks
 	/* TODO decide if we want to make these fallbacks. Keep in mind:
-	  - ocis requires a username and email
-	  - the username should really be different from the userid
-	if username == "" {
-		username = userid
-	}
-	if displayname == "" {
-		displayname = username
-	}
+	- ocis requires a preferred_name and email
 	*/
+	if displayname == "" {
+		displayname = userid
+	}
 
 	newAccount := &accounts.Account{
 		Id:                       userid,