winipedia-utils 0.1.60__py3-none-any.whl → 0.1.61__py3-none-any.whl

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__}"

{winipedia_utils-0.1.60.dist-info → winipedia_utils-0.1.61.dist-info}/METADATA

@@ -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.dist-info → winipedia_utils-0.1.61.dist-info}/RECORD

@@ -72,7 +72,7 @@ winipedia_utils/resources/svgs/plus_icon.svg,sha256=CHjIzOUbDH4xHlwX5MbTsdL0Hnku
 winipedia_utils/resources/svgs/svg.py,sha256=-Dw6m7cm9CHT2076oZIMx7kTQw0v_ifJajXzWcpUtI0,430
 winipedia_utils/security/__init__.py,sha256=ZBa72J6MNtYumBFMoVc0ia4jsoS7oNgjaTCW0xDb6EI,53
 winipedia_utils/security/cryptography.py,sha256=zfxSDo7aE9ecmZNC6URMSEUYRpOuJ1iESg-WCSS5HP0,822
-winipedia_utils/security/keyring.py,sha256=35bCXBmsFWyd7Ja2w9zHElayABeRZEaNXoEDDRb8ItQ,1698
+winipedia_utils/security/keyring.py,sha256=AKpIGRh7RAWzzdIjTLZRXndxgbsX5DJxdHaRk40zw7o,2343
 winipedia_utils/setup.py,sha256=F4NneO0wVTf7JCXLorWjTOdJl36N5fLSksoWMe4p86o,1650
 winipedia_utils/testing/__init__.py,sha256=kXhB5xw02ec5xpcW_KV--9CBKdyCjnuR-NZzAJ5tq0g,51
 winipedia_utils/testing/assertions.py,sha256=0JF4mqVTnLQ1qkAL_FuTwyN_idr00rvVlta7aDdnUXA,851
@@ -94,7 +94,7 @@ winipedia_utils/testing/tests/base/utils/utils.py,sha256=dUPDrgAxlfREQb33zz23Mfz
 winipedia_utils/testing/tests/conftest.py,sha256=8RounBlI8Jq1aLaLNpv84MW4ne8Qq0aavQextDOp5ng,920
 winipedia_utils/text/__init__.py,sha256=j2bwtK6kyeHI6SnoBjpRju0C1W2n2paXBDlNjNtaUxA,48
 winipedia_utils/text/string.py,sha256=pK_VQXxSZa8HqHY1a6oMKfmN-OKteFE32eZaweCI22E,3508
-winipedia_utils-0.1.60.dist-info/LICENSE,sha256=3PrKJ2CWNrnyyHaC_r0wPDSukVWgmjOxHr__eQVH7cw,1087
-winipedia_utils-0.1.60.dist-info/METADATA,sha256=ppNOIOy5iJyYteOhpFQYmveOH9n66IdigHgxeFc1k5M,12576
-winipedia_utils-0.1.60.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-winipedia_utils-0.1.60.dist-info/RECORD,,
+winipedia_utils-0.1.61.dist-info/LICENSE,sha256=3PrKJ2CWNrnyyHaC_r0wPDSukVWgmjOxHr__eQVH7cw,1087
+winipedia_utils-0.1.61.dist-info/METADATA,sha256=i3pkb0PrD_YIkUnxzzeexIYtSQZ98BATj7GNLT_EFnk,12576
+winipedia_utils-0.1.61.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+winipedia_utils-0.1.61.dist-info/RECORD,,