Skip to content

The Unified and Autonomous Development Platform

chore: Refactoring authenticating and authorizing service

Robin Shen620c6d14c75e
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index e2ffe6c517..bbec23fb9e 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -182,7 +182,10 @@ import io.onedev.server.security.DefaultShiroFilterConfiguration;
import io.onedev.server.security.DefaultWebSecurityManager;
import io.onedev.server.security.FilterChainConfigurator;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.security.realm.GeneralAuthorizingRealm;
+import io.onedev.server.security.service.AuthenticatingService;
+import io.onedev.server.security.service.AuthorizingService;
+import io.onedev.server.security.service.DefaultAuthenticatingService;
+import io.onedev.server.security.service.DefaultAuthorizingService;
import io.onedev.server.service.AccessTokenAuthorizationService;
import io.onedev.server.service.AccessTokenService;
import io.onedev.server.service.AgentAttributeService;
@@ -651,7 +654,10 @@ public class CoreModule extends AbstractPluginModule {
}
private void configureSecurity() {
- contributeFromPackage(Realm.class, GeneralAuthorizingRealm.class);
+ bind(AuthenticatingService.class).to(DefaultAuthenticatingService.class);
+ bind(AuthorizingService.class).to(DefaultAuthorizingService.class);
+ contribute(Realm.class, DefaultAuthorizingService.class);
+ contribute(Realm.class, DefaultAuthenticatingService.class);
bind(ShiroFilterConfiguration.class).to(DefaultShiroFilterConfiguration.class);
bind(RememberMeManager.class).to(DefaultRememberMeManager.class);
diff --git a/server-core/src/main/java/io/onedev/server/security/service/AuthenticatingService.java b/server-core/src/main/java/io/onedev/server/security/service/AuthenticatingService.java
new file mode 100644
index 0000000000..9f8b1c6849
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/security/service/AuthenticatingService.java
@@ -0,0 +1,6 @@
+package io.onedev.server.security.service;
+
+import org.apache.shiro.realm.Realm;
+
+public interface AuthenticatingService extends Realm {
+}
diff --git a/server-core/src/main/java/io/onedev/server/security/service/AuthorizingService.java b/server-core/src/main/java/io/onedev/server/security/service/AuthorizingService.java
new file mode 100644
index 0000000000..08e2177126
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/security/service/AuthorizingService.java
@@ -0,0 +1,10 @@
+package io.onedev.server.security.service;
+
+import org.apache.shiro.authz.AuthorizationInfo;
+import org.apache.shiro.subject.PrincipalCollection;
+
+public interface AuthorizingService {
+
+ AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.java b/server-core/src/main/java/io/onedev/server/security/service/DefaultAuthenticatingService.java
similarity index 84%
rename from server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.java
rename to server-core/src/main/java/io/onedev/server/security/service/DefaultAuthenticatingService.java
index 16b73f266e..076da08ef6 100644
--- a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.java
+++ b/server-core/src/main/java/io/onedev/server/security/service/DefaultAuthenticatingService.java
@@ -1,4 +1,4 @@
-package io.onedev.server.security.realm;
+package io.onedev.server.security.service;
import static io.onedev.server.model.User.Type.ORDINARY;
import static io.onedev.server.validation.validator.UserNameValidator.normalizeUserName;
@@ -7,7 +7,6 @@ import static io.onedev.server.web.translation.Translation._T;
import java.text.MessageFormat;
import java.util.HashSet;
-import org.jspecify.annotations.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -20,56 +19,50 @@ import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.authc.credential.PasswordMatcher;
import org.apache.shiro.authc.credential.PasswordService;
import org.apache.shiro.realm.AuthenticatingRealm;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.onedev.commons.utils.ExceptionUtils;
-import io.onedev.server.service.EmailAddressService;
-import io.onedev.server.service.GroupService;
-import io.onedev.server.service.MembershipService;
-import io.onedev.server.service.ProjectService;
-import io.onedev.server.service.SettingService;
-import io.onedev.server.service.SshKeyService;
-import io.onedev.server.service.UserService;
import io.onedev.server.model.EmailAddress;
import io.onedev.server.model.User;
import io.onedev.server.model.support.administration.authenticator.Authenticated;
-import io.onedev.server.persistence.SessionService;
import io.onedev.server.persistence.TransactionService;
import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.service.EmailAddressService;
+import io.onedev.server.service.MembershipService;
+import io.onedev.server.service.SettingService;
+import io.onedev.server.service.SshKeyService;
+import io.onedev.server.service.UserService;
@Singleton
-public class PasswordAuthenticatingRealm extends AuthenticatingRealm {
+public class DefaultAuthenticatingService extends AuthenticatingRealm implements AuthenticatingService {
- private static final Logger logger = LoggerFactory.getLogger(PasswordAuthenticatingRealm.class);
+ private static final Logger logger = LoggerFactory.getLogger(DefaultAuthenticatingService.class);
- private final UserService userService;
+ @Inject
+ private UserService userService;
- private final TransactionService transactionService;
+ @Inject
+ private TransactionService transactionService;
- private final MembershipService membershipService;
+ @Inject
+ private MembershipService membershipService;
- private final SshKeyService sshKeyService;
+ @Inject
+ private SshKeyService sshKeyService;
- private final EmailAddressService emailAddressService;
+ @Inject
+ private EmailAddressService emailAddressService;
- private final SettingService settingService;
+ @Inject
+ private SettingService settingService;
@Inject
- public PasswordAuthenticatingRealm(UserService userService, SettingService settingService,
- MembershipService membershipService, GroupService groupService,
- ProjectService projectService, SessionService sessionService,
- TransactionService transactionService, SshKeyService sshKeyService,
- PasswordService passwordService, EmailAddressService emailAddressService) {
+ public DefaultAuthenticatingService(PasswordService passwordService) {
PasswordMatcher passwordMatcher = new PasswordMatcher();
passwordMatcher.setPasswordService(passwordService);
setCredentialsMatcher(passwordMatcher);
- this.userService = userService;
- this.transactionService = transactionService;
- this.membershipService = membershipService;
- this.sshKeyService = sshKeyService;
- this.emailAddressService = emailAddressService;
- this.settingService = settingService;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/security/realm/GeneralAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/service/DefaultAuthorizingService.java
similarity index 82%
rename from server-core/src/main/java/io/onedev/server/security/realm/GeneralAuthorizingRealm.java
rename to server-core/src/main/java/io/onedev/server/security/service/DefaultAuthorizingService.java
index 50cabc27e5..1b9d591b05 100644
--- a/server-core/src/main/java/io/onedev/server/security/realm/GeneralAuthorizingRealm.java
+++ b/server-core/src/main/java/io/onedev/server/security/service/DefaultAuthorizingService.java
@@ -1,4 +1,4 @@
-package io.onedev.server.security.realm;
+package io.onedev.server.security.service;
import static io.onedev.server.security.SecurityUtils.getUser;
@@ -9,6 +9,7 @@ import java.util.HashSet;
import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Singleton;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationInfo;
@@ -22,10 +23,6 @@ import org.apache.wicket.request.cycle.RequestCycle;
import com.google.common.collect.Lists;
-import io.onedev.server.service.GroupService;
-import io.onedev.server.service.ProjectService;
-import io.onedev.server.service.SettingService;
-import io.onedev.server.service.UserService;
import io.onedev.server.model.Group;
import io.onedev.server.model.IssueAuthorization;
import io.onedev.server.model.Project;
@@ -37,32 +34,20 @@ import io.onedev.server.security.permission.ConfidentialIssuePermission;
import io.onedev.server.security.permission.ProjectPermission;
import io.onedev.server.security.permission.SystemAdministration;
import io.onedev.server.security.permission.UserAdministration;
+import io.onedev.server.service.SettingService;
import io.onedev.server.util.Pair;
import io.onedev.server.util.facade.UserFacade;
-public class GeneralAuthorizingRealm extends AuthorizingRealm {
-
- protected final UserService userService;
-
- protected final GroupService groupService;
-
- protected final ProjectService projectService;
-
- protected final SessionService sessionService;
+@Singleton
+public class DefaultAuthorizingService extends AuthorizingRealm implements AuthorizingService {
- protected final SettingService settingService;
+ @Inject
+ private SessionService sessionService;
- private static final MetaDataKey<Map<String, AuthorizationInfo>> AUTHORIZATION_INFOS = new MetaDataKey<>() {};
+ @Inject
+ private SettingService settingService;
- @Inject
- public GeneralAuthorizingRealm(UserService userService, GroupService groupService,
- ProjectService projectService, SessionService sessionService, SettingService settingService) {
- this.userService = userService;
- this.groupService = groupService;
- this.projectService = projectService;
- this.sessionService = sessionService;
- this.settingService = settingService;
- }
+ private final MetaDataKey<Map<String, AuthorizationInfo>> AUTHORIZATION_INFOS = new MetaDataKey<>() {};
private AuthorizationInfo newAuthorizationInfo(String principal) {
var result = sessionService.call(() -> {
@@ -158,7 +143,7 @@ public class GeneralAuthorizingRealm extends AuthorizingRealm {
}
@Override
- protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
+ public AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
String principal = (String) principals.getPrimaryPrincipal();
RequestCycle requestCycle = RequestCycle.get();
if (requestCycle != null) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java b/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java
index 592f810f7c..e4786291ee 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java
@@ -6,6 +6,8 @@ import static io.onedev.server.web.translation.Translation._T;
import java.text.MessageFormat;
+import javax.inject.Inject;
+
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationToken;
import org.apache.shiro.authc.IncorrectCredentialsException;
@@ -31,11 +33,10 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.server.OneDev;
import io.onedev.server.model.SsoProvider;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.security.realm.PasswordAuthenticatingRealm;
+import io.onedev.server.security.service.AuthenticatingService;
import io.onedev.server.service.SettingService;
import io.onedev.server.service.SsoProviderService;
import io.onedev.server.service.UserService;
@@ -46,6 +47,21 @@ import io.onedev.server.web.page.simple.SimplePage;
public class LoginPage extends SimplePage {
+ @Inject
+ private AuthenticatingService authenticationService;
+
+ @Inject
+ private UserService userService;
+
+ @Inject
+ private SettingService settingService;
+
+ @Inject
+ private SsoProviderService ssoProviderService;
+
+ @Inject
+ private RememberMeManager rememberMeManager;
+
private String userName;
private String password;
@@ -88,7 +104,7 @@ public class LoginPage extends SimplePage {
super.onSubmit();
try {
var token = new UsernamePasswordToken(userName, password, rememberMe);
- var user = (User) OneDev.getInstance(PasswordAuthenticatingRealm.class).getAuthenticationInfo(token);
+ var user = (User) authenticationService.getAuthenticationInfo(token);
if (user.isEnforce2FA()) {
if (user.getTwoFactorAuthentication() != null) {
subTitle = _T("Two-factor authentication is enabled. Please input passcode displayed on your TOTP authenticator. If you encounter problems, make sure time of OneDev server and your device running TOTP authenticator is in sync");
@@ -170,15 +186,12 @@ public class LoginPage extends SimplePage {
form.add(new ViewStateAwarePageLink<Void>("forgetPassword", PasswordResetPage.class));
fragment.add(form);
-
- SettingService settingService = OneDev.getInstance(SettingService.class);
-
+
boolean enableSelfRegister = settingService.getSecuritySetting().isEnableSelfRegister();
fragment.add(new ViewStateAwarePageLink<Void>("registerUser", SignUpPage.class).setVisible(enableSelfRegister));
String serverUrl = settingService.getSystemSetting().getServerUrl();
- var ssoProviderService = OneDev.getInstance(SsoProviderService.class);
RepeatingView ssoButtonsView = new RepeatingView("ssoButtons");
var ssoProviders = ssoProviderService.query();
for (SsoProvider provider: ssoProviders) {
@@ -192,13 +205,8 @@ public class LoginPage extends SimplePage {
add(fragment);
}
-
- private UserService getUserService() {
- return OneDev.getInstance(UserService.class);
- }
-
+
private void afterLogin(User user) {
- RememberMeManager rememberMeManager = OneDev.getInstance(RememberMeManager.class);
if (rememberMe) {
AuthenticationToken token = new UsernamePasswordToken(userName, password, rememberMe);
rememberMeManager.onSuccessfulLogin(SecurityUtils.getSubject(), token, user);
@@ -220,7 +228,7 @@ public class LoginPage extends SimplePage {
@Override
protected User getUser() {
- return getUserService().load(userId);
+ return userService.load(userId);
}
});
@@ -233,7 +241,7 @@ public class LoginPage extends SimplePage {
@Override
protected void onSubmit() {
super.onSubmit();
- User user = getUserService().load(userId);
+ User user = userService.load(userId);
if (user.getTwoFactorAuthentication().getTOTPCode().equals(passcode))
afterLogin(user);
else
@@ -281,9 +289,9 @@ public class LoginPage extends SimplePage {
@Override
protected void onSubmit() {
super.onSubmit();
- User user = getUserService().load(userId);
+ User user = userService.load(userId);
if (user.getTwoFactorAuthentication().getScratchCodes().remove(recoveryCode)) {
- getUserService().update(user, null);
+ userService.update(user, null);
afterLogin(user);
} else {
error("Recovery code verification failed");
@@ -322,7 +330,7 @@ public class LoginPage extends SimplePage {
@Override
protected String getTitle() {
- return _T("Sign In To") + " " + OneDev.getInstance(SettingService.class).getBrandingSetting().getName();
+ return _T("Sign In To") + " " + settingService.getBrandingSetting().getName();
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.java b/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.java
index 95eae550ee..a92f705e29 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.java
@@ -8,6 +8,8 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
+import javax.inject.Inject;
+
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.wicket.Component;
@@ -31,13 +33,6 @@ import com.nimbusds.oauth2.sdk.ParseException;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
-import io.onedev.server.service.EmailAddressService;
-import io.onedev.server.service.MembershipService;
-import io.onedev.server.service.SettingService;
-import io.onedev.server.service.SshKeyService;
-import io.onedev.server.service.SsoAccountService;
-import io.onedev.server.service.SsoProviderService;
-import io.onedev.server.service.UserService;
import io.onedev.server.exception.ExceptionUtils;
import io.onedev.server.model.EmailAddress;
import io.onedev.server.model.SsoAccount;
@@ -46,7 +41,14 @@ import io.onedev.server.model.User;
import io.onedev.server.model.support.administration.sso.SsoAuthenticated;
import io.onedev.server.persistence.TransactionService;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.security.realm.PasswordAuthenticatingRealm;
+import io.onedev.server.security.service.DefaultAuthenticatingService;
+import io.onedev.server.service.EmailAddressService;
+import io.onedev.server.service.MembershipService;
+import io.onedev.server.service.SettingService;
+import io.onedev.server.service.SshKeyService;
+import io.onedev.server.service.SsoAccountService;
+import io.onedev.server.service.SsoProviderService;
+import io.onedev.server.service.UserService;
import io.onedev.server.util.Path;
import io.onedev.server.util.PathNode;
import io.onedev.server.web.component.tabbable.ActionTab;
@@ -72,6 +74,30 @@ public class SsoProcessPage extends SimplePage {
private static final Logger logger = LoggerFactory.getLogger(SsoProcessPage.class);
+ @Inject
+ private SsoAccountService ssoAccountService;
+
+ @Inject
+ private UserService userService;
+
+ @Inject
+ private EmailAddressService emailAddressService;
+
+ @Inject
+ private SettingService settingService;
+
+ @Inject
+ private MembershipService membershipService;
+
+ @Inject
+ private SshKeyService sshKeyService;
+
+ @Inject
+ private DefaultAuthenticatingService authenticatingService;
+
+ @Inject
+ private TransactionService transactionService;
+
private final IModel<SsoProvider> providerModel;
private final String stage;
@@ -108,28 +134,28 @@ public class SsoProcessPage extends SimplePage {
throw new RedirectToUrlException(getProvider().getConnector().buildAuthUrl(providerName));
} else {
authenticated = getProvider().getConnector().handleAuthResponse(providerName);
- var aUser = getTransactionService().call(() -> {
- var ssoAccount = getSsoAccountService().find(getProvider(), authenticated.getSubject());
+ var aUser = transactionService.call(() -> {
+ var ssoAccount = ssoAccountService.find(getProvider(), authenticated.getSubject());
if (ssoAccount != null) {
var user = ssoAccount.getUser();
if (user.getType() != ORDINARY || user.isDisabled()) {
- getSsoAccountService().delete(ssoAccount);
+ ssoAccountService.delete(ssoAccount);
} else {
if (authenticated.getEmail() != null) {
- var emailAddress = getEmailAddressService().findByValue(authenticated.getEmail());
+ var emailAddress = emailAddressService.findByValue(authenticated.getEmail());
if (emailAddress == null) {
emailAddress = new EmailAddress();
emailAddress.setValue(authenticated.getEmail());
emailAddress.setVerificationCode(null);
user.addEmailAddress(emailAddress);
- getEmailAddressService().create(emailAddress);
+ emailAddressService.create(emailAddress);
} else if (emailAddress.getOwner().equals(user)) {
emailAddress.setVerificationCode(null);
- getEmailAddressService().update(emailAddress);
+ emailAddressService.update(emailAddress);
} else if (!emailAddress.isVerified()) {
emailAddress.setVerificationCode(null);
user.addEmailAddress(emailAddress);
- getEmailAddressService().update(emailAddress);
+ emailAddressService.update(emailAddress);
} else {
throw new AuthenticationException(MessageFormat.format(_T("Email address \"{0}\" used by account \"{1}\""), authenticated.getEmail(), user.getName()));
}
@@ -139,12 +165,12 @@ public class SsoProcessPage extends SimplePage {
}
}
if (authenticated.getEmail() != null) {
- var emailAddress = getEmailAddressService().findByValue(authenticated.getEmail());
+ var emailAddress = emailAddressService.findByValue(authenticated.getEmail());
if (emailAddress != null) {
var user = emailAddress.getOwner();
if (emailAddress.isVerified()) {
if (user.getType() != ORDINARY) {
- getEmailAddressService().delete(emailAddress);
+ emailAddressService.delete(emailAddress);
} else if (user.isDisabled()) {
throw new AuthenticationException(MessageFormat.format(_T("Email address \"{0}\" used by disabled account \"{1}\""), authenticated.getEmail(), user.getName()));
} else {
@@ -152,13 +178,13 @@ public class SsoProcessPage extends SimplePage {
ssoAccount.setUser(user);
ssoAccount.setProvider(getProvider());
ssoAccount.setSubject(authenticated.getSubject());
- getSsoAccountService().create(ssoAccount);
+ ssoAccountService.create(ssoAccount);
syncGroupsAndSshKeys(user, false);
return user;
}
} else {
- getEmailAddressService().delete(emailAddress);
+ emailAddressService.delete(emailAddress);
}
}
}
@@ -191,13 +217,13 @@ public class SsoProcessPage extends SimplePage {
if (groupNames != null) {
if (getProvider().getDefaultGroup() != null)
groupNames.add(getProvider().getDefaultGroup().getName());
- if (getSettingService().getSecuritySetting().getDefaultGroupName() != null)
- groupNames.add(getSettingService().getSecuritySetting().getDefaultGroupName());
- getMembershipService().syncMemberships(user, groupNames);
+ if (settingService.getSecuritySetting().getDefaultGroupName() != null)
+ groupNames.add(settingService.getSecuritySetting().getDefaultGroupName());
+ membershipService.syncMemberships(user, groupNames);
}
if (authenticated.getSshKeys() != null)
- getSshKeyService().syncSshKeys(user, authenticated.getSshKeys());
+ sshKeyService.syncSshKeys(user, authenticated.getSshKeys());
}
private void afterLogin(User user) {
@@ -257,18 +283,18 @@ public class SsoProcessPage extends SimplePage {
@Override
protected void onSubmit() {
super.onSubmit();
- User userWithSameName = getUserService().findByName(bean.getName());
+ User userWithSameName = userService.findByName(bean.getName());
if (userWithSameName != null) {
editor.error(new Path(new PathNode.Named(User.PROP_NAME)),
_T("Login name already used by another account"));
}
- if (authenticated.getEmail() == null && getEmailAddressService().findByValue(bean.getEmailAddress()) != null) {
+ if (authenticated.getEmail() == null && emailAddressService.findByValue(bean.getEmailAddress()) != null) {
editor.error(new Path(new PathNode.Named(SignUpBean.PROP_EMAIL_ADDRESS)),
_T("Email address already used by another user"));
}
if (editor.isValid()) {
- var aUser = getTransactionService().call(() -> {
+ var aUser = transactionService.call(() -> {
User user = new User();
user.setName(bean.getName());
user.setFullName(bean.getFullName());
@@ -289,9 +315,9 @@ public class SsoProcessPage extends SimplePage {
ssoAccount.setProvider(getProvider());
ssoAccount.setSubject(authenticated.getSubject());
- getUserService().create(user);
- getEmailAddressService().create(emailAddress);
- getSsoAccountService().create(ssoAccount);
+ userService.create(user);
+ emailAddressService.create(emailAddress);
+ ssoAccountService.create(ssoAccount);
syncGroupsAndSshKeys(user, true);
return user;
@@ -323,21 +349,21 @@ public class SsoProcessPage extends SimplePage {
super.onSubmit();
try {
- var aUser = getTransactionService().call(() -> {
+ var aUser = transactionService.call(() -> {
var token = new UsernamePasswordToken(bean.getUserName(), bean.getPassword(), false);
- var user = (User) getPasswordAuthenticatingRealm().getAuthenticationInfo(token);
+ var user = (User) authenticatingService.getAuthenticationInfo(token);
if (authenticated.getEmail() != null) {
var emailAddress = new EmailAddress();
emailAddress.setValue(authenticated.getEmail());
emailAddress.setVerificationCode(null);
user.addEmailAddress(emailAddress);
- getEmailAddressService().create(emailAddress);
+ emailAddressService.create(emailAddress);
}
var ssoAccount = new SsoAccount();
ssoAccount.setUser(user);
ssoAccount.setProvider(getProvider());
ssoAccount.setSubject(authenticated.getSubject());
- getSsoAccountService().create(ssoAccount);
+ ssoAccountService.create(ssoAccount);
syncGroupsAndSshKeys(user, true);
return user;
@@ -385,35 +411,4 @@ public class SsoProcessPage extends SimplePage {
return _T("Connect with your SSO account");
}
- private TransactionService getTransactionService() {
- return OneDev.getInstance(TransactionService.class);
- }
-
- private SsoAccountService getSsoAccountService() {
- return OneDev.getInstance(SsoAccountService.class);
- }
-
- private UserService getUserService() {
- return OneDev.getInstance(UserService.class);
- }
-
- private EmailAddressService getEmailAddressService() {
- return OneDev.getInstance(EmailAddressService.class);
- }
-
- private SettingService getSettingService() {
- return OneDev.getInstance(SettingService.class);
- }
-
- private MembershipService getMembershipService() {
- return OneDev.getInstance(MembershipService.class);
- }
-
- private SshKeyService getSshKeyService() {
- return OneDev.getInstance(SshKeyService.class);
- }
-
- private PasswordAuthenticatingRealm getPasswordAuthenticatingRealm() {
- return OneDev.getInstance(PasswordAuthenticatingRealm.class);
- }
}