arpakitlib 1.6.37__py3-none-any.whl → 1.6.39__py3-none-any.whl

arpakitlib/ar_fastapi_util.py

@@ -436,12 +436,12 @@ class BaseNeedAPIAuthData(BaseModel):
     model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True, from_attributes=True)
 
     token_string: str | None = None
-    apikey_string: str | None = None
+    api_key_string: str | None = None
 
 
-def need_api_auth(
+def base_need_api_auth(
         *,
-        require_apikey_string: bool = False,
+        require_api_key_string: bool = False,
         require_token_string: bool = False,
 ) -> Callable:
     async def func(
@@ -449,32 +449,36 @@ def need_api_auth(
             ac: fastapi.security.HTTPAuthorizationCredentials | None = fastapi.Security(
                 fastapi.security.HTTPBearer(auto_error=False)
             ),
-            apikey_string: str | None = Security(APIKeyHeader(name="apikey", auto_error=False)),
+            api_key_string: str | None = Security(APIKeyHeader(name="apikey", auto_error=False)),
             request: fastapi.Request
     ) -> BaseNeedAPIAuthData:
 
         _error_data = {
-            "require_apikey_string": require_apikey_string,
+            "require_api_key_string": require_api_key_string,
             "require_token_string": require_token_string
         }
 
         res = BaseNeedAPIAuthData()
 
-        # apikey
+        # api_key
 
-        res.apikey_string = apikey_string
+        res.api_key_string = api_key_string
 
-        if not res.apikey_string and "api_key" in request.headers.keys():
-            res.apikey_string = request.headers["api_key"]
-        if not res.apikey_string and "apikey" in request.headers.keys():
-            res.apikey_string = request.headers["apikey"]
+        if not res.api_key_string and "api_key" in request.headers.keys():
+            res.api_key_string = request.headers["api_key"]
+        if not res.api_key_string and "api-key" in request.headers.keys():
+            res.api_key_string = request.headers["api-key"]
+        if not res.api_key_string and "apikey" in request.headers.keys():
+            res.api_key_string = request.headers["apikey"]
 
-        if not res.apikey_string and "apikey" in request.query_params.keys():
-            res.apikey_string = request.query_params["apikey"]
-        if not res.apikey_string and "api_key" in request.query_params.keys():
-            res.apikey_string = request.query_params["api_key"]
+        if not res.api_key_string and "api_key" in request.query_params.keys():
+            res.api_key_string = request.query_params["api_key"]
+        if not res.api_key_string and "api-key" in request.query_params.keys():
+            res.api_key_string = request.query_params["api-key"]
+        if not res.api_key_string and "apikey" in request.query_params.keys():
+            res.api_key_string = request.query_params["apikey"]
 
-        _error_data["res.apikey_string"] = res.apikey_string
+        _error_data["res.api_key_string"] = res.api_key_string
 
         # token
 
@@ -483,22 +487,22 @@ def need_api_auth(
         if not res.token_string and "token" in request.headers.keys():
             res.token_string = request.headers["token"]
 
-        if not res.token_string and "token" in request.query_params.keys():
-            res.token_string = request.query_params["token"]
-
         if not res.token_string and "user_token" in request.headers.keys():
             res.token_string = request.headers["user_token"]
-        if not res.token_string and "usertoken" in request.headers.keys():
-            res.token_string = request.headers["usertoken"]
         if not res.token_string and "user-token" in request.headers.keys():
             res.token_string = request.headers["user-token"]
+        if not res.token_string and "usertoken" in request.headers.keys():
+            res.token_string = request.headers["usertoken"]
+
+        if not res.token_string and "token" in request.query_params.keys():
+            res.token_string = request.query_params["token"]
 
         if not res.token_string and "user_token" in request.query_params.keys():
             res.token_string = request.query_params["user_token"]
-        if not res.token_string and "usertoken" in request.query_params.keys():
-            res.token_string = request.query_params["usertoken"]
         if not res.token_string and "user-token" in request.query_params.keys():
             res.token_string = request.query_params["user-token"]
+        if not res.token_string and "usertoken" in request.query_params.keys():
+            res.token_string = request.query_params["usertoken"]
 
         if res.token_string:
             res.token_string = res.token_string.strip()
@@ -507,7 +511,7 @@ def need_api_auth(
 
         _error_data["res.token_string"] = res.token_string
 
-        if require_apikey_string and not res.apikey_string:
+        if require_api_key_string and not res.api_key_string:
             raise APIException(
                 status_code=starlette.status.HTTP_401_UNAUTHORIZED,
                 error_code=ErrorSO.APIErrorCodes.cannot_authorize,

{arpakitlib-1.6.37.dist-info → arpakitlib-1.6.39.dist-info}/METADATA

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

{arpakitlib-1.6.37.dist-info → arpakitlib-1.6.39.dist-info}/RECORD

@@ -35,7 +35,7 @@ arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.css,sha256=jzPZlgJTFwSdSphk9C
 arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.css.map,sha256=5wq8eXMLU6Zxb45orZPL1zAsBFJReFw6GjYqGpUX3hg,262650
 arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.js,sha256=ffrLZHHEQ_g84A-ul3yWa10Kk09waOAxHcQXPuZuavg,339292
 arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.js.map,sha256=9UhIW7MqCOZPAz1Sl1IKfZUuhWU0p-LJqrnjjJD9Xhc,1159454
-arpakitlib/ar_fastapi_util.py,sha256=VoWJDJnBKcoej5OOgz0C_vqmOe5xz8e_5tW8zMw0VCI,20687
+arpakitlib/ar_fastapi_util.py,sha256=sqOFlYbJ_RGD5wAXt9GKUKNcO5kreSW6zOkCQsYV9UE,20992
 arpakitlib/ar_file_storage_in_dir_util.py,sha256=D3e3rGuHoI6xqAA5mVvEpVVpOWY1jyjNsjj2UhyHRbE,3674
 arpakitlib/ar_generate_env_example.py,sha256=R_pdbFZe-mIZxEps2dm-K9m8rAg1pAaMzFOBPTGe4s4,370
 arpakitlib/ar_hash_util.py,sha256=Iqy6KBAOLBQMFLWv676boI5sV7atT2B-fb7aCdHOmIQ,340
@@ -63,8 +63,8 @@ arpakitlib/ar_str_util.py,sha256=xSEzmsDvRiZVaxyqFFjcgzpphktCbXg2FHcvsd1DYpA,188
 arpakitlib/ar_type_util.py,sha256=I6jbTz7_dxR1lkhz1JfUb5ZyLLdXVhG_-hzjdgT6N6s,1932
 arpakitlib/ar_yookassa_api_client_util.py,sha256=5GMvu8paByni8buhc1vpHB7n6oXe0gPfj1LSvnyZCrQ,5307
 arpakitlib/ar_zabbix_util.py,sha256=Q-VR4MvoZ9aHwZeYZr9G3LwN-ANx1T5KFmF6pvPM-9M,6402
-arpakitlib-1.6.37.dist-info/LICENSE,sha256=1jqWIkbnMxDfs_i0SXP5qbV6PHjBr1g8506oW7uPjfg,11347
-arpakitlib-1.6.37.dist-info/METADATA,sha256=dQxSVu2TKCD_JZibRrI4f98gpFjmgRJNywUEFJoP_yY,2320
-arpakitlib-1.6.37.dist-info/NOTICE,sha256=wHwmiq3wExfFfgMsE5U5TOBP9_l72ocIG82KurEels0,43
-arpakitlib-1.6.37.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-arpakitlib-1.6.37.dist-info/RECORD,,
+arpakitlib-1.6.39.dist-info/LICENSE,sha256=1jqWIkbnMxDfs_i0SXP5qbV6PHjBr1g8506oW7uPjfg,11347
+arpakitlib-1.6.39.dist-info/METADATA,sha256=fFFc4oUZTLXneYukffFhScCCOuaG_C290wIwEk_DQ-g,2320
+arpakitlib-1.6.39.dist-info/NOTICE,sha256=wHwmiq3wExfFfgMsE5U5TOBP9_l72ocIG82KurEels0,43
+arpakitlib-1.6.39.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+arpakitlib-1.6.39.dist-info/RECORD,,