Changeset 667 for ether_statistics/web/src/com

Timestamp:

11/15/12 11:01:02 (12 years ago)

Author:

vmipsl

Message:

account BD

Location:

ether_statistics/web/src/com/ether

Files:

• ControllerEponge.java (modified) (5 diffs)
• ControllerEther.java (modified) (5 diffs)
• ControllerStatistics.java (modified) (4 diffs)
• WebException.java (modified) (1 diff)
• WebHelper.java (modified) (2 diffs)

ether_statistics/web/src/com/ether/ControllerEponge.java

@@ -1 +1 @@
 package com.ether;
 
+import com.ether.account.Account;
 import com.ether.annotation.ControllerMethod;
 import com.ether.annotation.ParamName;
-import com.ether.user.User;
 import net.sf.json.JSONObject;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
-import org.springframework.mail.javamail.MimeMessageHelper;
 
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
 import javax.servlet.http.HttpServletRequest;
+import java.security.DigestException;
+import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
 import java.util.Map;
@@ -56 +54 @@
                              @ParamName(ParameterConstants.PARAMETER_PWD) final String password,
                              @NotNull final HttpServletRequest request )
-            throws ServiceException
+            throws WebException
     {
         final JSONObject jSONUser = new JSONObject();
@@ -65 +63 @@
             try
             {
-//                final User user = getTapasService().getUserByEmail( login );
-//                final String encryptedPassword = EtherHelper.encryptPassword( password );
-//                if( user == null )
-//                    result.put( "errors", "login.error.notFound" );
-//                else if( !encryptedPassword.equals( user.getPassword() ) )
-//                    result.put( "errors", "login.error.wrongPassword" );
-//                else
-//                {
-//                    request.getSession().setAttribute( "SES_USER", user );
-//                    jSONUser.put( "name", user.getLastName() );
-//                    jSONUser.put( "firstName", user.getFirstName() );
-//                    jSONUser.put( "role", user.getRole().name() );
-//                }
+                final Account account = getEtherService().getAccountByLogin( login );
+                final String encryptedPassword = EtherHelper.encryptPassword( password );
+                if( account == null )
+                    throw new WebException( WebException.WebCode.ERROR_LOGIN_NOT_FOUND, "No login found", WebException.getExceptionThrowable() );
+                else if( !encryptedPassword.equals( account.getPassword() ) )
+                    throw new WebException( WebException.WebCode.ERROR_PASSWORD, "Wrong password", WebException.getExceptionThrowable() );
+                else
+                {
+                    request.getSession().setAttribute( "SES_ACCOUNT", account );
+                    jSONUser.put( "name", account.getName() );
+                    jSONUser.put( "role", account.getRole() );
+                }
             }
-            catch( Exception e )
+            catch( DigestException e )
             {
-                result.put( "errors", "login.error.failed" );
+                throw new WebException( WebException.WebCode.ERROR_ENCRYPT_PASSWORD, "Error to encrypt password", WebException.getExceptionThrowable() );
+            }
+            catch( NoSuchAlgorithmException e )
+            {
+                throw new WebException( WebException.WebCode.ERROR_ENCRYPT_PASSWORD, "Error to encrypt password", WebException.getExceptionThrowable() );
+            }
+            catch( ServiceException e )
+            {
+                throw new WebException( WebException.WebCode.ERROR_LOGIN_NOT_FOUND, "Error no login found", WebException.getExceptionThrowable() );
             }
         }
@@ -92 +97 @@
     @ControllerMethod(requestMandatory = true, jsonResult = true)
     public JSONObject logout( @NotNull final HttpServletRequest request )
-            throws ServiceException
+            throws WebException
     {
-        request.getSession().setAttribute( "SES_USER", null );
+        request.getSession().setAttribute( "SES_ACCOUNT", null );
         request.getSession().invalidate();
 
@@ -100 +105 @@
     }
 
-
-//    @ControllerMethod(jsonResult = true)
-//    public JSONObject createAccount( @NotNull @ParamName(ParameterConstants.PARAMETER_NAME) final String lastName,
-//                                     @Nullable @ParamName(ParameterConstants.PARAMETER_FIRST_NAME) final String firstName,
-//                                     @NotNull @ParamName(ParameterConstants.PARAMETER_EMAIL) final String email,
-//                                     @NotNull @ParamName(ParameterConstants.PARAMETER_PWD) final String password,
-//                                     @Nullable @ParamName(ParameterConstants.PARAMETER_LABORATORY) final String laboratory,
-//                                     @Nullable @ParamName(ParameterConstants.PARAMETER_COUNTRY) final String country )
-//            throws ServiceException, WebException
-//    {
-//        try
-//        {
-//            final User existingUser = getTapasService().getUserByEmail( email );
-//            if( null == existingUser )
-//            {
-//                final Date creationDate = new Date();
-//
-//                final String encryptedPassword = EtherHelper.encryptPassword( password );
-//                final User user = new User( lastName, firstName, email, encryptedPassword, UserRole.USER, false, laboratory, country, creationDate );
-//
-//                getTapasService().createUser( user );
-//
-//                // Send email to administrator to inform there is a new account
-//                sendEmailToAdministratorAndUser( user );
-//            }
-//            else
-//                throw new WebException( WebException.WebCode.USER_ALREADY_EXISTS, "This email already corresponds to an User", WebException.getExceptionThrowable() );
-//        }
-//        catch( DigestException e )
-//        {
-//            throw new WebException( WebException.WebCode.ERROR_ENCRYPT_PASSWORD, "This password cannot be encrypted" );
-//        }
-//        catch( NoSuchAlgorithmException e )
-//        {
-//            throw new WebException( WebException.WebCode.ERROR_ENCRYPT_PASSWORD, "This password cannot be encrypted" );
-//        }
-//
-//        return new JSONObject();
-//    }
-
-    /**
-     * This method create and send an email to :
-     * - the administrator to inform there is a new created account
-     * - the user to inform his account is created
-     *
-     * @param user
-     * @throws WebException
-     */
-    private void sendEmailToAdministratorAndUser( @NotNull final User user )
-            throws WebException
-    {
-        try
-        {
-            final String host = getProperty( "mail.host" );
-            final String webMaster = getProperty( "mail.webmaster" );
-            final JavaMailSenderImpl sender = new JavaMailSenderImpl();
-            sender.setHost( host );
-
-            final MimeMessage message = sender.createMimeMessage();
-            final MimeMessageHelper helper = new MimeMessageHelper( message );
-
-            // Mail Admin
-            final String subjectAdmin = "[TAPAS] Nouveau compte utilisateur";
-            final String contentAdmin = "Nouvelle création de compte : \n\n" +
-                    "   - Nom : " + user.getLastName() + '\n' +
-                    "   - Prénom : " + user.getFirstName() + '\n' +
-                    "   - Email : " + user.getEmail() + "\n\n" +
-                    "Le serveur de mail masqué";
-
-            helper.setFrom( webMaster );
-            helper.setTo( webMaster );
-            helper.setSubject( subjectAdmin );
-            helper.setText( contentAdmin );
-            sender.send( message );
-
-            // Mail User
-            final String subjectUser = "[TAPAS] New account";
-            final String contentUser = "Dear " + user.getLastName() + "\n\n" +
-                    "Your account on TAPAS is now created. You can access to the website with your email as login and your password.\n\n" +
-                    "The TAPAS Administrator";
-
-            helper.setFrom( webMaster );
-            helper.setTo( user.getEmail() );
-            helper.setSubject( subjectUser );
-            helper.setText( contentUser );
-            sender.send( message );
-        }
-        catch( MessagingException e )
-        {
-            throw new WebException( WebException.WebCode.ERROR_EMAIL_CANNOT_BE_SEND, "The email cannot be send to the TAPAS administrator or USER" );
-        }
-    }
-
-//    @ControllerMethod(downloadFile = DOWNLOAD_DATA_PROTOCOL_EN)
-//    public void downloadFileDataProtocolEn()
-//    {
-//    }
-//
-//    @ControllerMethod(downloadFile = DOWNLOAD_DATA_PROTOCOL_FR)
-//    public void downloadFileDataProtocolFr()
-//    {
-//    }
-//
     private static final Log LOGGER = LogFactory.getLog( ControllerEponge.class );
-
     private static final String VIEW_INIT = "init";
-    private static final String VIEW_DATA_PROTOCOL_EN = "project/home_dataProtocol_en";
-    // TODO : mettre les bons fichiers de Dataprotocol
-    private static final String DOWNLOAD_DATA_PROTOCOL_EN = "bib.txt";
-    private static final String DOWNLOAD_DATA_PROTOCOL_FR = "bib.txt";
 }

ether_statistics/web/src/com/ether/ControllerEther.java

@@ -1 +1 @@
 package com.ether;
 
+import com.ether.account.Account;
 import com.ether.annotation.ControllerMethod;
 import com.ether.annotation.Mandatory;
 import com.ether.annotation.ParamName;
 import com.ether.annotation.UseJSON;
-import com.ether.user.User;
 import net.sf.json.JSON;
 import net.sf.json.JSONArray;
@@ -113 +113 @@
             // Parse parameters
             final Object[] params = buildParams( methodDescription, request );
-            final String defaultView = ( null != methodDescription.getDefaultView() && !"".equals( methodDescription.getDefaultView() ) ) ? methodDescription.getDefaultView() : methodDescription.getView();
-
 
             if( methodDescription.isRequestMandatory() )
                 params[params.length - 1] = request; //params = parametre de la methode du Controller
 
-
             if( methodDescription.isLoginMandatory() )
             {
-                final User user = (User) request.getSession().getAttribute( "SES_USER" );
-                if( null == user )
-                    return new ModelAndView( defaultView, "errors", "login.error.unknown" );
+                final Account account = (Account) request.getSession().getAttribute( "SES_ACCOUNT" );
+                if( null == account )
+                {
+                    sendSerializedException( response, new WebException( WebException.WebCode.ERROR_LOGIN_NOT_FOUND, "No login found", WebException.getExceptionThrowable() ) );
+                    return null;
+                }
             }
 
@@ -135 +135 @@
 //                    params[params.length - 1] = user;
 //            }
-//
-            if( methodDescription.isBackofficeMethod() )
-            {
-                final User user = (User) request.getSession().getAttribute( "SES_USER" );
-                if( null == user )
-                {
-                    return new ModelAndView( defaultView, "errors", "login.error.unknown" );
-                }
-                else if( null != user && !user.isAccessToBO() )
-                {
-                    return new ModelAndView( defaultView, "errors", "login.error.bo.notAccepted" );
-                }
-            }
 
             final Object result;
@@ -177 +164 @@
                 return null;
             }
-//            else if( null != methodDescription.getDownloadFile() && !"".equals( methodDescription.getDownloadFile() ) )
-//            {
-//                final String fileName = methodDescription.getDownloadFile();
-//                final String downloadPath = getProperty( "downloadPath" );
-//                WebHelper.downloadFileToResponse( fileName, downloadPath, response );
-//                return null;
-//            }
             else
             {
@@ -190 +170 @@
             }
         }
-        catch( Throwable e )
-        {
-            throw new WebException( e );
+        catch( IOException e )
+        {
+            throw new WebException( WebException.WebCode.IO_EXCEPTION_ERROR, e );
         }
     }

ether_statistics/web/src/com/ether/ControllerStatistics.java

@@ -30 +30 @@
             throws ServiceException
     {
-        return new ModelAndView( VIEW_ERRORS );
+        return new ModelAndView( VIEW_INIT );
     }
 
@@ -37 +37 @@
             throws ServiceException
     {
-//        final Calendar cal = Calendar.getInstance();
-//        final Date today = cal.getTime();
-//        cal.set( 1900, Calendar.JANUARY, 1 );
-//        final Date begin = cal.getTime();
-//        cal.set( Calendar.DST_OFFSET, 40001 );
-//        final Date bob = cal.getTime();
         return new HashMap<String, Object>();
     }
@@ -56 +50 @@
      * @throws ServiceException
      */
-    @ControllerMethod(jsonResult = true)
+    @ControllerMethod(jsonResult = true, loginMandatory = true)
     public JSONObject searchMainStatisticsByProject( @Mandatory @ParamName(ParameterConstants.PARAMETER_NAME) final String projectName )
             throws ServiceException
@@ -70 +64 @@
     private static final Log LOGGER = LogFactory.getLog( ControllerStatistics.class );
 
+    private static final String VIEW_INIT = "init";
     private static final String VIEW_STATISTICS = "project/statistics";
-    private static final String VIEW_VISUALIZATION_PARAMETER_BY_PLATEFORM = "visualization/visu_parameter_by_pf";
-    private static final String VIEW_DOWNLOAD_OK = "data/access/extract3";
-    private static final String VIEW_WORK = "project/inWork";
-    public static final String VIEW_ERRORS = "project/errors";
-
-    private static final String FORMAT_DEFAULT = "NASA-AMES";
-    private static final String COMPRESSION_DEFAULT = "None";
 }

ether_statistics/web/src/com/ether/WebException.java

@@ -41 +41 @@
         ERROR_NO_REQUEST_HANDLING_METHOD,
         ERROR_NUMBER_OF_PARAM_TYPES_NOT_EQUAL_TO_PARAM_ANNOTATIONS,
-        USER_ALREADY_EXISTS,
         ERROR_ENCRYPT_PASSWORD,
-        ERROR_EMAIL_CANNOT_BE_SEND,
-        ERROR_XML_CREATION,
-        ERROR_NO_OBSERVATORY_FOUND,
-        ERROR_NO_USER_FOUND,
+        ERROR_PASSWORD,
+        ERROR_LOGIN_NOT_FOUND,
         ERROR_TO_READ_FILE_PROPERTIES,
-        ERROR_TO_REMOVE_USER,
-        ERROR_USERS_CREATION
+        IO_EXCEPTION_ERROR
     }
 

ether_statistics/web/src/com/ether/WebHelper.java

@@ -2 +2 @@
 
 import com.ether.WebException.WebCode;
-import com.ether.user.User;
+import com.ether.account.Account;
 import net.sf.json.JSONObject;
 import org.apache.commons.logging.Log;
@@ -86 +86 @@
         final JSONObject jSONPeople = new JSONObject();
 
-        final User user = (User) request.getSession().getAttribute( "SES_USER" );
-        if( null == user )
+        final Account account = (Account) request.getSession().getAttribute( "SES_ACCOUNT" );
+        if( null == account )
             return null;
 
-        jSONPeople.put( "name", user.getLastName() );
-        jSONPeople.put( "firstName", user.getFirstName() );
-        jSONPeople.put( "role", user.getRole() );
+        jSONPeople.put( "name", account.getName() );
+        jSONPeople.put( "role", account.getRole() );
         return jSONPeople;
     }