Change LDAPUtil method name

This commit is contained in:
Naoki Takezoe
2014-07-13 15:51:22 +09:00
parent 56bb43ea6b
commit 9dbc0c3fd6
4 changed files with 8 additions and 8 deletions

View File

@@ -59,7 +59,7 @@ trait IndexControllerBase extends ControllerBase {
session.setAttribute(Keys.Session.LoginAccount, account)
updateLastLoginDate(account.userName)
if(LDAPUtil.hasLdapDummyMailAddress(account)) {
if(LDAPUtil.isDummyMailAddress(account)) {
redirect("/" + account.userName + "/_edit")
}

View File

@@ -22,7 +22,7 @@ object LDAPUtil {
/**
* Returns true if mail address ends with "@ldap-devnull"
*/
def hasLdapDummyMailAddress(account: Account): Boolean = {
def isDummyMailAddress(account: Account): Boolean = {
account.mailAddress.endsWith(LDAP_DUMMY_MAL)
}
@@ -33,7 +33,7 @@ object LDAPUtil {
* GitBucket does not send any mails to this dummy address. And these users must input their mail address
* at the first step after LDAP authentication.
*/
def getLdapDummyMailAddress(userName: String): String = {
def createDummyMailAddress(userName: String): String = {
userName + LDAP_DUMMY_MAL
}
@@ -74,7 +74,7 @@ object LDAPUtil {
fullName = ldapSettings.fullNameAttribute.flatMap { fullNameAttribute =>
findFullName(conn, userDN, ldapSettings.userNameAttribute, userName, fullNameAttribute)
}.getOrElse(userName),
mailAddress = getLdapDummyMailAddress(userName)))
mailAddress = createDummyMailAddress(userName)))
} else {
findMailAddress(conn, userDN, ldapSettings.userNameAttribute, userName, ldapSettings.mailAttribute.get) match {
case Some(mailAddress) => Right(LDAPUserInfo(

View File

@@ -28,7 +28,7 @@ trait Notifier extends RepositoryService with AccountService with IssuesService
)
.distinct
.withFilter ( _ != context.loginAccount.get.userName ) // the operation in person is excluded
.foreach ( getAccountByUserName(_) filterNot (_.isGroupAccount) filterNot (LDAPUtil.hasLdapDummyMailAddress(_)) foreach (x => notify(x.mailAddress)) )
.foreach ( getAccountByUserName(_) filterNot (_.isGroupAccount) filterNot (LDAPUtil.isDummyMailAddress(_)) foreach (x => notify(x.mailAddress)) )
}