dislocker_auth.py

@@ -66,24 +66,17 @@ class Auth():
             pc_uuid = str(kwargs["pc_uuid"])
             pc_token = str(kwargs["pc_token"])
             if "device_list" in kwargs:
-                if kwargs["device_list"] == []:
-                    device_list = None
-                else:
                 device_list = kwargs["device_list"]
             else:
-                device_list = None
-
-            keyboard_number = 0
-            mouse_number = 0
+                pass
+            keyboard_number = "own"
+            mouse_number = "own"
 
             if "password_hash" in kwargs:
                 password_hash = str(kwargs["password_hash"])
                 cursor.execute("SELECT * FROM pc_list WHERE pc_number = %s AND password_hash = %s AND pc_uuid = %s AND pc_token = %s", (pc_number, password_hash, pc_uuid, pc_token))
                 pc_info = cursor.fetchall()
                 if pc_info:
-                    if device_list == None:
-                        pass
-                    else:
                     for device in device_list:
                         cursor.execute("SELECT * FROM keyboard_list WHERE device_instance_path = %s", (device["device_instance_path"],))
                         keyboard_record = cursor.fetchall()

dislocker_client.py

@@ -388,8 +388,7 @@ class Lock(customtkinter.CTkToplevel):
     def auth(self):
         self.button_disable()
         password = str(self.password_entry.get())
-        #devices = self.get_input_devices()
-        devices = []
+        devices = self.get_input_devices()
 
         if len(password) == 10:
             print("マスターパスワードで認証を試行します。")