From c14bf9fdab76e94e146b80f83b5a0c5f460d8ab2 Mon Sep 17 00:00:00 2001
From: Gucheng Wang <nomeguy@qq.com>
Date: Mon, 28 Feb 2022 13:17:05 +0800
Subject: [PATCH] Fix bug in first name, last name checking

---
 controllers/account.go | 8 +++++---
 object/check.go        | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/controllers/account.go b/controllers/account.go
index 33eb3e1e..80a7cfde 100644
--- a/controllers/account.go
+++ b/controllers/account.go
@@ -172,9 +172,11 @@ func (c *ApiController) Signup() {
 	}
 
 	if application.GetSignupItemRule("Display name") == "First, last" {
-		user.DisplayName = fmt.Sprintf("%s %s", form.FirstName, form.LastName)
-		user.FirstName = form.FirstName
-		user.LastName = form.LastName
+		if form.FirstName != "" || form.LastName != "" {
+			user.DisplayName = fmt.Sprintf("%s %s", form.FirstName, form.LastName)
+			user.FirstName = form.FirstName
+			user.LastName = form.LastName
+		}
 	}
 
 	affected := object.AddUser(user)
diff --git a/object/check.go b/object/check.go
index 98b06c8f..114acf4d 100644
--- a/object/check.go
+++ b/object/check.go
@@ -85,7 +85,7 @@ func CheckUserSignup(application *Application, organization *Organization, usern
 	}
 
 	if application.IsSignupItemVisible("Display name") {
-		if application.GetSignupItemRule("Display name") == "First, last" {
+		if application.GetSignupItemRule("Display name") == "First, last" && (firstName != "" || lastName != "") {
 			if firstName == "" {
 				return "firstName cannot be blank"
 			} else if lastName == "" {