File tree Expand file tree Collapse file tree 8 files changed +5
-289
lines changed Expand file tree Collapse file tree 8 files changed +5
-289
lines changed Original file line number Diff line number Diff line change @@ -3,18 +3,6 @@ AIRNOMINAL_GITHUB_CLIENT_SECRET=642999c1c5f2b3df8b877afdc78252ef5b594d31
33AIRNOMINAL_GITHUB_REDIRECT_URL = http://127.0.0.1:8000/auth/callback
44AIRNMONIAL_MAIN_PAGE_REDIRECT_URL = http://127.0.0.1:8000/
55
6- AIRNOMINAL_JWT_SECRET_KEY = test
6+ AIRNOMINAL_JWT_SECRET_KEY = secret
77AIRNOMINAL_JWT_ALGORITHM = HS256
88AIRNOMINAL_JWT_TOKEN_EXPIRES = 300
9-
10- AIRNOMINAL_INFLUX_BUCKET =
11- AIRNOMINAL_INFLUX_ORG =
12- AIRNOMINAL_INFLUX_TOKEN =
13- AIRNOMINAL_INFLUX_URL =
14-
15- AIRNOMINAL_MONGO_URL = mongodb://127.0.0.1:27017
16- AIRNOMINAL_MONGO_PORT = 27017
17- AIRNOMINAL_MONGO_USERNAME =
18- AIRNOMINAL_MONGO_PASSWORD =
19-
20- AIRNOMINAL_ROOT_PATH =
Original file line number Diff line number Diff line change 1111from fastapi .security .base import SecurityBase
1212from fastapi .security .utils import get_authorization_scheme_param
1313from jose import jwt
14+ from jwt import PyJWTError
1415from pydantic import BaseModel
1516from starlette .requests import Request
1617from starlette .status import HTTP_403_FORBIDDEN
@@ -140,8 +141,7 @@ async def get_current_user(token: str = Depends(oauth2_scheme)):
140141 status_code = HTTP_403_FORBIDDEN , detail = "Could not validate credentials"
141142 )
142143 try :
143- payload = jwt .decode (token , SECRET_KEY , algorithms = [ALGORITHM ])
144- return payload
144+ return jwt .decode (token , SECRET_KEY , algorithms = [ALGORITHM ])
145145 except PyJWTError :
146146 raise credentials_exception
147147
@@ -160,7 +160,6 @@ async def auth_callback(request: Request):
160160 access_token = create_access_token (
161161 data = dict (user ), expires_delta = access_token_expires
162162 )
163- print (dict (user ))
164163 response = RedirectResponse (redirect_url_main_page )
165164 response .set_cookie (
166165 "Authorization" ,
Original file line number Diff line number Diff line change 1414SECRET_KEY = os .getenv ("AIRNOMINAL_JWT_SECRET_KEY" )
1515ALGORITHM = os .getenv ("AIRNOMINAL_JWT_ALGORITHM" )
1616ACCESS_TOKEN_EXPIRE_MINUTES = int (os .getenv ("AIRNOMINAL_JWT_TOKEN_EXPIRES" ))
17-
18- bucket = os .getenv ("AIRNOMINAL_INFLUX_BUCKET" )
19- org = os .getenv ("AIRNOMINAL_INFLUX_ORG" )
20- token = os .getenv ("AIRNOMINAL_INFLUX_TOKEN" )
21- influx_url = os .getenv ("AIRNOMINAL_INFLUX_URL" )
22-
23- mongo_url = os .getenv ("AIRNOMINAL_MONGO_URL" )
24- port = int (os .getenv ("AIRNOMINAL_MONGO_PORT" ) or "0" )
25- username = os .getenv ("AIRNOMINAL_MONGO_USERNAME" )
26- password = os .getenv ("AIRNOMINAL_MONGO_PASSWORD" )
27-
28- api_root_path = os .getenv ("AIRNOMINAL_ROOT_PATH" ) or ""
Load Diff This file was deleted.
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 66from starlette .middleware .authentication import AuthenticationMiddleware
77
88from auth import router as auth_router
9- from config import api_root_path , SECRET_KEY , ALGORITHM
10- from data_endpoint import router as data_router
11- from register import router as register_router
9+ from config import SECRET_KEY , ALGORITHM
1210
1311router = APIRouter ()
1412templates = Jinja2Templates (directory = "templates" )
@@ -19,11 +17,9 @@ async def root(request: Request):
1917 return templates .TemplateResponse ("index.html" , {"request" : request , "user" : request .user })
2018
2119
22- app = FastAPI (root_path = api_root_path )
20+ app = FastAPI ()
2321app .include_router (router )
2422app .include_router (auth_router )
25- app .include_router (register_router )
26- app .include_router (data_router )
2723
2824
2925class BearerTokenAuthBackend (AuthenticationBackend ):
Load Diff This file was deleted.
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments