Skip to content

Commit 8f0d17f

Browse files
committed
Remove some unused snippets
1 parent 878b2b5 commit 8f0d17f

File tree

4 files changed

+15
-58
lines changed

4 files changed

+15
-58
lines changed

examples/DogeAPI/fastapi_allauth/oauth/BaseOauth.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ async def get_access_token(self, code: str, state: Optional[str] = None):
8181

8282
response = requests.post(
8383
self.access_token_url, data=data, headers=self.request_header)
84-
print("response = ", response.text)
8584
if response.status_code >= 400:
8685
raise Exception(response.text)
8786

examples/DogeAPI/fastapi_allauth/oauth/GithubOauth.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ def __init__(
3737
def get_userinfo(self, access_token: str):
3838
response = requests.get(USER_INFO_URL, headers={
3939
"authorization": f"Bearer {access_token}"})
40-
print("response", response.text)
4140
return response.json()
4241

4342
def get_open_id(self, user_json: dict):

examples/DogeAPI/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/python3
22

3-
from fastapi import FastAPI, Request
3+
from fastapi import FastAPI, Request, Depends
44
from fastapi.staticfiles import StaticFiles
55
from fastapi.templating import Jinja2Templates
66
from starlette.responses import HTMLResponse
@@ -14,7 +14,7 @@
1414

1515
models.Base.metadata.create_all(bind=engine)
1616

17-
allauthManager = AllauthManager(db=next(get_db()), user=User, secret="secret", lifetime_second=3600)
17+
allauthManager = AllauthManager(db=Depends(get_db), user=User, secret="secret", lifetime_second=3600)
1818
githubOauth = GithubOauth(
1919
client_id="eccd08d6736b7999a32a",
2020
client_secret="642999c1c5f2b3df8b877afdc78252ef5b594d31",

examples/airnominal/auth.py

Lines changed: 13 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@
88
from fastapi.responses import RedirectResponse
99
from fastapi.security import HTTPBearer
1010
from fastapi.security import OAuth2
11-
from fastapi.security.base import SecurityBase
1211
from fastapi.security.utils import get_authorization_scheme_param
1312
from jose import jwt
1413
from jwt import PyJWTError
15-
from pydantic import BaseModel
1614
from starlette.requests import Request
1715
from starlette.status import HTTP_403_FORBIDDEN
1816

@@ -46,26 +44,6 @@ def create_access_token(data: dict, expires_delta: Optional[timedelta] = None):
4644
return encoded_jwt
4745

4846

49-
class Token(BaseModel):
50-
access_token: str
51-
token_type: str
52-
53-
54-
class TokenData(BaseModel):
55-
username: str = None
56-
57-
58-
class User(BaseModel):
59-
username: str
60-
email: str = None
61-
full_name: str = None
62-
disabled: bool = None
63-
64-
65-
class UserInDB(User):
66-
hashed_password: str
67-
68-
6947
class OAuth2PasswordBearerCookie(OAuth2):
7048
def __init__(
7149
self,
@@ -113,37 +91,26 @@ async def __call__(self, request: Request) -> Optional[str]:
11391
return param
11492

11593

116-
class BasicAuth(SecurityBase):
117-
def __init__(self, scheme_name: str = None, auto_error: bool = True):
118-
self.scheme_name = scheme_name or self.__class__.__name__
119-
self.auto_error = auto_error
120-
121-
async def __call__(self, request: Request) -> Optional[str]:
122-
authorization: str = request.headers.get("Authorization")
123-
scheme, param = get_authorization_scheme_param(authorization)
124-
if not authorization or scheme.lower() != "basic":
125-
if self.auto_error:
126-
raise HTTPException(
127-
status_code=HTTP_403_FORBIDDEN, detail="Not authenticated"
128-
)
129-
else:
130-
return None
131-
return param
132-
133-
134-
basic_auth = BasicAuth(auto_error=False)
135-
13694
oauth2_scheme = OAuth2PasswordBearerCookie(tokenUrl="/token")
13795

13896

13997
async def get_current_user(token: str = Depends(oauth2_scheme)):
140-
credentials_exception = HTTPException(
141-
status_code=HTTP_403_FORBIDDEN, detail="Could not validate credentials"
142-
)
14398
try:
14499
return jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
145100
except PyJWTError:
146-
raise credentials_exception
101+
raise HTTPException(
102+
status_code=HTTP_403_FORBIDDEN, detail="Could not validate credentials"
103+
)
104+
105+
106+
@router.get("/user")
107+
def user(current_user=Depends(get_current_user)):
108+
return current_user
109+
110+
111+
@router.post("/token")
112+
def token(request: Request):
113+
return request.cookies.get("Authorization")
147114

148115

149116
@router.get("/auth/login")
@@ -176,11 +143,3 @@ async def auth_logout():
176143
response = RedirectResponse(redirect_url_main_page)
177144
response.delete_cookie("Authorization")
178145
return response
179-
180-
181-
@router.get("/auth/status")
182-
async def auth_status(user=Depends(get_current_user)):
183-
return {
184-
"ok": True,
185-
"user": user,
186-
}

0 commit comments

Comments
 (0)