Changeset 412 for tapas/web

Timestamp:

03/14/12 19:30:24 (12 years ago)

Author:

vmipsl

Message:

BO gestion login
clean parameter

Location:

tapas/web

Files:

• resources/images/utils/logout.png (copied) (copied from ether_megapoli/trunk/web/resources/images/utils/logout.png)
• resources/js/classesForJQuery/LoginButton.js (modified) (1 diff)
• resources/templates/templateBackoffice_script.jsp (modified) (2 diffs)
• src/com/ether/ControllerEther.java (modified) (3 diffs)
• src/com/ether/WebHelper.java (modified) (2 diffs)

tapas/web/resources/js/classesForJQuery/LoginButton.js

@@ -224 +224 @@
     {
         this.errors = jQuery.parseJSON( result ).errors;
-        this.setJSONUser( null != jQuery.parseJSON( result ).jSONPeople ? jQuery.parseJSON( result ).jSONPeople : false );
+        this.setJSONUser( null != jQuery.parseJSON( result ).jSONUser ? jQuery.parseJSON( result ).jSONUser : false );
         if( null == this.errors )
             this.updateLoginOrLogout();

tapas/web/resources/templates/templateBackoffice_script.jsp

@@ +1 @@
+<%@ page import="com.ether.WebHelper" %>
 <script type="text/javascript">
     var InterfaceTemplate = Class.create( {
@@ -15 +16 @@
             <%--this.webmaster = "<%=Context.getWebmaster(request)%>";--%>
             <%--this.relativePageUri = <%=request.getQueryString() != null%> ? "<%=Context.getRelativePath( request )%>?<%=request.getQueryString()%>" : "<%=Context.getRelativePageURI(request)%>";--%>
-            <%--this.jSONUser = <%=Context.getJSONUser( request )%> ? <%=Context.getJSONUser( request )%> : false;--%>
+            this.jSONUser = <%=WebHelper.getJSONUser( request )%> ? <%=WebHelper.getJSONUser( request )%> : false;
 
             /** ************ CREATE ************ **/

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

@@ -5 +5 @@
 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;
@@ -48 +49 @@
     }
 
+    /**
+     * 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,
+                             @ParamName(ParameterConstants.PARAMETER_PWD) final String password,
+                             @NotNull final HttpServletRequest request )
+            throws ServiceException
+    {
+        final JSONObject jSONUser = new JSONObject();
+        final JSONObject result = new JSONObject();
+
+        if( login != null && password != null )
+        {
+            try
+            {
+                final User user = _tapasService.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 )
+            {
+                result.put( "errors", "login.error.failed" );
+            }
+        }
+
+        if( !jSONUser.isEmpty() )
+            result.put( "jSONUser", jSONUser );
+        return result;
+    }
+
+    @ControllerMethod(requestMandatory = true, jsonResult = true)
+    public JSONObject logout( @NotNull final HttpServletRequest request )
+            throws ServiceException
+    {
+        request.getSession().setAttribute( "SES_USER", null );
+        request.getSession().invalidate();
+
+        return new JSONObject();
+    }
+
     @Override
     @Nullable
@@ -95 +153 @@
             if( methodDescription.isRequestMandatory() )
                 params[params.length - 1] = request;
+
+            if( methodDescription.isBackofficeMethod() )
+            {
+                final String defaultView = null != methodDescription.getDefaultView() ? methodDescription.getDefaultView() : methodDescription.getView();
+                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;

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

@@ -2 +2 @@
 
 import com.ether.WebException.WebCode;
+import com.ether.user.User;
+import net.sf.json.JSONObject;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -68 +70 @@
     }
 
+    /**
+     * This method returns the user in session if there is one
+     *
+     * @param request
+     * @return
+     */
+    public static JSONObject getJSONUser( @NotNull final HttpServletRequest request )
+    {
+        final JSONObject jSONPeople = new JSONObject();
+
+        final User user = (User) request.getSession().getAttribute( "SES_USER" );
+        if( null == user )
+            return null;
+
+        jSONPeople.put( "name", user.getLastName() );
+        jSONPeople.put( "firstName", user.getFirstName() );
+        jSONPeople.put( "role", user.getRole() );
+        return jSONPeople;
+    }
+
+
     private static final Log LOGGER = LogFactory.getLog( WebHelper.class );