Changeset 7410 for trunk/www/my_base/user/submit_user.jsp

Timestamp:

Oct 9, 2017, 1:47:39 PM (5 years ago)

Author:

Nicklas Nordborg

Message:

References #2097: Implement support for device verification

Added support for verifying email addresses. The "BASE->Contact information" dialog now has a "2-factor login" checkbox. If this checkbox is checked or if the email address is changed an email is sent to the user with a verification code. At the same time, the browser displays a new form asking the user to enter the verfication code. The 2-factor login is only enabled if the correct verification code is entered.

The email message template is currently hard-coded but it should may be configurable?

File:

• trunk/www/my_base/user/submit_user.jsp (modified) (4 diffs)

trunk/www/my_base/user/submit_user.jsp

@@ -59 +59 @@
 String root = request.getContextPath()+"/";
 
+String forward = null;
 DbControl dc = sc.newDbControl();
 try
@@ -77 +78 @@
     // Contact information tab
     user.setEmail(email);
+    boolean useDeviceVerification = Values.getBoolean(request.getParameter("useDeviceVerification"));
+    if (!useDeviceVerification) user.disableDeviceVerification();
     if (EmailUtil.isEnabled())
     {
       user.setSendMessagesAsEmail(email != null && Values.getBoolean(request.getParameter("sendMessagesAsEmail")));
+      if (useDeviceVerification && !user.getUseDeviceVerification())
+      {
+        // Send a verification code for verifying the email address
+        forward = "verify_email.jsp?ID="+ID;
+      }
     }
     user.setOrganisation(Values.getStringOrNull(request.getParameter("organisation")));
@@ -111 +119 @@
     sc.setSessionSetting("user", null);
     message = "Information saved";
+  }
+  else if ("VerifyEmail".equals(cmd))
+  {
+    String verificationCode = request.getParameter("verificationCode");
+    User user = (User)sc.getSessionSetting("user");
+    dc.reattachItem(user, false);
+    user.enableDeviceVerification(verificationCode);
+    message = "The email has been verified";
+    dc.commit();
   }
   else if ("SavePreferences".equals(cmd))
@@ -204 +221 @@
   if (dc != null) dc.close();
 }
-response.sendRedirect(root + "common/close_popup.jsp?ID="+ID+"&refresh_opener=1&&message="+HTML.urlEncode(message));
+
+if (forward != null)
+{
+  pageContext.forward(forward);
+}
+else
+{
+  response.sendRedirect(root + "common/close_popup.jsp?ID="+ID+"&refresh_opener=1&&message="+HTML.urlEncode(message));
+}
 %>