Martin Peřina has uploaded a new change for review. Change subject: frontend: Remove DbUser param from logout/logoff methods ......................................................................
frontend: Remove DbUser param from logout/logoff methods Removes DbUser parameter from logout/logoff methods, because user logout is based on session id only. Change-Id: I8e30747e736a5ef5b4571d685a8a5ca8093bd4d9 Signed-off-by: Martin Perina <[email protected]> --- M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/CommunicationProvider.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProvider.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/OperationProcessor.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/VdcOperationManager.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/gwtservices/GenericApiGWTService.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java M frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/FrontendActionTest.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/system/BaseApplicationInit.java 9 files changed, 18 insertions(+), 30 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/38565/1 diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java index fbaba27..83e416c 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java @@ -833,13 +833,12 @@ /** * Log off the currently logged in user. - * @param dbUser The user object to use to log off. * @param callback The callback to call when the user is logged off. */ - public void logoffAsync(final DbUser dbUser, final AsyncQuery callback) { + public void logoffAsync(final AsyncQuery callback) { logger.finer("Frontend: Invoking async logoff."); //$NON-NLS-1$ - getOperationManager().logoutUser(dbUser, new UserCallback<VdcReturnValueBase>() { + getOperationManager().logoutUser(new UserCallback<VdcReturnValueBase>() { @Override public void onSuccess(final VdcReturnValueBase result) { logger.finer("Succesful returned result from logoff."); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/CommunicationProvider.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/CommunicationProvider.java index 680a2f0..cfb4af1 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/CommunicationProvider.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/CommunicationProvider.java @@ -26,10 +26,9 @@ /** * Log out user, using the communications provider. - * @param userObject The object with the user information. * @param callback The callback object to call after the operation is completed. */ - void logout(Object userObject, UserCallback<?> callback); + void logout(UserCallback<?> callback); /** * Store a {@code String} key value pair in the {@code HttpSession} on the server side. As a result these keys diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProvider.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProvider.java index 46f2139..8e15746 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProvider.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProvider.java @@ -9,7 +9,6 @@ import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; -import org.ovirt.engine.core.common.businessentities.aaa.DbUser; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -508,16 +507,15 @@ /** * Log the user out. - * @param userObject The object containing the user information. * @param callback The callback to call when the operation is complete. */ @Override - public void logout(final Object userObject, final UserCallback callback) { + public void logout(final UserCallback callback) { getService(new ServiceCallback() { @Override public void serviceFound(GenericApiGWTServiceAsync foundService) { - foundService.logOff((DbUser) userObject, new AsyncCallback<VdcReturnValueBase>() { + foundService.logOff(new AsyncCallback<VdcReturnValueBase>() { @Override public void onSuccess(final VdcReturnValueBase result) { //Remove the rpc token when logging out. diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/OperationProcessor.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/OperationProcessor.java index 3e31a59..7341bfc 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/OperationProcessor.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/OperationProcessor.java @@ -260,11 +260,10 @@ /** * Log out the user. - * @param userObject The object containing enough information for the provider to log the user out. * @param callback The callback to call when the operation is completed. */ - public void logoutUser(final Object userObject, final UserCallback<?> callback) { - communicationProvider.logout(userObject, callback); + public void logoutUser(final UserCallback<?> callback) { + communicationProvider.logout(callback); } /** diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/VdcOperationManager.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/VdcOperationManager.java index 58b9e61..8245c8e 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/VdcOperationManager.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/VdcOperationManager.java @@ -148,12 +148,11 @@ /** * Log out the user. - * @param userObject The object containing enough information for the provider to log the user out. * @param callback The callback to call when the operation is completed. */ - public void logoutUser(final Object userObject, final UserCallback<?> callback) { + public void logoutUser(final UserCallback<?> callback) { loggedIn = false; - processor.logoutUser(userObject, callback); + processor.logoutUser(callback); } /** diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/gwtservices/GenericApiGWTService.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/gwtservices/GenericApiGWTService.java index bec93e3..b74acc0 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/gwtservices/GenericApiGWTService.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/gwtservices/GenericApiGWTService.java @@ -43,7 +43,7 @@ public DbUser getLoggedInUser(); @NoXsrfProtect - public VdcReturnValueBase logOff(DbUser userToLogoff); + public VdcReturnValueBase logOff(); @NoXsrfProtect public VdcReturnValueBase login(String userName, String password, String profileName, VdcActionType loginType); 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 cb3a0b7..bd03c3a 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 @@ -159,7 +159,7 @@ } @Override - public VdcReturnValueBase logOff(DbUser userToLogoff) { + public VdcReturnValueBase logOff() { VdcActionParametersBase params = new VdcActionParametersBase(); params.setSessionId(getEngineSessionId()); VdcReturnValueBase returnValue = getBackend().logoff(params); diff --git a/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/FrontendActionTest.java b/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/FrontendActionTest.java index 83a538b..6a69aef 100644 --- a/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/FrontendActionTest.java +++ b/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/FrontendActionTest.java @@ -891,10 +891,8 @@ public void testLogoffAsync_ignored_failure() { Object model = new Object(); when(mockAsyncQuery.getModel()).thenReturn(model); - DbUser testUser = new DbUser(); - testUser.setLoginName("testUser"); //$NON-NLS-1$ - frontend.logoffAsync(testUser, mockAsyncQuery); - verify(mockService).logOff(eq(testUser), callbackAction.capture()); + frontend.logoffAsync(mockAsyncQuery); + verify(mockService).logOff(callbackAction.capture()); StatusCodeException exception = new StatusCodeException(0, "0 status code"); //$NON-NLS-1$ callbackAction.getValue().onFailure(exception); verify(mockFrontendFailureEvent, never()).raise(eq(Frontend.class), (FrontendFailureEventArgs) any()); @@ -916,10 +914,8 @@ public void testLogoffAsync_404_failure() { Object model = new Object(); when(mockAsyncQuery.getModel()).thenReturn(model); - DbUser testUser = new DbUser(); - testUser.setLoginName("testUser"); //$NON-NLS-1$ - frontend.logoffAsync(testUser, mockAsyncQuery); - verify(mockService).logOff(eq(testUser), callbackAction.capture()); + frontend.logoffAsync(mockAsyncQuery); + verify(mockService).logOff(callbackAction.capture()); StatusCodeException exception = new StatusCodeException(HttpServletResponse.SC_NOT_FOUND, "404 status code"); //$NON-NLS-1$ callbackAction.getValue().onFailure(exception); @@ -941,10 +937,8 @@ public void testLogoffAsync_success() { Object model = new Object(); when(mockAsyncQuery.getModel()).thenReturn(model); - DbUser testUser = new DbUser(); - testUser.setLoginName("testUser"); //$NON-NLS-1$ - frontend.logoffAsync(testUser, mockAsyncQuery); - verify(mockService).logOff(eq(testUser), callbackAction.capture()); + frontend.logoffAsync(mockAsyncQuery); + verify(mockService).logOff(callbackAction.capture()); VdcReturnValueBase returnValue = new VdcReturnValueBase(); callbackAction.getValue().onSuccess(returnValue); verify(mockAsyncCallback).onSuccess(model, returnValue); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/system/BaseApplicationInit.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/system/BaseApplicationInit.java index 27f926d..cd0eb36 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/system/BaseApplicationInit.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/system/BaseApplicationInit.java @@ -129,7 +129,7 @@ } }; - frontend.logoffAsync(frontend.getLoggedInUser(), query); + frontend.logoffAsync(query); } protected void performLogin(T loginModel) { -- To view, visit https://gerrit.ovirt.org/38565 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8e30747e736a5ef5b4571d685a8a5ca8093bd4d9 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
