winipedia-utils 0.1.60__tar.gz → 0.1.61__tar.gz

{winipedia_utils-0.1.60 → winipedia_utils-0.1.61}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: winipedia-utils
-Version: 0.1.60
+Version: 0.1.61
 Summary: A package with many utility functions
 License: MIT
 Author: Winipedia

{winipedia_utils-0.1.60 → winipedia_utils-0.1.61}/pyproject.toml

@@ -1,7 +1,7 @@
 # Project section
 [project]
 name = "winipedia-utils"
-version = "0.1.60"
+version = "0.1.61"
 description = "A package with many utility functions"
 readme = "README.md"
 requires-python = ">=3.12,<3.14"

{winipedia_utils-0.1.60 → winipedia_utils-0.1.61}/winipedia_utils/security/keyring.py

@@ -13,7 +13,7 @@ from cryptography.fernet import Fernet
 from cryptography.hazmat.primitives.ciphers.aead import AESGCM
 
 
-def get_or_create_fernet(service_name: str, username: str) -> Fernet:
+def get_or_create_fernet(service_name: str, username: str) -> tuple[Fernet, bytes]:
     """Get the app secret using keyring.
 
     If it does not exist, create it with a Fernet.
@@ -23,7 +23,7 @@ def get_or_create_fernet(service_name: str, username: str) -> Fernet:
     )
 
 
-def get_or_create_aes_gcm(service_name: str, username: str) -> AESGCM:
+def get_or_create_aes_gcm(service_name: str, username: str) -> tuple[AESGCM, bytes]:
     """Get the app secret using keyring.
 
     If it does not exist, create it with a AESGCM.
@@ -38,17 +38,33 @@ def get_or_create_key[T](
     username: str,
     key_class: Callable[[bytes], T],
     generate_key_func: Callable[..., bytes],
-) -> T:
+) -> tuple[T, bytes]:
     """Get the app secret using keyring.
 
     If it does not exist, create it with the generate_func.
     """
-    service_name = f"{service_name}_{key_class.__name__}"
-    key = keyring.get_password(service_name, username)
+    key = get_key_as_str(service_name, username, key_class)
     if key is None:
         binary_key = generate_key_func()
         key = b64encode(binary_key).decode("ascii")
-        keyring.set_password(service_name, username, key)
+        modified_service_name = make_service_name(service_name, key_class)
+        keyring.set_password(modified_service_name, username, key)
 
     binary_key = b64decode(key)
-    return key_class(binary_key)
+    return key_class(binary_key), binary_key
+
+
+def get_key_as_str[T](
+    service_name: str, username: str, key_class: Callable[[bytes], T]
+) -> str | None:
+    """Get the app secret using keyring.
+
+    If it does not exist, create it with the generate_func.
+    """
+    service_name = make_service_name(service_name, key_class)
+    return keyring.get_password(service_name, username)
+
+
+def make_service_name[T](service_name: str, key_class: Callable[[bytes], T]) -> str:
+    """Make a service name from a service name and a key class."""
+    return f"{service_name}_{key_class.__name__}"