Move sendemail.allowRegisterNewEmail to auth.allowRegisterNewEmail

The sendemail section of the configuration is for settings related to how
Gerrit sends emails to users. allowRegisterEmail controls whether or not
users are allowed to register a new email address, which is not related
to Gerrit's sending of email.

Move the setting to the auth section, which is a more appropriate place
for it.

Change-Id: I06d9c4870060eb85bc4a05b536645d42df44e041
This commit is contained in:
David Pursehouse
2015-11-27 00:15:42 +09:00
parent d4b57bea6a
commit 21bd07bc97
5 changed files with 19 additions and 22 deletions

View File

@@ -33,7 +33,6 @@ import com.google.gerrit.server.account.EmailExpander;
import com.google.gerrit.server.auth.AuthenticationUnavailableException;
import com.google.gerrit.server.config.AuthConfig;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.mail.EmailSettings;
import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -79,7 +78,6 @@ public class LdapRealm extends AbstractRealm {
Helper helper,
AuthConfig authConfig,
EmailExpander emailExpander,
EmailSettings emailSettings,
@Named(LdapModule.GROUP_CACHE) final LoadingCache<String, Set<AccountGroup.UUID>> membershipCache,
@Named(LdapModule.USERNAME_CACHE) final LoadingCache<String, Optional<Account.Id>> usernameCache,
@GerritServerConfig final Config config) {
@@ -98,7 +96,7 @@ public class LdapRealm extends AbstractRealm {
if (optdef(config, "accountSshUserName", "DEFAULT") != null) {
readOnlyAccountFields.add(Account.FieldName.USER_NAME);
}
if (!emailSettings.allowRegisterNewEmail) {
if (!authConfig.isAllowRegisterNewEmail()) {
readOnlyAccountFields.add(Account.FieldName.REGISTER_NEW_EMAIL);
}