Changeset 574 for ether_statistics/web/src/com/ether/ControllerEponge.java

Timestamp:

10/09/12 15:02:43 (12 years ago)

Author:

vmipsl

Message:

clean

File:

• ether_statistics/web/src/com/ether/ControllerEponge.java (modified) (7 diffs)

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

@@ -4 +4 @@
 import com.ether.annotation.ParamName;
 import com.ether.user.User;
-import com.ether.user.UserRole;
-import com.ether.user.UserState;
-import com.medias.Constantes;
-import com.medias.Context;
-import com.medias.annuaire.Personne;
-import com.medias.mail.Mail;
-import com.medias.mail.MailFactory;
 import net.sf.json.JSONObject;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+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.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -28 +19 @@
 /**
  * @author vmipsl
- * @date 12 nov 2011
+ * @date 15 march 2012
  */
 public class ControllerEponge
@@ -36 +27 @@
     /** *********************** VIEWS ***************************** **/
     /** *********************************************************** **/
-    @ControllerMethod(view = VIEW_ERRORS)
-    public Map<String, Object> viewErrors()
-            throws ServiceException
+    /**
+     * Home method
+     *
+     * @return
+     * @throws WebException
+     */
+    @ControllerMethod(view = VIEW_INIT)
+    public Map<String, Object> home()
+            throws WebException
     {
         return new HashMap<String, Object>();
     }
 
-    @ControllerMethod(view = VIEW_LOGIN)
-    public Map<String, Object> viewLogin()
-            throws ServiceException
-    {
-        return new HashMap<String, Object>();
-    }
-
-    @ControllerMethod(view = VIEW_DATA_PROTOCOL_EN, requestMandatory = true)
-    public Map<String, Object> viewHomeDataProtocol( @NotNull final HttpServletRequest request )
-            throws ServiceException
-    {
-        final MethodDescription methodDescription = getMethods().get( "viewHomeDataProtocol" );
-
-        if( Context.getLangue( request ).equals( Constantes.french_language ) )
-            methodDescription.setView( VIEW_DATA_PROTOCOL_FR );
-        else
-            methodDescription.setView( VIEW_DATA_PROTOCOL_EN );
-        return new HashMap<String, Object>();
-    }
-
     /** *********************************************************** **/
     /** *********************** CALLS ***************************** **/
     /** *********************************************************** **/
+    /**
+     * This method logs a user
+     *
+     * @param login
+     * @param password
+     * @param request
+     * @return
+     * @throws ServiceException
+     */
     @ControllerMethod(requestMandatory = true, jsonResult = true)
     public JSONObject login( @ParamName(ParameterConstants.PARAMETER_LOGIN) final String login,
@@ -72 +58 @@
             throws ServiceException
     {
-        final JSONObject jSONPeople = new JSONObject();
+        final JSONObject jSONUser = new JSONObject();
         final JSONObject result = new JSONObject();
 
@@ -79 +65 @@
             try
             {
-                final User user = getEtherService().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 if( !UserState.ACCEPTED.equals( user.getState() ) )
-                    result.put( "errors", "login.error.notAccepted" );
-                else
-                {
-                    Personne person = getEtherService().getPeopleByEmail( user.getEmail() );
-                    if( person == null )
-                    {
-                        // This is a simple user with no set of data _ Personne in session is used for tests in .jsp
-                        person = new Personne();
-                        person.setNom( user.getLastName() );
-                        person.setPrenom( user.getFirstName() );
-                        person.setMail( user.getEmail() );
-                        person.setRoles( user.getRole().name() );
-                        // Can't be null because of the tests in .jsp (upload.jsp by example)
-                        person.setJeux( new ArrayList<String>() );
-                    }
-
-                    request.getSession().setAttribute( "SES_USER", person );
-                    jSONPeople.put( "name", user.getLastName() );
-                    jSONPeople.put( "firstName", user.getFirstName() );
-                    jSONPeople.put( "role", user.getRole().name() );
-                }
+//                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() );
+//                }
             }
             catch( Exception e )
@@ -114 +85 @@
         }
 
-        if( !jSONPeople.isEmpty() )
-            result.put( "jSONPeople", jSONPeople );
+        if( !jSONUser.isEmpty() )
+            result.put( "jSONUser", jSONUser );
         return result;
     }
@@ -129 +100 @@
     }
 
-    @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 )
-            throws ServiceException, WebException
-    {
-        try
-        {
-            final User existingUser = getEtherService().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.COORDINATOR, UserState.WAITING, false, creationDate );
-
-                getEtherService().createUser( user );
-
-                // Send email to administrator to inform there is a new account
-                sendEmailToAdministrator( 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();
-    }
+
+//    @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 account to validate
+     * 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 sendEmailToAdministrator( @NotNull final User user )
+    private void sendEmailToAdministratorAndUser( @NotNull final User user )
             throws WebException
     {
         try
         {
-            final MailFactory mailFactory = (MailFactory) getServletContext().getAttribute( "APP_MAILFACTORY" );
-            final String from = (String) getServletContext().getAttribute( "APP_WEBMASTER" );
-            final String toPI = (String) getServletContext().getAttribute( "APP_PI" );
-            final String subject = "[MEGAPOLI] Nouvelle demande de compte utilisateur";
-            final String content = "Hello Matthias,\n\nUne nouvelle demande de compte vient d'arriver.\n\n" +
+            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" +
-                    "Tu peux accepter ou refuser son inscription via le BO : http://ether.ipsl.jussieu.fr/megapoli/backoffice\n\n" +
-                    "Bonne soirée,\nLe serveur masqué";
-
-            final Mail mailAdministrator = new Mail( from, from, null, content, subject );
-            mailFactory.sendMail( mailAdministrator );
-            final Mail mailPI = new Mail( from, toPI, null, content, subject );
-            mailFactory.sendMail( mailPI );
+                    "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 megapoli administrator" );
+            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_ERRORS = "project/errors";
-    private static final String VIEW_LOGIN = "project/login";
+    private static final String VIEW_INIT = "init";
     private static final String VIEW_DATA_PROTOCOL_EN = "project/home_dataProtocol_en";
-    private static final String VIEW_DATA_PROTOCOL_FR = "project/home_dataProtocol_fr";
+    // 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";
 }