Convert the airnominal to the core app

Author: ArtyomVancyan

examples/airnominal/.env renamed to .env

@@ -2,17 +2,17 @@
 
 Easy to setup social authentication mechanism with support for several auth providers.
 
-## Examples
+## Demo
 
-- [airnominal](./examples/airnominal) - [fastapi-sso](https://github.com/tomasvotava/fastapi-sso) based implementation
-- [dogeapi](./examples/DogeAPI) - [fastapi-allauth](https://github.com/K-villain/fastapi-allauth) based implementation
+This sample application is made to demonstrate the use of the [**fastapi-oauth2**](./fastapi_oauth2) package.
 
-Both can be run using the following command:
+## Running the application
 
 ```bash
 uvicorn main:app --reload
 ```
 
 ## TODO
 
-- Segregate the prototype of the `fastapi-oauth2` core.
+- Make the [**fastapi-oauth2**](./fastapi_oauth2) depend
+  on (overuse) the [**social-core**](https://github.com/python-social-auth/social-core)

README.md

@@ -1,47 +1,14 @@
-import os
-from datetime import datetime, timedelta
 from typing import Optional
 
-from fastapi import APIRouter
 from fastapi import Depends, HTTPException
 from fastapi.openapi.models import OAuthFlows as OAuthFlowsModel
-from fastapi.responses import RedirectResponse
-from fastapi.security import HTTPBearer
 from fastapi.security import OAuth2
 from fastapi.security.utils import get_authorization_scheme_param
-from jose import jwt
-from jwt import PyJWTError
+from jose import jwt, JWTError
 from starlette.requests import Request
 from starlette.status import HTTP_403_FORBIDDEN
 
-from config import CLIENT_ID, CLIENT_SECRET, redirect_url, SECRET_KEY, ALGORITHM, ACCESS_TOKEN_EXPIRE_MINUTES, \
-    redirect_url_main_page
-from fastapi_sso.github import GithubSSO
-
-router = APIRouter()
-
-# config for GitHub SSO
-os.environ["OAUTHLIB_INSECURE_TRANSPORT"] = "1"
-
-sso = GithubSSO(
-    client_id=CLIENT_ID,
-    client_secret=CLIENT_SECRET,
-    redirect_uri=redirect_url,
-    allow_insecure_http=True,
-)
-
-security = HTTPBearer()
-
-
-def create_access_token(data: dict, expires_delta: Optional[timedelta] = None):
-    to_encode = data.copy()
-    if expires_delta:
-        expire = datetime.utcnow() + expires_delta
-    else:
-        expire = datetime.utcnow() + timedelta(minutes=15)
-    to_encode.update({"exp": expire})
-    encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
-    return encoded_jwt
+from .config import SECRET_KEY, ALGORITHM
 
 
 class OAuth2PasswordBearerCookie(OAuth2):
@@ -80,6 +47,8 @@ async def __call__(self, request: Request) -> Optional[str]:
 
         else:
             authorization = False
+            scheme = ""
+            param = ""
 
         if not authorization or scheme.lower() != "bearer":
             if self.auto_error:
@@ -97,49 +66,7 @@ async def __call__(self, request: Request) -> Optional[str]:
 async def get_current_user(token: str = Depends(oauth2_scheme)):
     try:
         return jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
-    except PyJWTError:
+    except JWTError:
         raise HTTPException(
             status_code=HTTP_403_FORBIDDEN, detail="Could not validate credentials"
         )
-
-
-@router.get("/user")
-def user(current_user=Depends(get_current_user)):
-    return current_user
-
-
-@router.post("/token")
-def token(request: Request):
-    return request.cookies.get("Authorization")
-
-
-@router.get("/auth/login")
-async def auth_init():
-    """Initialize auth and redirect"""
-    return await sso.get_login_redirect()
-
-
-@router.get("/auth/callback")
-async def auth_callback(request: Request):
-    """Verify login"""
-    user = await sso.verify_and_process(request)
-    access_token_expires = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
-    access_token = create_access_token(
-        data=dict(user), expires_delta=access_token_expires
-    )
-    response = RedirectResponse(redirect_url_main_page)
-    response.set_cookie(
-        "Authorization",
-        value=f"Bearer {access_token}",
-        httponly=True,
-        max_age=1800,
-        expires=1800,
-    )
-    return response
-
-
-@router.get("/auth/logout")
-async def auth_logout():
-    response = RedirectResponse(redirect_url_main_page)
-    response.delete_cookie("Authorization")
-    return response

examples/airnominal/fastapi_sso/__init__.py renamed to demo/__init__.py

@@ -0,0 +1,65 @@
+from datetime import timedelta
+
+from fastapi import APIRouter
+from fastapi import Depends
+from fastapi.responses import RedirectResponse
+from starlette.requests import Request
+
+from fastapi_oauth2.github import GithubSSO
+from .config import (
+    CLIENT_ID,
+    CLIENT_SECRET,
+    redirect_url,
+    ACCESS_TOKEN_EXPIRE_MINUTES,
+    redirect_url_main_page,
+)
+from .dependencies import get_current_user
+from .utils import create_access_token
+
+router = APIRouter()
+sso = GithubSSO(
+    client_id=CLIENT_ID,
+    client_secret=CLIENT_SECRET,
+    redirect_uri=redirect_url,
+    allow_insecure_http=True,
+)
+
+
+@router.get("/user")
+def user(current_user=Depends(get_current_user)):
+    return current_user
+
+
+@router.post("/token")
+def token(request: Request):
+    return request.cookies.get("Authorization")
+
+
+@router.get("/auth/login")
+async def auth_init():
+    return await sso.get_login_redirect()
+
+
+@router.get("/auth/callback")
+async def auth_callback(request: Request):
+    user = await sso.verify_and_process(request)
+    access_token_expires = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
+    access_token = create_access_token(
+        data=dict(user), expires_delta=access_token_expires
+    )
+    response = RedirectResponse(redirect_url_main_page)
+    response.set_cookie(
+        "Authorization",
+        value=f"Bearer {access_token}",
+        httponly=sso.allow_insecure_http,
+        max_age=ACCESS_TOKEN_EXPIRE_MINUTES * 60,
+        expires=ACCESS_TOKEN_EXPIRE_MINUTES * 60,
+    )
+    return response
+
+
+@router.get("/auth/logout")
+async def auth_logout():
+    response = RedirectResponse(redirect_url_main_page)
+    response.delete_cookie("Authorization")
+    return response

examples/airnominal/config.py renamed to demo/config.py

@@ -0,0 +1,17 @@
+from datetime import datetime, timedelta
+from typing import Optional
+
+from jose import jwt
+
+from .config import SECRET_KEY, ALGORITHM
+
+
+def create_access_token(data: dict, expires_delta: Optional[timedelta] = None):
+    to_encode = data.copy()
+    if expires_delta:
+        expire = datetime.utcnow() + expires_delta
+    else:
+        expire = datetime.utcnow() + timedelta(minutes=15)
+    to_encode.update({"exp": expire})
+    encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
+    return encoded_jwt