Add forgotten "close session on dispose" behaviour. (fix "WARN Unclosed session detec...

[lgpl/argeo-commons.git] / security / plugins / org.argeo.security.ui.admin / src / main / java / org / argeo / security / ui / admin / editors / ArgeoUserEditor.java

diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java
index 41b27b5ddda0df9ffed0c2f2e404c781d95aaf2b..ebc08319e797e3475dbfaef09b348d3b0336d218 100644 (file)
--- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java
+++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java
@@ -1,14 +1,30 @@
+/*
+ * 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.editors;
 
 import javax.jcr.Node;
+import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
 
 import org.argeo.ArgeoException;
-import org.argeo.jcr.ArgeoNames;
-import org.argeo.security.ArgeoUser;
-import org.argeo.security.SimpleArgeoUser;
+import org.argeo.jcr.JcrUtils;
+import org.argeo.jcr.UserJcrUtils;
 import org.argeo.security.UserAdminService;
 import org.argeo.security.jcr.JcrUserDetails;
-import org.argeo.security.nature.SimpleUserNature;
 import org.argeo.security.ui.admin.SecurityAdminPlugin;
 import org.argeo.security.ui.admin.views.UsersView;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -17,34 +33,40 @@ import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.forms.editor.FormEditor;
-import org.springframework.security.userdetails.UserDetailsManager;
+import org.springframework.security.GrantedAuthority;
 
 /** Editor for an Argeo user. */
 public class ArgeoUserEditor extends FormEditor {
-       public final static String ID = "org.argeo.security.ui.admin.adminArgeoUserEditor";
+       public final static String ID = SecurityAdminPlugin.PLUGIN_ID
+                       + ".adminArgeoUserEditor";
 
-       private ArgeoUser user;
-       private JcrUserDetails userDetails;
-       private Node userHome;
+       /* DEPENDENCY INJECTION */
+       private Session session;
        private UserAdminService userAdminService;
-       private UserDetailsManager userDetailsManager;
+
+       // private Node userHome;
+       private Node userProfile;
+       private JcrUserDetails userDetails;
 
        public void init(IEditorSite site, IEditorInput input)
                        throws PartInitException {
                super.init(site, input);
-               userHome = ((ArgeoUserEditorInput) getEditorInput()).getUserHome();
                String username = ((ArgeoUserEditorInput) getEditorInput())
                                .getUsername();
-
-               userDetails = (JcrUserDetails) userDetailsManager
-                               .loadUserByUsername(username);
-
-               if (username == null) {// new
-                       user = new SimpleArgeoUser();
-                       user.getUserNatures().put(SimpleUserNature.TYPE,
-                                       new SimpleUserNature());
-               } else
-                       user = userAdminService.getUser(username);
+               userProfile = UserJcrUtils.getUserProfile(session, username);
+
+               if (userAdminService.userExists(username)) {
+                       userDetails = (JcrUserDetails) userAdminService
+                                       .loadUserByUsername(username);
+               } else {
+                       GrantedAuthority[] authorities = {};
+                       try {
+                               userDetails = new JcrUserDetails(session, username, null,
+                                               authorities);
+                       } catch (RepositoryException e) {
+                               throw new ArgeoException("Cannot retrieve disabled JCR profile");
+                       }
+               }
 
                this.setPartProperty("name", username != null ? username : "<new user>");
                setPartName(username != null ? username : "<new user>");
@@ -52,8 +74,7 @@ public class ArgeoUserEditor extends FormEditor {
 
        protected void addPages() {
                try {
-                       addPage(new DefaultUserMainPage(this,
-                                       userHome.getNode(ArgeoNames.ARGEO_PROFILE)));
+                       addPage(new DefaultUserMainPage(this, userProfile));
                        addPage(new UserRolesPage(this, userDetails, userAdminService));
                } catch (Exception e) {
                        throw new ArgeoException("Cannot add pages", e);
@@ -80,7 +101,7 @@ public class ArgeoUserEditor extends FormEditor {
                                        .getRoles());
                }
 
-               userDetailsManager.updateUser(userDetails);
+               userAdminService.updateUser(userDetails);
 
                // if (userAdminService.userExists(user.getUsername()))
                // userAdminService.updateUser(user);
@@ -92,11 +113,14 @@ public class ArgeoUserEditor extends FormEditor {
 
                userRolesPage.setUserDetails(userDetails);
 
+               // FIXME rather use a refresh command. Fails when called by another
+               // view.
                // refresh users view
                IWorkbench iw = SecurityAdminPlugin.getDefault().getWorkbench();
                UsersView usersView = (UsersView) iw.getActiveWorkbenchWindow()
                                .getActivePage().findView(UsersView.ID);
-               usersView.refresh();
+               if (usersView != null)
+                       usersView.refresh();
        }
 
        @Override
@@ -113,12 +137,22 @@ public class ArgeoUserEditor extends FormEditor {
                userRolesPage.refresh();
        }
 
+       @Override
+       public void dispose() {
+               JcrUtils.logoutQuietly(session);
+               super.dispose();
+       }
+       
+       /* DEPENDENCY INJECTION */
        public void setUserAdminService(UserAdminService userAdminService) {
                this.userAdminService = userAdminService;
        }
-
-       public void setUserDetailsManager(UserDetailsManager userDetailsManager) {
-               this.userDetailsManager = userDetailsManager;
+       
+       public void setRepository(Repository repository) {
+               try {
+                       session = repository.login();
+               } catch (RepositoryException re) {
+                       throw new ArgeoException("Unable to initialise local session", re);
+               }
        }
-
 }