Changeset 7403

Timestamp:

Oct 4, 2017, 9:38:59 AM (5 years ago)

Author:

Nicklas Nordborg

Message:

References #2097: Implement support for device verification

Added a flag to the Client class to enable/disable support device verification. The update script will set it to false for all clients except the web client.

Location:

trunk

Files:

• src/core/net/sf/basedb/core/Client.java (modified) (1 diff)
• src/core/net/sf/basedb/core/Update.java (modified) (2 diffs)
• src/core/net/sf/basedb/core/data/ClientData.java (modified) (1 diff)
• src/install/net/sf/basedb/install/Webclient.java (modified) (1 diff)
• www/admin/clients/edit_client.jsp (modified) (1 diff)
• www/admin/clients/index.jsp (modified) (1 diff)
• www/admin/clients/list_clients.jsp (modified) (2 diffs)
• www/admin/clients/view_client.jsp (modified) (2 diffs)

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

@@ -209 +209 @@
   }
 
+  /**
+    This flag indicates if the registered client application supports 
+    device verification or not. 
+    @return TRUE if it is supported, FALSE if not
+    @since 3.12
+  */
+  public boolean getSupportsDeviceVerification()
+  {
+    return getData().getSupportsDeviceVerification();
+  }
+  public void setSupportsDeviceVerification(boolean supportsDeviceVerification)
+  {
+    checkPermission(Permission.WRITE);
+    getData().setSupportsDeviceVerification(supportsDeviceVerification);
+  }
+
+  
   /**
     Create a new default setting for this client.

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

@@ -937 +937 @@
       if (schemaVersion < 138)
       {
-        System.out.println("Setting news.sticky to false");
         // Set sticky=false on all news
         org.hibernate.query.Query<?> query = HibernateUtil.createQuery(session, 
@@ -946 +945 @@
       }
 
+      if (schemaVersion < 139)
+      {
+        // Set supportsDeviceVerification = false on all clients (except on the web client)
+        org.hibernate.query.Query<?> query = HibernateUtil.createQuery(session, 
+          "UPDATE ClientData c " + 
+          "SET c.supportsDeviceVerification = false " +
+          "WHERE c.supportsDeviceVerification IS NULL");
+        query.executeUpdate();
+
+        query = HibernateUtil.createQuery(session, 
+          "UPDATE ClientData c " + 
+          "SET c.supportsDeviceVerification = true " +
+          "WHERE c.externalId = 'net.sf.basedb.clients.web'");
+        query.executeUpdate();
+      }
+      
       //  Commit the changes
       HibernateUtil.commit(tx);

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

@@ -75 +75 @@
   {
     this.externalId = externalId;
+  }
+  
+  private boolean supportsDeviceVerification;
+  /**
+    A flag indicating if this client application supports device verification.
+    @since 3.12
+    @hibernate.property column="`supports_device_verification`" type="boolean" not-null="true"
+  */
+  public boolean getSupportsDeviceVerification()
+  {
+    return supportsDeviceVerification;
+  }
+  public void setSupportsDeviceVerification(boolean supportsDeviceVerification)
+  {
+    this.supportsDeviceVerification = supportsDeviceVerification;
   }
   

trunk/src/install/net/sf/basedb/install/Webclient.java

@@ -114 +114 @@
         client.setName("Web client");
         client.setDescription("The web interface to BASE");
+        client.setSupportsDeviceVerification(true);
         client.setItemKey(shareToEveryone);
         dc.saveItem(client);

trunk/www/admin/clients/edit_client.jsp

@@ -113 +113 @@
         <td></td>
       </tr>
+      <tr>
+        <th></th>
+        <td><input type="checkbox" name="supports_device_verification" id="supports_device_verification" value="1" 
+          <%=(client != null && client.getSupportsDeviceVerification()) || 
+            (client == null && Values.getBoolean(cc.getPropertyValue("supportsDeviceVerification"))) ? "checked" : ""%>
+          ><label for="supports_device_verification">Supports device verfication</label>
+        </td>
+        <td></td>
+      </tr>
       <tr class="dynamic">
         <th>Description</th>

trunk/www/admin/clients/index.jsp

@@ -153 +153 @@
       client.setName(Values.getStringOrNull(request.getParameter("name")));
       client.setDescription(Values.getStringOrNull(request.getParameter("description")));
+      client.setSupportsDeviceVerification(Values.getBoolean(request.getParameter("supports_device_verification")));
       
       // OnSave extensions

trunk/www/admin/clients/list_clients.jsp

@@ -164 +164 @@
         title="External ID"
         sortable="true"
+        filterable="true"
+        exportable="true"
+      />
+      <tbl:columndef 
+        id="supportsDeviceVerification"
+        property="supportsDeviceVerification"
+        datatype="boolean"
+        title="Device verification"
+        sortable="true" 
         filterable="true"
         exportable="true"
@@ -412 +421 @@
                 <tbl:cell column="entryDate" value="<%=item.getEntryDate()%>" />
                 <tbl:cell column="externalId"><%=Values.getString(item.getExternalId())%></tbl:cell>
+                <tbl:cell column="supportsDeviceVerification"><%=item.getSupportsDeviceVerification() ? "yes" : "no"%></tbl:cell>
                 <tbl:cell column="owner"
                   ><base:propertyvalue 

trunk/www/admin/clients/view_client.jsp

@@ -44 +44 @@
   import="net.sf.basedb.clients.web.PermissionUtil"
   import="net.sf.basedb.clients.web.util.HTML"
+  import="net.sf.basedb.util.EmailUtil"
   import="net.sf.basedb.util.Values"
   import="net.sf.basedb.util.formatter.Formatter"
@@ -221 +222 @@
       </tr>
       <tr>
+        <th>Device verification</th>
+        <td><%=client.getSupportsDeviceVerification() ? "Supported" : "Not supported"%>
+        <%
+        if (!EmailUtil.isEnabled() && client.getSupportsDeviceVerification()) 
+        {
+          %>
+          (You need to configure an email server in <i>base.config</i> before you can use this feature.)
+          <%
+        }
+        %>
+        </td>
+      </tr>
+      <tr>
         <th>Owner</th>
         <td><base:propertyvalue item="<%=client%>" property="owner" /></td>