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
3
3
AIRNOMINAL_GITHUB_REDIRECT_URL = http://127.0.0.1:8000/auth/callback
4
4
AIRNMONIAL_MAIN_PAGE_REDIRECT_URL = http://127.0.0.1:8000/
5
5
6
- AIRNOMINAL_JWT_SECRET_KEY = test
6
+ AIRNOMINAL_JWT_SECRET_KEY = secret
7
7
AIRNOMINAL_JWT_ALGORITHM = HS256
8
8
AIRNOMINAL_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 11
11
from fastapi .security .base import SecurityBase
12
12
from fastapi .security .utils import get_authorization_scheme_param
13
13
from jose import jwt
14
+ from jwt import PyJWTError
14
15
from pydantic import BaseModel
15
16
from starlette .requests import Request
16
17
from starlette .status import HTTP_403_FORBIDDEN
@@ -140,8 +141,7 @@ async def get_current_user(token: str = Depends(oauth2_scheme)):
140
141
status_code = HTTP_403_FORBIDDEN , detail = "Could not validate credentials"
141
142
)
142
143
try :
143
- payload = jwt .decode (token , SECRET_KEY , algorithms = [ALGORITHM ])
144
- return payload
144
+ return jwt .decode (token , SECRET_KEY , algorithms = [ALGORITHM ])
145
145
except PyJWTError :
146
146
raise credentials_exception
147
147
@@ -160,7 +160,6 @@ async def auth_callback(request: Request):
160
160
access_token = create_access_token (
161
161
data = dict (user ), expires_delta = access_token_expires
162
162
)
163
- print (dict (user ))
164
163
response = RedirectResponse (redirect_url_main_page )
165
164
response .set_cookie (
166
165
"Authorization" ,
Original file line number Diff line number Diff line change 14
14
SECRET_KEY = os .getenv ("AIRNOMINAL_JWT_SECRET_KEY" )
15
15
ALGORITHM = os .getenv ("AIRNOMINAL_JWT_ALGORITHM" )
16
16
ACCESS_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 6
6
from starlette .middleware .authentication import AuthenticationMiddleware
7
7
8
8
from 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
12
10
13
11
router = APIRouter ()
14
12
templates = Jinja2Templates (directory = "templates" )
@@ -19,11 +17,9 @@ async def root(request: Request):
19
17
return templates .TemplateResponse ("index.html" , {"request" : request , "user" : request .user })
20
18
21
19
22
- app = FastAPI (root_path = api_root_path )
20
+ app = FastAPI ()
23
21
app .include_router (router )
24
22
app .include_router (auth_router )
25
- app .include_router (register_router )
26
- app .include_router (data_router )
27
23
28
24
29
25
class 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