arpakitlib 1.7.77__tar.gz → 1.7.78__tar.gz

{arpakitlib-1.7.77 → arpakitlib-1.7.78}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arpakitlib
-Version: 1.7.77
+Version: 1.7.78
 Summary: arpakitlib
 Home-page: https://github.com/ARPAKIT-Company/arpakitlib
 License: Apache-2.0

arpakitlib-1.7.78/arpakitlib/_arpakit_project_template/src/api/auth.py

@@ -0,0 +1,22 @@
+from arpakitlib.ar_fastapi_util import base_api_auth
+from src.core.settings import get_cached_settings
+
+api_key_with_settings_api_auth = base_api_auth(
+    correct_api_keys=get_cached_settings().api_correct_api_key,
+    require_correct_api_key=False
+)
+
+correct_api_key_with_settings_api_auth = base_api_auth(
+    correct_api_keys=get_cached_settings().api_correct_api_key,
+    require_correct_api_key=True
+)
+
+token_with_settings_api_auth = base_api_auth(
+    correct_api_keys=get_cached_settings().api_correct_token,
+    require_correct_token=False
+)
+
+correct_token_with_settings_api_auth = base_api_auth(
+    correct_api_keys=get_cached_settings().api_correct_token,
+    require_correct_token=True
+)

{arpakitlib-1.7.77 → arpakitlib-1.7.78}/arpakitlib/_arpakit_project_template/src/core/settings.py

@@ -35,6 +35,8 @@ class Settings(SimpleSettings):
 
     api_correct_api_key: str | None = "1"
 
+    api_correct_token: str | None = "1"
+
     var_dirname: str | None = "var"
 
     var_dirpath: str | None = os.path.join(BASE_DIRPATH, var_dirname)

{arpakitlib-1.7.77 → arpakitlib-1.7.78}/arpakitlib/ar_fastapi_util.py

@@ -34,7 +34,7 @@ from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str_to_json_obj
 from arpakitlib.ar_logging_util import setup_normal_logging
 from arpakitlib.ar_sqlalchemy_model_util import StoryLogDBM
 from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDB
-from arpakitlib.ar_type_util import raise_for_type
+from arpakitlib.ar_type_util import raise_for_type, raise_if_none
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
@@ -498,6 +498,14 @@ def base_api_auth(
         raise_for_type(correct_tokens, list)
         validate_token_func = lambda *args, **kwargs: kwargs["token_string"] in correct_tokens
 
+    if require_correct_api_key:
+        raise_if_none(validate_api_key_func)
+        require_api_key_string = True
+
+    if require_correct_token:
+        raise_if_none(validate_token_func)
+        require_token_string = True
+
     async def func(
             *,
             ac: fastapi.security.HTTPAuthorizationCredentials | None = fastapi.Security(

{arpakitlib-1.7.77 → arpakitlib-1.7.78}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arpakitlib"
-version = "1.7.77"
+version = "1.7.78"
 description = "arpakitlib"
 authors = ["arpakit <arpakit@gmail.com>", "arpakit_support <support@arpakit.com>"]
 license = "Apache License 2.0"

arpakitlib-1.7.77/arpakitlib/_arpakit_project_template/src/api/auth.py

@@ -1,6 +0,0 @@
-from arpakitlib.ar_fastapi_util import api_key_api_auth
-from src.core.settings import get_cached_settings
-
-check_with_settings_api_key_api_auth = api_key_api_auth(
-    correct_api_key=get_cached_settings().api_correct_api_key
-)