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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -436,12 +436,12 @@ class BaseNeedAPIAuthData(BaseModel):
436
436
  model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True, from_attributes=True)
437
437
 
438
438
  token_string: str | None = None
439
- apikey_string: str | None = None
439
+ api_key_string: str | None = None
440
440
 
441
441
 
442
- def need_api_auth(
442
+ def base_need_api_auth(
443
443
  *,
444
- require_apikey_string: bool = False,
444
+ require_api_key_string: bool = False,
445
445
  require_token_string: bool = False,
446
446
  ) -> Callable:
447
447
  async def func(
@@ -449,32 +449,36 @@ def need_api_auth(
449
449
  ac: fastapi.security.HTTPAuthorizationCredentials | None = fastapi.Security(
450
450
  fastapi.security.HTTPBearer(auto_error=False)
451
451
  ),
452
- apikey_string: str | None = Security(APIKeyHeader(name="apikey", auto_error=False)),
452
+ api_key_string: str | None = Security(APIKeyHeader(name="apikey", auto_error=False)),
453
453
  request: fastapi.Request
454
454
  ) -> BaseNeedAPIAuthData:
455
455
 
456
456
  _error_data = {
457
- "require_apikey_string": require_apikey_string,
457
+ "require_api_key_string": require_api_key_string,
458
458
  "require_token_string": require_token_string
459
459
  }
460
460
 
461
461
  res = BaseNeedAPIAuthData()
462
462
 
463
- # apikey
463
+ # api_key
464
464
 
465
- res.apikey_string = apikey_string
465
+ res.api_key_string = api_key_string
466
466
 
467
- if not res.apikey_string and "api_key" in request.headers.keys():
468
- res.apikey_string = request.headers["api_key"]
469
- if not res.apikey_string and "apikey" in request.headers.keys():
470
- res.apikey_string = request.headers["apikey"]
467
+ if not res.api_key_string and "api_key" in request.headers.keys():
468
+ res.api_key_string = request.headers["api_key"]
469
+ if not res.api_key_string and "api-key" in request.headers.keys():
470
+ res.api_key_string = request.headers["api-key"]
471
+ if not res.api_key_string and "apikey" in request.headers.keys():
472
+ res.api_key_string = request.headers["apikey"]
471
473
 
472
- if not res.apikey_string and "apikey" in request.query_params.keys():
473
- res.apikey_string = request.query_params["apikey"]
474
- if not res.apikey_string and "api_key" in request.query_params.keys():
475
- res.apikey_string = request.query_params["api_key"]
474
+ if not res.api_key_string and "api_key" in request.query_params.keys():
475
+ res.api_key_string = request.query_params["api_key"]
476
+ if not res.api_key_string and "api-key" in request.query_params.keys():
477
+ res.api_key_string = request.query_params["api-key"]
478
+ if not res.api_key_string and "apikey" in request.query_params.keys():
479
+ res.api_key_string = request.query_params["apikey"]
476
480
 
477
- _error_data["res.apikey_string"] = res.apikey_string
481
+ _error_data["res.api_key_string"] = res.api_key_string
478
482
 
479
483
  # token
480
484
 
@@ -483,22 +487,22 @@ def need_api_auth(
483
487
  if not res.token_string and "token" in request.headers.keys():
484
488
  res.token_string = request.headers["token"]
485
489
 
486
- if not res.token_string and "token" in request.query_params.keys():
487
- res.token_string = request.query_params["token"]
488
-
489
490
  if not res.token_string and "user_token" in request.headers.keys():
490
491
  res.token_string = request.headers["user_token"]
491
- if not res.token_string and "usertoken" in request.headers.keys():
492
- res.token_string = request.headers["usertoken"]
493
492
  if not res.token_string and "user-token" in request.headers.keys():
494
493
  res.token_string = request.headers["user-token"]
494
+ if not res.token_string and "usertoken" in request.headers.keys():
495
+ res.token_string = request.headers["usertoken"]
496
+
497
+ if not res.token_string and "token" in request.query_params.keys():
498
+ res.token_string = request.query_params["token"]
495
499
 
496
500
  if not res.token_string and "user_token" in request.query_params.keys():
497
501
  res.token_string = request.query_params["user_token"]
498
- if not res.token_string and "usertoken" in request.query_params.keys():
499
- res.token_string = request.query_params["usertoken"]
500
502
  if not res.token_string and "user-token" in request.query_params.keys():
501
503
  res.token_string = request.query_params["user-token"]
504
+ if not res.token_string and "usertoken" in request.query_params.keys():
505
+ res.token_string = request.query_params["usertoken"]
502
506
 
503
507
  if res.token_string:
504
508
  res.token_string = res.token_string.strip()
@@ -507,7 +511,7 @@ def need_api_auth(
507
511
 
508
512
  _error_data["res.token_string"] = res.token_string
509
513
 
510
- if require_apikey_string and not res.apikey_string:
514
+ if require_api_key_string and not res.api_key_string:
511
515
  raise APIException(
512
516
  status_code=starlette.status.HTTP_401_UNAUTHORIZED,
513
517
  error_code=ErrorSO.APIErrorCodes.cannot_authorize,
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: arpakitlib
3
- Version: 1.6.37
3
+ Version: 1.6.39
4
4
  Summary: arpakitlib
5
5
  Home-page: https://github.com/ARPAKIT-Company/arpakitlib
6
6
  License: Apache-2.0
@@ -35,7 +35,7 @@ arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.css,sha256=jzPZlgJTFwSdSphk9C
35
35
  arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.css.map,sha256=5wq8eXMLU6Zxb45orZPL1zAsBFJReFw6GjYqGpUX3hg,262650
36
36
  arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.js,sha256=ffrLZHHEQ_g84A-ul3yWa10Kk09waOAxHcQXPuZuavg,339292
37
37
  arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.js.map,sha256=9UhIW7MqCOZPAz1Sl1IKfZUuhWU0p-LJqrnjjJD9Xhc,1159454
38
- arpakitlib/ar_fastapi_util.py,sha256=VoWJDJnBKcoej5OOgz0C_vqmOe5xz8e_5tW8zMw0VCI,20687
38
+ arpakitlib/ar_fastapi_util.py,sha256=sqOFlYbJ_RGD5wAXt9GKUKNcO5kreSW6zOkCQsYV9UE,20992
39
39
  arpakitlib/ar_file_storage_in_dir_util.py,sha256=D3e3rGuHoI6xqAA5mVvEpVVpOWY1jyjNsjj2UhyHRbE,3674
40
40
  arpakitlib/ar_generate_env_example.py,sha256=R_pdbFZe-mIZxEps2dm-K9m8rAg1pAaMzFOBPTGe4s4,370
41
41
  arpakitlib/ar_hash_util.py,sha256=Iqy6KBAOLBQMFLWv676boI5sV7atT2B-fb7aCdHOmIQ,340
@@ -63,8 +63,8 @@ arpakitlib/ar_str_util.py,sha256=xSEzmsDvRiZVaxyqFFjcgzpphktCbXg2FHcvsd1DYpA,188
63
63
  arpakitlib/ar_type_util.py,sha256=I6jbTz7_dxR1lkhz1JfUb5ZyLLdXVhG_-hzjdgT6N6s,1932
64
64
  arpakitlib/ar_yookassa_api_client_util.py,sha256=5GMvu8paByni8buhc1vpHB7n6oXe0gPfj1LSvnyZCrQ,5307
65
65
  arpakitlib/ar_zabbix_util.py,sha256=Q-VR4MvoZ9aHwZeYZr9G3LwN-ANx1T5KFmF6pvPM-9M,6402
66
- arpakitlib-1.6.37.dist-info/LICENSE,sha256=1jqWIkbnMxDfs_i0SXP5qbV6PHjBr1g8506oW7uPjfg,11347
67
- arpakitlib-1.6.37.dist-info/METADATA,sha256=dQxSVu2TKCD_JZibRrI4f98gpFjmgRJNywUEFJoP_yY,2320
68
- arpakitlib-1.6.37.dist-info/NOTICE,sha256=wHwmiq3wExfFfgMsE5U5TOBP9_l72ocIG82KurEels0,43
69
- arpakitlib-1.6.37.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
70
- arpakitlib-1.6.37.dist-info/RECORD,,
66
+ arpakitlib-1.6.39.dist-info/LICENSE,sha256=1jqWIkbnMxDfs_i0SXP5qbV6PHjBr1g8506oW7uPjfg,11347
67
+ arpakitlib-1.6.39.dist-info/METADATA,sha256=fFFc4oUZTLXneYukffFhScCCOuaG_C290wIwEk_DQ-g,2320
68
+ arpakitlib-1.6.39.dist-info/NOTICE,sha256=wHwmiq3wExfFfgMsE5U5TOBP9_l72ocIG82KurEels0,43
69
+ arpakitlib-1.6.39.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
70
+ arpakitlib-1.6.39.dist-info/RECORD,,