/*
- * Copyright (C) 2007-2012 Mathieu Baudier
+ * 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.
import org.apache.commons.logging.LogFactory;
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;
private final static Log log = LogFactory.getLog(NewUserWizard.class);
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 {
- Node userProfile = JcrUtils.createUserProfile(session, username);
- // session.getWorkspace().getVersionManager()
- // .checkout(userProfile.getPath());
+ // 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();
// TODO add roles
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();