Greg Sheremeta has uploaded a new change for review. Change subject: webadmin, userportal: WIP stop special handling of '@' in user name ......................................................................
webadmin, userportal: WIP stop special handling of '@' in user name Simplify login page behavior: send user-name as is (don't parse by '@', etc.), don't disable the Domain drop-down. Change-Id: If7568c98c34e6edbd011949c5bad397aeba7b4ae Bug-Url: https://bugzilla.redhat.com/1112252 Signed-off-by: Greg Sheremeta <gsher...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractRdp.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/system/ApplicationInit.java 4 files changed, 6 insertions(+), 43 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/31792/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java index 2c4dca6..3f3b480 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java @@ -61,6 +61,9 @@ DbUser user = getCurrentUser(); String domain = user.getDomain(); String name = user.getLoginName(); + + // TODO I'm not sure if I should remove this and just return name + if (StringUtils.isEmpty(name)) { return null; } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractRdp.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractRdp.java index 346e1d4..fa0bd4c 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractRdp.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractRdp.java @@ -23,6 +23,7 @@ String username = Frontend.getInstance().getLoggedInUser().getLoginName(); String domain = Frontend.getInstance().getLoggedInUser().getDomain(); + // TODO should this be simplified to 'return username + "@" + domain' ? return username.contains("@") ? username : username + "@" + domain;//$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java index abdba94..57570f7 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java @@ -5,7 +5,6 @@ import org.ovirt.engine.core.common.action.VdcReturnValueBase; import org.ovirt.engine.core.common.businessentities.aaa.DbUser; -import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; @@ -208,44 +207,6 @@ AsyncDataProvider.getInstance().getAAAProfilesListViaPublic(_asyncQuery); } - @Override - public void eventRaised(Event ev, Object sender, EventArgs args) - { - super.eventRaised(ev, sender, args); - - if (ev.matchesDefinition(EntityModel.entityChangedEventDefinition) && sender == getUserName()) - { - userName_EntityChanged(); - } - } - - private void userName_EntityChanged() - { - getProfile().setIsChangable(getDomainAvailability()); - } - - private boolean getDomainAvailability() - { - // Check whether the user name contains domain part. - boolean hasDomain = getUserNameParts(getUserName().getEntity())[1] != null; - - return !hasDomain; - } - - private String[] getUserNameParts(String value) - { - if (!StringHelper.isNullOrEmpty(value)) - { - int index = value.indexOf('@'); - - // Always return array of two elements representing user name and domain.) - return new String[] { index > -1 ? value.substring(0, index) : value, - index > -1 ? value.substring(index + 1) : null }; - } - - return new String[] { "", null }; //$NON-NLS-1$ - } - public void login() { if (!validate()) @@ -258,8 +219,6 @@ disableLoginScreen(); String fullUserName = getUserName().getEntity(); - String[] parts = getUserNameParts(fullUserName); - String domain = parts[1]; AsyncQuery _asyncQuery = new AsyncQuery(); _asyncQuery.setModel(this); _asyncQuery.asyncCallback = new INewAsyncCallback() { @@ -295,8 +254,7 @@ } }; Frontend.getInstance().loginAsync(fullUserName, getPassword().getEntity(), - StringHelper.isNullOrEmpty(domain) ? getProfile().getSelectedItem() : domain, true, - _asyncQuery); + getProfile().getSelectedItem(), true, _asyncQuery); } protected void raiseLoggedInEvent() { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/system/ApplicationInit.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/system/ApplicationInit.java index 7e5df3b..c744f3e 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/system/ApplicationInit.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/system/ApplicationInit.java @@ -117,6 +117,7 @@ Scheduler.get().scheduleDeferred(new ScheduledCommand() { @Override public void execute() { + // TODO should this be simplified? final String domainToken = "@"; //$NON-NLS-1$ restApiSessionManager.acquireSession( userName.contains(domainToken) ? userName : userName + domainToken + domain, -- To view, visit http://gerrit.ovirt.org/31792 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If7568c98c34e6edbd011949c5bad397aeba7b4ae Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Sheremeta <gsher...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
