+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.argeo.security.ui.admin.wizards;
import javax.jcr.Node;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.argeo.eclipse.ui.dialogs.Error;
-import org.argeo.jcr.ArgeoNames;
+import org.argeo.eclipse.ui.ErrorFeedback;
import org.argeo.jcr.JcrUtils;
+import org.argeo.jcr.UserJcrUtils;
import org.argeo.security.UserAdminService;
+import org.argeo.security.jcr.JcrSecurityModel;
import org.argeo.security.jcr.JcrUserDetails;
import org.eclipse.jface.wizard.Wizard;
import org.springframework.security.GrantedAuthority;
/** Wizard to create a new user */
public class NewUserWizard extends Wizard {
private final static Log log = LogFactory.getLog(NewUserWizard.class);
-
- private String homeBasePath = "/home";
private Session session;
private UserAdminService userAdminService;
+ private JcrSecurityModel jcrSecurityModel;
// pages
private MainUserInfoWizardPage mainUserInfo;
- public NewUserWizard(Session session, UserAdminService userAdminService) {
+ public NewUserWizard(Session session, UserAdminService userAdminService,
+ JcrSecurityModel jcrSecurityModel) {
this.session = session;
this.userAdminService = userAdminService;
+ this.jcrSecurityModel = jcrSecurityModel;
}
@Override
String username = mainUserInfo.getUsername();
try {
- session.save();
- Node userHome = JcrUtils.createUserHome(session, homeBasePath,
- username);
- Node userProfile = userHome.getNode(ArgeoNames.ARGEO_PROFILE);
+ // Node userProfile = SecurityJcrUtils.createUserProfile(session,
+ // username);
+ Node userProfile = jcrSecurityModel.sync(session, username, null);
+ session.getWorkspace().getVersionManager()
+ .checkout(userProfile.getPath());
mainUserInfo.mapToProfileNode(userProfile);
String password = mainUserInfo.getPassword();
- JcrUserDetails jcrUserDetails = new JcrUserDetails(
- userHome.getPath(), username, password, true, true, true,
- true, new GrantedAuthority[0]);
+ // TODO add roles
+ JcrUserDetails jcrUserDetails = new JcrUserDetails(userProfile,
+ password, new GrantedAuthority[0]);
session.save();
+ session.getWorkspace().getVersionManager()
+ .checkin(userProfile.getPath());
userAdminService.createUser(jcrUserDetails);
return true;
} catch (Exception e) {
JcrUtils.discardQuietly(session);
- Node userHome = JcrUtils.getUserHome(session, username);
+ Node userHome = UserJcrUtils.getUserHome(session, username);
if (userHome != null) {
try {
userHome.remove();
+ username, e1);
}
}
- Error.show("Cannot create new user " + username, e);
+ ErrorFeedback.show("Cannot create new user " + username, e);
return false;
}
}