Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-08 14:35:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check duplicate across primary/extra mail addresses.

Browse Source
This commit is contained in:
KOUNOIKE Yuusuke
2018-04-15 13:28:03 +09:00
parent 243833c3fc
commit 884d4935cc
1 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/scala/gitbucket/core/controller/ControllerBase.scala
View File

@@ -361,6 +361,13 @@ trait AccountManagementControllerBase extends ControllerBase {
params: Map[String, Seq[String]], params: Map[String, Seq[String]],
messages: Messages messages: Messages
): Option[String] = { ): Option[String] = {
val extraMailAddresses = params.filterKeys(k => k.startsWith("extraMailAddresses"))
if (extraMailAddresses.find {
case (k, v) =>
v.contains(value)
}.isDefined) {
Some("These mail addresses are duplicated.")
} else {
getAccountByMailAddress(value, true) getAccountByMailAddress(value, true)
.filter { x => .filter { x =>
if (paramName.isEmpty) true else Some(x.userName) != params.optionValue(paramName) if (paramName.isEmpty) true else Some(x.userName) != params.optionValue(paramName)
@@ -370,6 +377,7 @@ trait AccountManagementControllerBase extends ControllerBase {
} }
} }
} }
}
protected def uniqueExtraMailAddress(paramName: String = ""): Constraint = new Constraint() { protected def uniqueExtraMailAddress(paramName: String = ""): Constraint = new Constraint() {
override def validate( override def validate(
@@ -378,6 +386,13 @@ trait AccountManagementControllerBase extends ControllerBase {
params: Map[String, Seq[String]], params: Map[String, Seq[String]],
messages: Messages messages: Messages
): Option[String] = { ): Option[String] = {
val extraMailAddresses = params.filterKeys(k => k.startsWith("extraMailAddresses"))
if (Some(value) == params.optionValue("mailAddress") || extraMailAddresses.count {
case (k, v) =>
v.contains(value)
} > 1) {
Some("These mail addresses are duplicated.")
} else {
getAccountByMailAddress(value, true) getAccountByMailAddress(value, true)
.filter { x => .filter { x =>
if (paramName.isEmpty) true else Some(x.userName) != params.optionValue(paramName) if (paramName.isEmpty) true else Some(x.userName) != params.optionValue(paramName)
@@ -387,6 +402,7 @@ trait AccountManagementControllerBase extends ControllerBase {
} }
} }
} }
}
val allReservedNames = Set( val allReservedNames = Set(
"git", "git",