From ea8a4a3ec4f2dd83ded55acf9bdeb8d2074eda9b Mon Sep 17 00:00:00 2001 From: Edward <73746306+WangEdward@users.noreply.github.com> Date: Mon, 12 Feb 2024 04:41:55 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=AF=E6=8C=81=20Radarr=20=E7=9A=84?= =?UTF-8?q?=20X-Api-Key=20=E8=AF=B7=E6=B1=82=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/security.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/core/security.py b/app/core/security.py index fee46132..3fbb57c1 100644 --- a/app/core/security.py +++ b/app/core/security.py @@ -5,11 +5,11 @@ import json import os import traceback from datetime import datetime, timedelta -from typing import Any, Union, Optional +from typing import Any, Union, Optional, Annotated import jwt from Crypto.Cipher import AES from Crypto.Util.Padding import pad -from fastapi import HTTPException, status, Depends +from fastapi import HTTPException, status, Depends, Header from fastapi.security import OAuth2PasswordBearer from passlib.context import CryptContext @@ -68,11 +68,11 @@ def get_token(token: str = None) -> str: return token -def get_apikey(apikey: str = None) -> str: +def get_apikey(apikey: str = None, x_api_key: Annotated[str | None, Header()] = None) -> str: """ 从请求URL中获取apikey """ - return apikey + return apikey or x_api_key def verify_uri_token(token: str = Depends(get_token)) -> str: