Martin Peřina has uploaded a new change for review. Change subject: aaa: Remove userId parameter from LogoutUserCommand ......................................................................
aaa: Remove userId parameter from LogoutUserCommand Removes userId parameter from LogoutUserCommand, because it's redundant as we use supplied sessionId to remove session of the logged-in user. Change-Id: Ia33c7dfd908c68ac06b717c0452e3de4564f35a7 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutBySessionCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutUserCommand.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/LogoutUserParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java 7 files changed, 13 insertions(+), 44 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/38403/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java index 1b3a312..a59958f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; - import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.ejb.ConcurrencyManagement; @@ -38,7 +37,6 @@ import org.ovirt.engine.core.bll.quota.QuotaManager; import org.ovirt.engine.core.common.EngineWorkingMode; import org.ovirt.engine.core.common.action.LoginUserParameters; -import org.ovirt.engine.core.common.action.LogoutUserParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; @@ -591,7 +589,7 @@ } @Override - public VdcReturnValueBase logoff(LogoutUserParameters parameters) { + public VdcReturnValueBase logoff(VdcActionParametersBase parameters) { return runAction(VdcActionType.LogoutUser, parameters); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutBySessionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutBySessionCommand.java index 4139c28..0c20d15 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutBySessionCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutBySessionCommand.java @@ -6,7 +6,6 @@ import org.ovirt.engine.core.bll.Backend; import org.ovirt.engine.core.bll.CommandBase; import org.ovirt.engine.core.bll.utils.PermissionSubject; -import org.ovirt.engine.core.common.action.LogoutUserParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.businessentities.aaa.DbUser; @@ -26,7 +25,7 @@ @Override protected void executeCommand() { - LogoutUserParameters params = new LogoutUserParameters(user.getId()); + VdcActionParametersBase params = new VdcActionParametersBase(); params.setSessionId(getParameters().getSessionId()); setReturnValue(Backend.getInstance().logoff(params)); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutUserCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutUserCommand.java index f0fe1b1..d630b57 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutUserCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutUserCommand.java @@ -10,17 +10,11 @@ import org.ovirt.engine.core.bll.CommandBase; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.AuditLogType; -import org.ovirt.engine.core.common.action.LogoutUserParameters; -import org.ovirt.engine.core.common.businessentities.aaa.DbUser; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; +import org.ovirt.engine.core.common.action.VdcActionParametersBase; -public class LogoutUserCommand<T extends LogoutUserParameters> extends CommandBase<T> { +public class LogoutUserCommand<T extends VdcActionParametersBase> extends CommandBase<T> { public LogoutUserCommand(T parameters) { super(parameters); - if (getCurrentUser() == null) { - DbUser dbUser = DbFacade.getInstance().getDbUserDao().get(parameters.getUserId()); - setCurrentUser(dbUser); - } } @Override @@ -30,6 +24,10 @@ @Override protected void executeCommand() { + if (getCurrentUser() == null) { + setCurrentUser(SessionDataContainer.getInstance().getUser(getParameters().getSessionId(), false)); + } + AuthenticationProfile profile = SessionDataContainer.getInstance().getProfile(getParameters().getSessionId()); if (profile == null) { setSucceeded(false); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/LogoutUserParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/LogoutUserParameters.java deleted file mode 100644 index 7fc3ab3..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/LogoutUserParameters.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ovirt.engine.core.common.action; - -import java.io.Serializable; -import org.ovirt.engine.core.compat.Guid; - -public class LogoutUserParameters extends VdcActionParametersBase implements Serializable { - private static final long serialVersionUID = -8545136602971701926L; - private Guid _userId; - - public LogoutUserParameters(Guid userId) { - _userId = userId; - } - - public Guid getUserId() { - return _userId; - } - - public LogoutUserParameters() { - _userId = Guid.Empty; - } -} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java index 0dd5246..e6c443f 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java @@ -1,8 +1,8 @@ package org.ovirt.engine.core.common.interfaces; import java.util.ArrayList; + import org.ovirt.engine.core.common.action.LoginUserParameters; -import org.ovirt.engine.core.common.action.LogoutUserParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; @@ -35,5 +35,5 @@ VdcReturnValueBase login(LoginUserParameters parameters); - VdcReturnValueBase logoff(LogoutUserParameters parameters); + VdcReturnValueBase logoff(VdcActionParametersBase parameters); } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java index 301d792..ec53ced 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java @@ -6,7 +6,6 @@ import java.util.HashMap; import java.util.List; import java.util.Set; - import javax.ws.rs.GET; import javax.ws.rs.core.Response; @@ -23,7 +22,6 @@ import org.ovirt.engine.api.restapi.util.SessionHelper; import org.ovirt.engine.api.utils.ExpectationHelper; import org.ovirt.engine.api.utils.LinkHelper; -import org.ovirt.engine.core.common.action.LogoutUserParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; @@ -284,7 +282,7 @@ backend.runAction(task, sp); } finally { if (user != null) { - backend.logoff(sh.sessionize(new LogoutUserParameters(user.getId()))); + backend.logoff(sh.sessionize(new VdcActionParametersBase())); } sh.clean(); } diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java index f43b5c0..cb3a0b7 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java @@ -2,13 +2,12 @@ import java.util.ArrayList; import java.util.Random; - import javax.ejb.EJB; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import com.google.gwt.user.client.rpc.SerializationException; import org.ovirt.engine.core.common.action.LoginUserParameters; -import org.ovirt.engine.core.common.action.LogoutUserParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcLoginReturnValueBase; @@ -20,8 +19,6 @@ import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.ui.frontend.gwtservices.GenericApiGWTService; - -import com.google.gwt.user.client.rpc.SerializationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -163,7 +160,7 @@ @Override public VdcReturnValueBase logOff(DbUser userToLogoff) { - LogoutUserParameters params = new LogoutUserParameters(userToLogoff.getId()); + VdcActionParametersBase params = new VdcActionParametersBase(); params.setSessionId(getEngineSessionId()); VdcReturnValueBase returnValue = getBackend().logoff(params); return returnValue; -- To view, visit https://gerrit.ovirt.org/38403 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia33c7dfd908c68ac06b717c0452e3de4564f35a7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
