Fix static typing and code style issues

Author: AdityaMitra5102

nitrokeyapp/secrets_tab/data.py

@@ -1,3 +1,4 @@
+from base64 import b64encode, b64decode
 from dataclasses import dataclass
 from datetime import datetime
 from enum import Enum, auto, unique
@@ -6,7 +7,6 @@
 from nitrokey.nk3.secrets_app import Kind as RawKind
 from nitrokey.nk3.secrets_app import ListItem, PasswordSafeEntry, SecretsApp
 
-from base64 import b64encode, b64decode
 # TODO: these could be moved into pynitrokey
 
 
@@ -142,13 +142,16 @@ def serialize_credential(self) -> dict:
 
     @classmethod
     def deserialize_credential(cls, credential_dict: dict) -> "Credential":
+        login=credential_dict.get("login", "")
+        password=credential_dict.get("password", "")
+        comment=credential_dict.get("comment", "")
         credential = cls(
             id=b64decode(credential_dict.get("id")),
-            login=b64decode(credential_dict.get("login")) if credential_dict.get("login", "") else None,
-            password=b64decode(credential_dict.get("password")) if credential_dict.get("password", "") else None,
-            comment=b64decode(credential_dict.get("comment")) if credential_dict.get("comment", "") else None,
-            protected=credential_dict.get("protected"),
-            touch_required=credential_dict.get("touch_required")
+            login=b64decode(login) if login else None
+            password=b64decode(password) if password else None
+            comment=b64decode(comment) if comment else None
+            protected=credential_dict.get("protected", False),
+            touch_required=credential_dict.get("touch_required", False)
         )
 
         kind= _kind_from_raw(RawKind(credential_dict.get("kind")))

nitrokeyapp/secrets_tab/worker.py

@@ -3,7 +3,6 @@
 from datetime import datetime
 from typing import Dict, Optional
 import json
-import traceback
 
 from nitrokey.nk3 import NK3
 from nitrokey.nk3.secrets_app import SecretsApp, SecretsAppException
@@ -664,7 +663,8 @@ def get_credential_backup(self) -> None:
                 try:
                     if credential.protected:
                         pin= self.pin_cache.get(self.data)
-                        secrets.verify_pin_raw(pin)
+                        if pin:
+                            secrets.verify_pin_raw(pin)
                     pse = secrets.get_credential(credential.id)
                 except SecretsAppException as e:
                     self.trigger_exception(e)
@@ -673,8 +673,8 @@ def get_credential_backup(self) -> None:
                 cred = credential.extend_with_password_safe_entry(pse)
                 try:
                     credential_list_serialized.append(cred.serialize_credential())
-                except:
-                    logger.warn("Serialization failed")
+                except SecretsAppException as e:
+                    self.trigger_exception(e)
 
             credential_list_formatted=json.dumps(credential_list_serialized, indent=4)
             self.credential_bkp.emit(credential_list_formatted)
@@ -709,15 +709,15 @@ def run(self) -> None:
     def check_credential_backup(self, existing_credentials: list[Credential]) -> None:
         try:
             serialized_credential_list=json.loads(self.credential_backup)
-        except:
+        except json.JSONDecodeError as e:
             self.trigger_error('Error: Invalid backup file')
         credential_list=[]
         for serialized_credential in serialized_credential_list:
             try:
                 credential = Credential.deserialize_credential(serialized_credential)
                 credential_list.append(credential)
-            except Exception as e:
-                self.trigger_error('Error: Invalid credential entry')
+            except SecretsAppException as e:
+                self.trigger_exception(e)
 
         pin_required=False
         ids = {credential.id for credential in existing_credentials}
@@ -772,7 +772,7 @@ def add_credential(self, successful: bool = True) -> None:
                     try:
                         secrets.register(**reg_data)  # type: ignore [arg-type]
                     except SecretsAppException as e:
-                        self.trigger_error('Addition failed')
+                        self.trigger_exception(e)
 
         self.credential_restore.emit()
 
@@ -855,4 +855,4 @@ def backup_credential(self, data: DeviceData, pin_protected: bool) -> None:
     def restore_credential(self, data:DeviceData, backup_conent: str) -> None:
         job = RestoreCredentialJob(self.common_ui, self.pin_cache, self.pin_ui, data, backup_conent)
         job.credential_restore.connect(self.credential_restore)
-        self.run(job)
+        self.run(job)