Changeset 7816

Timestamp:

Jun 5, 2020, 1:10:03 PM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #2213: Extend registration of devices

Added isVerified flag to devices. Validation should now work again. Since all devices are now registered the "Remember device" option when verifying a device simple sets the isVerifed flag to true.

Location:

trunk

Files:

• src/core/net/sf/basedb/core/Install.java (modified) (1 diff)
• src/core/net/sf/basedb/core/SessionControl.java (modified) (7 diffs)
• src/core/net/sf/basedb/core/Update.java (modified) (3 diffs)
• src/core/net/sf/basedb/core/UserDevice.java (modified) (1 diff)
• src/core/net/sf/basedb/core/data/UserDeviceData.java (modified) (1 diff)
• src/core/net/sf/basedb/core/data/hibernate-properties-UserDeviceData.xml (added)
• www/views/devices/index.jsp (modified) (1 diff)
• www/views/devices/list_devices.jsp (modified) (2 diffs)
• www/views/devices/view_device.jsp (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/Install.java

@@ -118 +118 @@
     method.
   */
-  public static final int NEW_SCHEMA_VERSION = Integer.valueOf(147).intValue();
+  public static final int NEW_SCHEMA_VERSION = Integer.valueOf(148).intValue();
   
   public static synchronized int createTables(SchemaGenerator.Mode mode, ProgressReporter progress,

trunk/src/core/net/sf/basedb/core/SessionControl.java

@@ -432 +432 @@
     
     UserDeviceData device = null;
+    boolean needToVerifyDevice = false;
     AuthenticatedUser authUser = null;
     UserData user = null;
@@ -463 +464 @@
       
       // The login was ok so far... check device verification
-      device = verifyDevice(session, loginRequest, authUser);
+      device = loadDevice(session, loginRequest, authUser);
+      needToVerifyDevice = device != null && !device.isVerified() && user.getUseDeviceVerification() && EmailUtil.isEnabled();
       
-      // A null value means that either device verification is disabled 
-      // An existing device means that it is already registered (TODO - check if verification is needed!!)
       LoginInfo li = null;
-      if (device == null || device.getId() != 0)
+      if (!needToVerifyDevice)
       {
         // All is ok, finalize the login
@@ -496 +496 @@
     }
     
-    if (device != null && device.getId() == 0)
+    if (needToVerifyDevice)
     {
       // Device verification is enabled and the user is using an unverified device
@@ -595 +595 @@
       LoginRequest loginRequest = unverifiedDeviceInfo.loginRequest;
       AuthenticatedUser authUser = unverifiedDeviceInfo.authenticatedUser;
-      
-      int deviceId = 0;
+      int deviceId = unverifiedDeviceInfo.device.getId();
       if (rememberDevice)
       {
-        HibernateUtil.saveData(session, unverifiedDeviceInfo.device);
-        deviceId = unverifiedDeviceInfo.device.getId();
+        HibernateUtil.loadData(session, UserDeviceData.class, deviceId).setVerified(true);
       }
       
@@ -814 +812 @@
     @return An {@link UserDeviceData} object if device verification is
       supported and needed, null to continue with normal login
-    @since 3.12
-  */
-  private UserDeviceData verifyDevice(org.hibernate.Session session, LoginRequest loginRequest, AuthenticatedUser authUser)
+    @since 3.12, 3.17
+  */
+  private UserDeviceData loadDevice(org.hibernate.Session session, LoginRequest loginRequest, AuthenticatedUser authUser)
   {
     // Check the submitted deviceToken
@@ -874 +872 @@
       device.setToken(deviceToken);
       device.setUserAgent(userAgent);
+      device.setVerified(false);
     }
 
@@ -884 +883 @@
     device.setLocationLatitude(loc.getLatitude());
     device.setLocationLongitude(loc.getLongitude());
-
-    // If this is a new or unverified device we check if it needs to be verified
-    if (device.getId() == 0)
-    {
-      if (user.getUseDeviceVerification() && EmailUtil.isEnabled())
-      {
-        // The device need verification so we do not save it
-        // TODO -- will not work correctly if we add device.isVerified() flag
-      }
-      else
-      {
-        HibernateUtil.saveData(session, device);
-      }
-    }
+    
+    if (device.getId() == 0) HibernateUtil.saveData(session, device);
 
     return device;

trunk/src/core/net/sf/basedb/core/Update.java

@@ -434 +434 @@
     </td>
   </tr>
+  <tr>
+    <td>148</td>
+    <td>
+      Added {@link UserDeviceData#isVerified()}.
+      The update will set the value to TRUE for all existing devices.
+    </td>
+  </tr>
   </table>
 
@@ -709 +716 @@
         if (progress != null) progress.display((int)(progress_current), "--Updating schema version: " + schemaVersion + " -> 147...");
         schemaVersion = updateToSchemaVersion147(session, schemaVersion);
+        progress_current += progress_step;
+      }
+      
+      if (schemaVersion < 148)
+      {
+        if (progress != null) progress.display((int)(progress_current), "--Updating schema version: " + schemaVersion + " -> 148...");
+        schemaVersion = setSchemaVersionInTransaction(session, 148);
         progress_current += progress_step;
       }
@@ -1072 +1086 @@
           "SET at.identifier = false " +
           "WHERE at.identifier IS NULL");
+        query.executeUpdate();
+      }
+      
+      if (schemaVersion < 148)
+      {
+        // Set is_verified=true on all registered devices
+        org.hibernate.query.Query<?> query = HibernateUtil.createQuery(session, 
+          "UPDATE UserDeviceData ud " +
+          "SET ud.verified = true " +
+          "WHERE ud.verified = false");
         query.executeUpdate();
       }

trunk/src/core/net/sf/basedb/core/UserDevice.java

@@ -261 +261 @@
     return getData().getLocationLongitude();
   }
+  
+  /**
+    Has this device been verified or not? Verification is done
+    by requesting a code via email.
+    @since 3.17
+  */
+  public boolean isVerified()
+  {
+    return getData().isVerified();
+  }
 
 }

trunk/src/core/net/sf/basedb/core/data/UserDeviceData.java

@@ -236 +236 @@
   }
   
+  private boolean isVerified;
+  /**
+    This flag is TRUE if the device has been verified (by sending a code via email).
+    @since 3.17
+    Mapped in hibernate-properties-UserDeviceData.xml since default is not supported in XDoclet
+    //hibernate.property column="`is_verified`" type="boolean" not-null="true" default="false"
+  */
+  public boolean isVerified()
+  {
+    return isVerified;
+  }
+  public void setVerified(boolean isVerified)
+  {
+    this.isVerified = isVerified;
+  }
+
   private Set<SessionData> sessions;
   /**

trunk/www/views/devices/index.jsp

@@ -62 +62 @@
 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
 <%!
-  private static final ItemContext defaultContext = Base.createDefaultContext("name", "name,client,lastUsed,lastRemoteId,location,description");
+  private static final ItemContext defaultContext = Base.createDefaultContext("name", "name,client,verified,lastUsed,lastRemoteId,location,description");
   private static final Item itemType = Item.USERDEVICE;
 %>

trunk/www/views/devices/list_devices.jsp

@@ -185 +185 @@
         exportable="true"
         formatter="<%=dateFormatter%>"
+      />
+      <tbl:columndef 
+        id="verified"
+        property="verified"
+        datatype="boolean"
+        title="Is verified"
+        sortable="true" 
+        filterable="true"
+        exportable="true"
       />
       <tbl:columndef 
@@ -413 +422 @@
                 <tbl:cell column="userAgent"><%=HTML.encodeTags(item.getUserAgent())%></tbl:cell>
                 <tbl:cell column="entryDate" value="<%=item.getEntryDate()%>" />
+                <tbl:cell column="verified" value="<%=item.isVerified() ? "Yes" : "No"%>" />
                 <tbl:cell column="lastUsed" value="<%=item.getLastUsed()%>" />
                 <tbl:cell column="lastRemoteId"><%=HTML.encodeTags(item.getLastRemoteId())%></tbl:cell>

trunk/www/views/devices/view_device.jsp

@@ -157 +157 @@
       </tr>
       <tr>
+        <th>Verified</th>
+        <td><%=device.isVerified() ? "Yes" : "No"%></td>
+      </tr>
+      <tr>
         <th>Registered</th>
         <td><%=dateFormatter.format(device.getEntryDate())%></td>