Add copyright messsage and additional logging detail.

Author: pjewald

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

@@ -1,8 +1,24 @@
 /*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright (c) 2019 Parallax Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the “Software”), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
+
 package com.parallax.server.blocklyprop.servlets;
 
 import com.google.common.base.Strings;

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

@@ -1,8 +1,24 @@
 /*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright (c) 2019 Parallax Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the “Software”), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
+
 package com.parallax.server.blocklyprop.servlets;
 
 import com.google.common.base.Strings;
@@ -33,6 +49,9 @@
 @Singleton
 public class ConfirmServlet extends HttpServlet {
 
+    /**
+     *
+     */
     private static Logger LOG = LoggerFactory.getLogger(ConfirmServlet.class);
 
     private final TextileReader textileFileReader = new TextileReader();
@@ -76,21 +95,22 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp)
     public void confirmToken(HttpServletRequest req, HttpServletResponse resp)
             throws ServletException, IOException {
 
-        // Retreive the registration token
+        // Retrieve the registration token
         String token = req.getParameter("token");
         req.setAttribute("token", token == null ? "" : token);
 
-        // Retreive the requestor's email address
+        // Retrieve the requester's email address
         String email = req.getParameter("email");
         req.setAttribute("email", email == null ? "" : email);
 
         // Return to the confirmation web page is we're missing data
         if (Strings.isNullOrEmpty(token) || Strings.isNullOrEmpty(email)) {
+            LOG.info("Confirmation data for {} is incomplete. Reloading request page", email);
             req.getRequestDispatcher("WEB-INF/servlet/confirm/confirm.jsp")
                     .forward(req, resp);
         } else {
             try {
-                LOG.info("Trying to confirm: {}, {}", email, token);
+                LOG.info("Trying to confirm: {}", email);
                 // Validate the email and token with the Cloud Session server
                 if (cloudSessionLocalUserService.doConfirm(email, token)) {
 
@@ -101,6 +121,7 @@ public void confirmToken(HttpServletRequest req, HttpServletResponse resp)
                     // req.getRequestDispatcher("WEB-INF/servlet/confirm/confirmed.jsp").forward(req, resp);
                     showTextilePage(req, resp, ConfirmPage.CONFIRMED);
                 } else {
+                    LOG.info("Failed to verify the token for email address {}", email);
                     req.setAttribute("invalidToken", "Invalid token");
                     req.getRequestDispatcher("WEB-INF/servlet/confirm/confirm.jsp").forward(req, resp);
                 }

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

@@ -1,8 +1,24 @@
 /*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright (c) 2019 Parallax Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the “Software”), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
+
 package com.parallax.server.blocklyprop.servlets;
 
 import com.google.common.base.Strings;

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

@@ -1,8 +1,24 @@
 /*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright (c) 2019 Parallax Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the “Software”), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
+
 package com.parallax.server.blocklyprop.servlets;
 
 import com.google.common.base.Strings;
@@ -57,6 +73,8 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
         String email = req.getParameter("email");
         req.setAttribute("token", token == null ? "" : token);
         req.setAttribute("email", email == null ? "" : email);
+
+        LOG.info("Redirecting to the reset password page");
         req.getRequestDispatcher("WEB-INF/servlet/password-reset/do-reset.jsp").forward(req, resp);
     }
 
@@ -69,8 +87,12 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
         String email = req.getParameter("email");
         req.setAttribute("token", token == null ? "" : token);
         req.setAttribute("email", email == null ? "" : email);
+
+
         String password = req.getParameter("password");
         String confirmPassword = req.getParameter("confirmpassword");
+
+        LOG.info("Processing the results from the reset pasword page");
 
         if (Strings.isNullOrEmpty(token) || Strings.isNullOrEmpty(email) || Strings.isNullOrEmpty(password) || Strings.isNullOrEmpty(confirmPassword)) {
             req.getRequestDispatcher("WEB-INF/servlet/password-reset/do-reset.jsp").forward(req, resp);
@@ -107,8 +129,16 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
         }
     }
 
-    public void showTextilePage(HttpServletRequest req, HttpServletResponse resp, PasswordResetPage passwordResetPage) throws ServletException, IOException {
-        String html = textileFileReader.readFile("password-reset/" + passwordResetPage.getPage(), ServletUtils.getLocale(req), req.isSecure());
+    public void showTextilePage(
+            HttpServletRequest req,
+            HttpServletResponse resp,
+            PasswordResetPage passwordResetPage) throws ServletException, IOException {
+
+        String html = textileFileReader.readFile(
+                "password-reset/" + passwordResetPage.getPage(),
+                ServletUtils.getLocale(req),
+                req.isSecure());
+
         req.setAttribute("html", html);
         req.getRequestDispatcher("/WEB-INF/servlet/html.jsp").forward(req, resp);
     }