r1427 - trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service - Simexplorer-si-commits

20 Mar 2008

Author: glandais
Date: 2008-03-20 16:41:08 +0000 (Thu, 20 Mar 2008)
New Revision: 1427

Modified:
   trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java
Log:
Cleanups and comments

Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java
===================================================================

--- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java	2008-03-20 16:40:26 UTC (rev 1426)
+++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java	2008-03-20 16:41:08 UTC (rev 1427)
@@ -289,48 +289,37 @@
      * 
      * @param token the token
      * 
-     * @return true, if successful
-     * 
      * @throws SimExplorerException the sim explorer exception
      */
-    private boolean canViewElements(String token) throws SimExplorerException {
+    private void canViewElements(String token) throws SimExplorerException {
         User loggedUser = getLoggedUser(token);
-        // boolean canView = loggedUser.isAdmin() || loggedUser.isSuperAdmin();
-        // return canView;
-        return (loggedUser != null);
+        if (loggedUser == null) {
+            throw new SimExplorerSecurityException();
+        }
     }
 
     /* (non-Javadoc)
      * @see fr.cemagref.simexplorer.is.service.AuthenticationService#getGroup(java.lang.String, java.lang.Integer)
      */
     public Group getGroup(String token, Integer id) throws SimExplorerException {
-        if (canViewElements(token)) {
-            Group group = daoActor.getGroup(id);
-            return group;
-        }
-        throw new SimExplorerSecurityException();
+        canViewElements(token);
+        return daoActor.getGroup(id);
     }
 
     /* (non-Javadoc)
     * @see fr.cemagref.simexplorer.is.service.AuthenticationService#getGroup(java.lang.String, java.lang.String)
     */
     public Group getGroup(String token, String name) throws SimExplorerException {
-        if (canViewElements(token)) {
-            Group group = daoActor.getGroup(name);
-            return group;
-        }
-        throw new SimExplorerSecurityException();
+        canViewElements(token);
+        return daoActor.getGroup(name);
     }
 
     /* (non-Javadoc)
      * @see fr.cemagref.simexplorer.is.service.AuthenticationService#getUser(java.lang.String, java.lang.Integer)
      */
     public User getUser(String token, Integer id) throws SimExplorerException {
-        if (canViewElements(token)) {
-            User user = daoActor.getUser(id);
-            return user;
-        }
-        throw new SimExplorerSecurityException();
+        canViewElements(token);
+        return daoActor.getUser(id);
     }
 
     /* (non-Javadoc)
@@ -338,24 +327,36 @@
      */
     @Override
     public Actor getActor(String token, Integer id) throws SimExplorerException {
-        if (canViewElements(token)) {
-            Actor actor = daoActor.getActor(id);
-            return actor;
-        }
-        throw new SimExplorerSecurityException();
+        canViewElements(token);
+        return daoActor.getActor(id);
     }
 
     /* (non-Javadoc)
      * @see fr.cemagref.simexplorer.is.service.AuthenticationService#getUser(java.lang.String, java.lang.String)
      */
     public User getUser(String token, String login) throws SimExplorerException {
-        if (canViewElements(token)) {
-            User user = daoActor.getUser(login);
-            return user;
-        }
-        throw new SimExplorerSecurityException();
+        canViewElements(token);
+        return daoActor.getUser(login);
     }
 
+    /* (non-Javadoc)
+     * @see fr.cemagref.simexplorer.is.service.AuthenticationService#getGroups(java.lang.String)
+     */
+    public Group[] getGroups(String token) throws SimExplorerException {
+        canViewElements(token);
+        Collection<Group> groups = daoActor.getGroups();
+        return groups.toArray(new Group[groups.size()]);
+    }
+
+    /* (non-Javadoc)
+     * @see fr.cemagref.simexplorer.is.service.AuthenticationService#getUsers(java.lang.String)
+     */
+    public User[] getUsers(String token) throws SimExplorerException {
+        canViewElements(token);
+        Collection<User> users = daoActor.getUsers();
+        return users.toArray(new User[users.size()]);
+    }
+
     /**
      * Can save element.
      * 
@@ -377,6 +378,7 @@
     public Group saveGroup(String token, String name) throws SimExplorerException {
         if (canSaveElement(token)) {
             Group oldGroup = daoActor.getGroup(name);
+            // FIXME visible = false
             if (oldGroup != null) {
                 throw new SimExplorerBusinessException(_("simexplorer.service.business.groupexist"));
             }
@@ -397,6 +399,7 @@
     public User saveUser(String token, String login, String mail) throws SimExplorerException {
         if (canSaveElement(token)) {
             User oldUser = daoActor.getUser(login);
+            // FIXME visible = false
             if (oldUser != null) {
                 throw new SimExplorerBusinessException(_("simexplorer.service.business.userexist"));
             }
@@ -486,6 +489,7 @@
             return null;
         }
         User loggedUser;
+        // FIXME cleanup getLoggedUser
         loggedUser = daoActor.getLoggedUser(token);
         if (loggedUser != null) {
             return loggedUser;
@@ -574,28 +578,6 @@
         }
     }
 
-    /* (non-Javadoc)
-     * @see fr.cemagref.simexplorer.is.service.AuthenticationService#getGroups(java.lang.String)
-     */
-    public Group[] getGroups(String token) throws SimExplorerException {
-        if (canViewElements(token)) {
-            Collection<Group> groups = daoActor.getGroups();
-            return groups.toArray(new Group[groups.size()]);
-        }
-        throw new SimExplorerSecurityException();
-    }
-
-    /* (non-Javadoc)
-     * @see fr.cemagref.simexplorer.is.service.AuthenticationService#getUsers(java.lang.String)
-     */
-    public User[] getUsers(String token) throws SimExplorerException {
-        if (canViewElements(token)) {
-            Collection<User> users = daoActor.getUsers();
-            return users.toArray(new User[users.size()]);
-        }
-        throw new SimExplorerSecurityException();
-    }
-
     /**
      * Checks if container contains contained.
      * 
@@ -616,7 +598,7 @@
         }
         return false;
     }
-    
+
     /**
      * Can admin permissions.
      * 
@@ -671,14 +653,13 @@
         return credentialManager.getPermissionsOwnedByCount(user);
     }
 
-/*
-    public Object debugQuery(String query, int type) {
-        return daoActor.debugQuery(query, type);
-    }
-*/
+    /*
+        public Object debugQuery(String query, int type) {
+            return daoActor.debugQuery(query, type);
+        }
+    */
 
-    
-	{
+    {
         I18n.initISO88591("fr", "FR");
     }
 }

    

r1427 - trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service

glandais＠users.labs.libre-entreprise.org

tags

participants (1)