Email implementation

Author: denikryt

app/api/web_api.py

@@ -85,7 +85,7 @@ def api_get_user_permissions():
 @web_api.route("/api/users", methods=["POST"])
 def api_add_user():
     user_data = request.get_json()
-    user = User(user_data["name"], user_data["key"])
+    user = User(user_data["name"], user_data["key"], user_data["email"])
 
     number_of_new_user_added = user.save()
 

app/models/user.py

@@ -3,10 +3,10 @@
 
 
 class User:
-    def __init__(self, name, key, slack_id=None):
+    def __init__(self, name, key, email=None):
         self.name = name
         self.key = key
-        self.slack_id = slack_id
+        self.email = email
 
     @classmethod
     def get_by_key(cls, key):
@@ -34,14 +34,14 @@ def save(self):
         if existing_user:
             # Update existing user data
             cursor.execute(
-                "UPDATE users SET name = ?, slack_id = ? WHERE key = ?",
-                (self.name, self.slack_id, self.key),
+                "UPDATE users SET name = ?, key = ? WHERE email = ?",
+                (self.name, self.key, self.email if self.email else None),
             )
         else:
             # Create new user
             cursor.execute(
-                "INSERT INTO users (name, key, slack_id) VALUES (?, ?, ?)",
-                (self.name, self.key, self.slack_id),
+                "INSERT INTO users (name, key, email) VALUES (?, ?, ?)",
+                (self.name, self.key, self.email if self.email else None),
             )
             number_of_new_user = 1
             conn.commit()
@@ -79,7 +79,7 @@ def get_permissions(cls, user_key=None):
         if user_key:
             cursor.execute(
                 """
-                SELECT users.name, users.key,
+                SELECT users.name, users.key, users.email,
                        (SELECT operation_time
                         FROM event_logs
                         WHERE user_key = users.key
@@ -93,7 +93,7 @@ def get_permissions(cls, user_key=None):
         else:
             cursor.execute(
                 """
-                SELECT users.name, users.key,
+                SELECT users.name, users.key, users.email,
                        (SELECT operation_time
                         FROM event_logs
                         WHERE user_key = users.key
@@ -106,7 +106,9 @@ def get_permissions(cls, user_key=None):
         for row in cursor.fetchall():
             user_name = row[0]
             user_key = row[1]
-            latest_activity = row[2]
+            user_email = row[2] if row[2] else None  # Handle email being None
+            latest_activity = row[3]
+            
 
             # Get device permissions for the current user
             device_permissions = []
@@ -138,14 +140,16 @@ def get_permissions(cls, user_key=None):
             user_record = {
                 "user_name": user_name,
                 "user_key": user_key,
+                "user_email": user_email,
                 "permissions": device_permissions,
                 "latest_activity": latest_activity,
             }
             user_data.append(user_record)
 
         # Close the database connection
         conn.close()
-
+        
+        print(f"User data fetched: {user_data}")  # Debugging output
         return user_data
 
     def has_permission_for_device(self, device_id):

app/schema.sql

@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS users
 (
     name     TEXT NOT NULL,
     key      TEXT NOT NULL,
-    slack_id TEXT DEFAULT NULL
+    email    TEXT NOT NULL
 );
 CREATE TABLE IF NOT EXISTS permissions
 (

app/templates/prismo/users.html

@@ -6,8 +6,9 @@
             <div class="card-body">
                 <h5 class="card-title">Add last used RFID card as new user: <span id="used-key-at"></span></h5>
                 <div class="input-group mb-3">
-                    <button class="btn btn-primary" type="submit" onclick="addUser(document.getElementById('user_name').value)" ><i class="bi bi-person-add"></i> Add User</button>  
+                    <button class="btn btn-primary" type="submit" onclick="addUser(document.getElementById('user_name').value, document.getElementById('user_email').value)" ><i class="bi bi-person-add"></i> Add User</button>  
                     <input type="text" class="form-control" id="user_name" placeholder="User Name">
+                    <input type="email" class="form-control ms-2" id="user_email" placeholder="Email">
                 </div>
             </div>
         </div>
@@ -46,8 +47,9 @@ <h5 class="card-title">Add last used RFID card as new user: <span id="used-key-a
       return null; // Or throw an error
     }
   }
-
-  async function addUser(name) {
+  // Example curl request to add a new user:
+  // curl -X POST -H "Content-Type: application/json" -d '{"name":"John Doe","email":"john@example.com","key":"RFID_KEY"}' http://localhost:5000/api/users
+  async function addUser(name, email) {
     try {
       const latestKey = await getLatestKey(); // Wait for API call
 
@@ -58,7 +60,7 @@ <h5 class="card-title">Add last used RFID card as new user: <span id="used-key-a
           headers: {
             'Content-Type': 'application/json'
           },
-          body: JSON.stringify({ name, key })
+          body: JSON.stringify({ name, email, key })
         });
 
         if (!response.ok) {
@@ -107,6 +109,7 @@ <h5 class="card-title">Add last used RFID card as new user: <span id="used-key-a
             return acc
           }, {}),
           latestActivity: user.latest_activity,
+          email: user.user_email,
           operation: '<button class="btn btn-sm btn-danger" onclick="deleteUser(\'' + user.user_key + '\')">Delete</button>'
         }
       })
@@ -135,14 +138,26 @@ <h5 class="card-title">Add last used RFID card as new user: <span id="used-key-a
   }
 
   const getColumns = (data) => {
-    return Object.keys(data[0]).map(key => ({
-      data: (row) => {
-        const value = row[key]
-        return typeof value === 'string' ? value : `<input type="checkbox" ${value?.allowed && "checked"} onchange="updatePermissions('${row.key}', '${value?.device_id}', ${value?.allowed})">`
-      },
-      visible: key !== 'key',
-      title: key.charAt(0).toUpperCase() + key.slice(1)
-    }))
+    return Object.keys(data[0]).map(key => {
+      // Force the email column to be visible and render as plain text
+      if (key === 'email') {
+        return {
+          data: row => row.email || '',
+          visible: true,
+          title: 'Email'
+        }
+      }
+      return {
+        data: (row) => {
+          const value = row[key]
+          return typeof value === 'string'
+            ? value
+            : `<input type="checkbox" ${value?.allowed ? "checked" : ""} onchange="updatePermissions('${row.key}', '${value?.device_id}', ${value?.allowed})">`
+        },
+        visible: key !== 'key',
+        title: key.charAt(0).toUpperCase() + key.slice(1)
+      }
+    })
   }
 
   async function initializeDataTable() {