Changeset 414 for tapas/web/src/com/ether/ControllerEponge.java

Timestamp:

03/15/12 12:53:14 (12 years ago)

Author:

vmipsl

Message:

login application
servlet data
ControllerEponge?

File:

• tapas/web/src/com/ether/ControllerEponge.java (copied) (copied from ether_megapoli/trunk/web/src/com/ether/ControllerEponge.java) (14 diffs)

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

@@ -5 +5 @@
 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;
@@ -17 +11 @@
 import org.jetbrains.annotations.Nullable;
 
-import javax.mail.MessagingException;
 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;
@@ -28 +20 @@
 /**
  * @author vmipsl
- * @date 12 nov 2011
+ * @date 15 march 2012
  */
 public class ControllerEponge
@@ -36 +28 @@
     /** *********************** VIEWS ***************************** **/
     /** *********************************************************** **/
-    @ControllerMethod(view = VIEW_ERRORS)
-    public Map<String, Object> viewErrors()
-            throws ServiceException
+    @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()
+    @ControllerMethod(view = VIEW_ERRORS)
+    public Map<String, Object> viewErrors()
             throws ServiceException
     {
@@ -56 +48 @@
         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 );
+//        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>();
     }
@@ -66 +58 @@
     /** *********************** 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 +73 @@
             throws ServiceException
     {
-        final JSONObject jSONPeople = new JSONObject();
+        final JSONObject jSONUser = new JSONObject();
         final JSONObject result = new JSONObject();
 
@@ -79 +80 @@
             try
             {
-                final User user = getEtherService().getUserByEmail( login );
+                final User user = getTapasService().getUserByEmail( login );
                 final String encryptedPassword = EtherHelper.encryptPassword( password );
                 if( user == null )
@@ -85 +86 @@
                 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() );
+                    request.getSession().setAttribute( "SES_USER", user );
+                    jSONUser.put( "name", user.getLastName() );
+                    jSONUser.put( "firstName", user.getFirstName() );
+                    jSONUser.put( "role", user.getRole().name() );
                 }
             }
@@ -114 +100 @@
         }
 
-        if( !jSONPeople.isEmpty() )
-            result.put( "jSONPeople", jSONPeople );
+        if( !jSONUser.isEmpty() )
+            result.put( "jSONUser", jSONUser );
         return result;
     }
@@ -129 +115 @@
     }
 
+
     @ControllerMethod(jsonResult = true)
     public JSONObject createAccount( @NotNull @ParamName(ParameterConstants.PARAMETER_NAME) final String lastName,
@@ -138 +125 @@
         try
         {
-            final User existingUser = getEtherService().getUserByEmail( email );
+            final User existingUser = getTapasService().getUserByEmail( email );
             if( null == existingUser )
             {
@@ -144 +131 @@
 
                 final String encryptedPassword = EtherHelper.encryptPassword( password );
-                final User user = new User( lastName, firstName, email, encryptedPassword, UserRole.COORDINATOR, UserState.WAITING, false, creationDate );
+                final User user = new User( lastName, firstName, email, encryptedPassword, UserRole.USER, false, creationDate );
 
-                getEtherService().createUser( user );
+                getTapasService().createUser( user );
 
                 // Send email to administrator to inform there is a new account
@@ -175 +162 @@
             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" +
-                    "   - 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 );
-        }
-        catch( MessagingException e )
-        {
-            throw new WebException( WebException.WebCode.ERROR_EMAIL_CANNOT_BE_SEND, "The email cannot be send to the megapoli administrator" );
-        }
+//        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" +
+//                    "   - 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 );
+//        }
+//        catch( MessagingException e )
+//        {
+//            throw new WebException( WebException.WebCode.ERROR_EMAIL_CANNOT_BE_SEND, "The email cannot be send to the megapoli administrator" );
+//        }
     }
 
     private static final Log LOGGER = LogFactory.getLog( ControllerEponge.class );
 
+    private static final String VIEW_INIT = "init";
     private static final String VIEW_ERRORS = "project/errors";
-    private static final String VIEW_LOGIN = "project/login";
     private static final String VIEW_DATA_PROTOCOL_EN = "project/home_dataProtocol_en";
     private static final String VIEW_DATA_PROTOCOL_FR = "project/home_dataProtocol_fr";