mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-05 21:15:49 +01:00
13bff2963e
The Git practice is to use the full name when creating commits, not a user name. This commit fixes that by introducing a fullName field to Account and using it when creating commits. For migrating from earlier versions, the user name is used as an initial value for the full name field.
146 lines
6.0 KiB
Scala
146 lines
6.0 KiB
Scala
package app
|
|
|
|
import service._
|
|
import util.AdminAuthenticator
|
|
import util.StringUtil._
|
|
import util.ControlUtil._
|
|
import jp.sf.amateras.scalatra.forms._
|
|
|
|
class UserManagementController extends UserManagementControllerBase
|
|
with AccountService with RepositoryService with AdminAuthenticator
|
|
|
|
trait UserManagementControllerBase extends AccountManagementControllerBase {
|
|
self: AccountService with RepositoryService with AdminAuthenticator =>
|
|
|
|
case class NewUserForm(userName: String, password: String, fullName: String,
|
|
mailAddress: String, isAdmin: Boolean,
|
|
url: Option[String], fileId: Option[String])
|
|
|
|
case class EditUserForm(userName: String, password: Option[String], fullName: String,
|
|
mailAddress: String, isAdmin: Boolean,
|
|
url: Option[String], fileId: Option[String], clearImage: Boolean)
|
|
|
|
case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String],
|
|
memberNames: Option[String])
|
|
|
|
case class EditGroupForm(groupName: String, url: Option[String], fileId: Option[String],
|
|
memberNames: Option[String], clearImage: Boolean)
|
|
|
|
val newUserForm = mapping(
|
|
"userName" -> trim(label("Username" , text(required, maxlength(100), identifier, uniqueUserName))),
|
|
"password" -> trim(label("Password" , text(required, maxlength(20)))),
|
|
"fullName" -> trim(label("Full Name" , text(required, maxlength(100)))),
|
|
"mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress()))),
|
|
"isAdmin" -> trim(label("User Type" , boolean())),
|
|
"url" -> trim(label("URL" , optional(text(maxlength(200))))),
|
|
"fileId" -> trim(label("File ID" , optional(text())))
|
|
)(NewUserForm.apply)
|
|
|
|
val editUserForm = mapping(
|
|
"userName" -> trim(label("Username" , text(required, maxlength(100), identifier))),
|
|
"password" -> trim(label("Password" , optional(text(maxlength(20))))),
|
|
"fullName" -> trim(label("Full Name" , text(required, maxlength(100)))),
|
|
"mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress("userName")))),
|
|
"isAdmin" -> trim(label("User Type" , boolean())),
|
|
"url" -> trim(label("URL" , optional(text(maxlength(200))))),
|
|
"fileId" -> trim(label("File ID" , optional(text()))),
|
|
"clearImage" -> trim(label("Clear image" , boolean()))
|
|
)(EditUserForm.apply)
|
|
|
|
val newGroupForm = mapping(
|
|
"groupName" -> trim(label("Group name" , text(required, maxlength(100), identifier))),
|
|
"url" -> trim(label("URL" , optional(text(maxlength(200))))),
|
|
"fileId" -> trim(label("File ID" , optional(text()))),
|
|
"memberNames" -> trim(label("Member Names" , optional(text())))
|
|
)(NewGroupForm.apply)
|
|
|
|
val editGroupForm = mapping(
|
|
"groupName" -> trim(label("Group name" , text(required, maxlength(100), identifier))),
|
|
"url" -> trim(label("URL" , optional(text(maxlength(200))))),
|
|
"fileId" -> trim(label("File ID" , optional(text()))),
|
|
"memberNames" -> trim(label("Member Names" , optional(text()))),
|
|
"clearImage" -> trim(label("Clear image" , boolean()))
|
|
)(EditGroupForm.apply)
|
|
|
|
get("/admin/users")(adminOnly {
|
|
val users = getAllUsers()
|
|
val members = users.collect { case account if(account.isGroupAccount) =>
|
|
account.userName -> getGroupMembers(account.userName)
|
|
}.toMap
|
|
admin.users.html.list(users, members)
|
|
})
|
|
|
|
get("/admin/users/_newuser")(adminOnly {
|
|
admin.users.html.user(None)
|
|
})
|
|
|
|
post("/admin/users/_newuser", newUserForm)(adminOnly { form =>
|
|
createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, form.isAdmin, form.url)
|
|
updateImage(form.userName, form.fileId, false)
|
|
redirect("/admin/users")
|
|
})
|
|
|
|
get("/admin/users/:userName/_edituser")(adminOnly {
|
|
val userName = params("userName")
|
|
admin.users.html.user(getAccountByUserName(userName))
|
|
})
|
|
|
|
post("/admin/users/:name/_edituser", editUserForm)(adminOnly { form =>
|
|
val userName = params("userName")
|
|
getAccountByUserName(userName).map { account =>
|
|
updateAccount(getAccountByUserName(userName).get.copy(
|
|
password = form.password.map(sha1).getOrElse(account.password),
|
|
fullName = form.fullName,
|
|
mailAddress = form.mailAddress,
|
|
isAdmin = form.isAdmin,
|
|
url = form.url))
|
|
|
|
updateImage(userName, form.fileId, form.clearImage)
|
|
redirect("/admin/users")
|
|
|
|
} getOrElse NotFound
|
|
})
|
|
|
|
get("/admin/users/_newgroup")(adminOnly {
|
|
admin.users.html.group(None, Nil)
|
|
})
|
|
|
|
post("/admin/users/_newgroup", newGroupForm)(adminOnly { form =>
|
|
createGroup(form.groupName, form.url)
|
|
updateGroupMembers(form.groupName, form.memberNames.map(_.split(",").toList).getOrElse(Nil))
|
|
updateImage(form.groupName, form.fileId, false)
|
|
redirect("/admin/users")
|
|
})
|
|
|
|
get("/admin/users/:groupName/_editgroup")(adminOnly {
|
|
defining(params("groupName")){ groupName =>
|
|
admin.users.html.group(getAccountByUserName(groupName), getGroupMembers(groupName))
|
|
}
|
|
})
|
|
|
|
post("/admin/users/:groupName/_editgroup", editGroupForm)(adminOnly { form =>
|
|
defining(params("groupName"), form.memberNames.map(_.split(",").toList).getOrElse(Nil)){ case (groupName, memberNames) =>
|
|
getAccountByUserName(groupName).map { account =>
|
|
updateGroup(groupName, form.url)
|
|
updateGroupMembers(form.groupName, memberNames)
|
|
|
|
getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
|
|
removeCollaborators(form.groupName, repositoryName)
|
|
memberNames.foreach { userName =>
|
|
addCollaborator(form.groupName, repositoryName, userName)
|
|
}
|
|
}
|
|
|
|
updateImage(form.groupName, form.fileId, form.clearImage)
|
|
redirect("/admin/users")
|
|
|
|
} getOrElse NotFound
|
|
}
|
|
})
|
|
|
|
post("/admin/users/_usercheck")(adminOnly {
|
|
getAccountByUserName(params("userName")).isDefined
|
|
})
|
|
|
|
}
|