diff --git a/src/main/scala/gitbucket/core/api/UpdateAUser.scala b/src/main/scala/gitbucket/core/api/UpdateAUser.scala index 25c917b..1981c78 100644 --- a/src/main/scala/gitbucket/core/api/UpdateAUser.scala +++ b/src/main/scala/gitbucket/core/api/UpdateAUser.scala @@ -1,11 +1,11 @@ package gitbucket.core.api case class UpdateAUser( - name: String, - email: String, - blog: String, - company: String, - location: String, - hireable: Boolean, - bio: String + name: Option[String], + email: Option[String], + blog: Option[String], + company: Option[String], + location: Option[String], + hireable: Option[Boolean], + bio: Option[String] ) diff --git a/src/main/scala/gitbucket/core/controller/api/ApiUserControllerBase.scala b/src/main/scala/gitbucket/core/controller/api/ApiUserControllerBase.scala index 009f298..4b69621 100644 --- a/src/main/scala/gitbucket/core/controller/api/ApiUserControllerBase.scala +++ b/src/main/scala/gitbucket/core/controller/api/ApiUserControllerBase.scala @@ -38,9 +38,9 @@ (for { data <- extractFromJsonBody[UpdateAUser] } yield { - val updatedAccount = context.loginAccount.get.copy( - mailAddress = data.email, - description = Some(data.bio) + val loginAccount = context.loginAccount.get + val updatedAccount = loginAccount.copy( + mailAddress = data.email.getOrElse(loginAccount.mailAddress) ) updateAccount(updatedAccount) JsonFormat(ApiUser(updatedAccount))