Merge pull request #1599 from zfi/0.101

Add code to trap new Cloud Session exception.

Author: paragitadmin

src/main/java/com/parallax/server/blocklyprop/rest/RestProfile.java

@@ -20,6 +20,7 @@
 import com.parallax.client.cloudsession.exceptions.ServerException;
 import com.parallax.client.cloudsession.exceptions.UnknownUserIdException;
 import com.parallax.client.cloudsession.exceptions.WrongAuthenticationSourceException;
+import com.parallax.client.cloudsession.exceptions.EmailNotConfirmedException;
 import com.parallax.client.cloudsession.objects.User;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.POST;
@@ -153,6 +154,10 @@ public Response savePassword(
                 result.addProperty("success", false);
                 result.addProperty("message", "server-error");
                 return Response.ok(result.toString()).build();
+            } catch (EmailNotConfirmedException pce) {
+                result.addProperty("success", false);
+                result.addProperty("message", "password-complexity");
+                return Response.ok(result.toString()).build();
             }
         }
     }

src/main/java/com/parallax/server/blocklyprop/servlets/PasswordResetServlet.java

@@ -14,6 +14,7 @@
 import com.parallax.client.cloudsession.exceptions.ServerException;
 import com.parallax.client.cloudsession.exceptions.UnknownUserException;
 import com.parallax.client.cloudsession.exceptions.WrongAuthenticationSourceException;
+import com.parallax.client.cloudsession.exceptions.EmailNotConfirmedException;
 import com.parallax.server.blocklyprop.enums.PasswordResetPage;
 import com.parallax.server.blocklyprop.utils.ServletUtils;
 import com.parallax.server.blocklyprop.utils.TextileReader;
@@ -98,6 +99,9 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
                 LOG.warn("Trying to change password of non local user!");
                 req.setAttribute("server-error", "Server exception");
                 req.getRequestDispatcher("WEB-INF/servlet/password-reset/do-reset.jsp").forward(req, resp);
+            } catch (EmailNotConfirmedException pce) {
+                req.setAttribute("passwordComplexity", "Password is not complex enough");
+                req.getRequestDispatcher("WEB-INF/servlet/password-reset/do-reset.jsp").forward(req, resp);
             }
         }
     }

src/main/java/com/parallax/server/blocklyprop/servlets/ProfileServlet.java

@@ -235,6 +235,10 @@ private void savePassword(HttpServletRequest req, HttpServletResponse resp) thro
                 LOG.warn("Trying to change password of non local user!");
                 req.setAttribute("base-error", "Server error");
                 req.getRequestDispatcher("WEB-INF/servlet/profile/profile.jsp").forward(req, resp);
+            } catch (EmailNotConfirmedException ex) {
+                LOG.warn("Trying to change password of non local user!");
+                req.setAttribute("base-error", "Server error");
+                req.getRequestDispatcher("WEB-INF/servlet/profile/profile.jsp").forward(req, resp);
             }
         }
     }

src/main/java/com/parallax/server/blocklyprop/servlets/PublicProfileServlet.java

@@ -11,6 +11,7 @@
 import com.parallax.client.cloudsession.CloudSessionUserService;
 import com.parallax.client.cloudsession.exceptions.ServerException;
 import com.parallax.client.cloudsession.exceptions.UnknownUserIdException;
+import com.parallax.client.cloudsession.exceptions.EmailNotConfirmedException;
 import com.parallax.server.blocklyprop.db.generated.tables.pojos.User;
 import com.parallax.server.blocklyprop.services.UserService;
 import com.parallax.server.blocklyprop.services.impl.SecurityServiceImpl;
@@ -86,6 +87,9 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
         } catch (UnknownUserIdException ex) {
             LOG.info("User not known in cloud-session");
             resp.sendError(404);
+        } catch (EmailNotConfirmedException ex) {
+            LOG.info("User not known in cloud-session");
+            resp.sendError(404);
         } catch (ServerException ex) {
             LOG.error("Communication problem with Cloud-session", ex);
             resp.sendError(500);