updated logout functionality

Author: barreraalexander

src/routers/auth/auth_routes.py

@@ -3,6 +3,7 @@
 from fastapi.responses import HTMLResponse
 from fastapi.security.oauth2 import OAuth2PasswordRequestForm
 from sqlalchemy.orm import Session
+from src import app 
 
 import src.schemas as schemas
 import src.models as models
@@ -34,15 +35,14 @@ async def login(user_credentials: OAuth2PasswordRequestForm = Depends(), db: Ses
             "token_type" : "bearer"
         }
 
-
-@router.post('/logout', response_model=schemas.Token)
+@router.get('/logout', response_model=schemas.Token)
 async def logout(request: Request, response_model=HTMLResponse):
     auth_token  = request.cookies.get('Authorization')
 
     if (auth_token):
-        request.cookies.pop('Authorization')
-        
-        return RedirectResponse(router.url_path_for('signin'))
-        # verify = oauth2.get_current_user(auth_token)    
+        redirect = RedirectResponse(app.ui_router.url_path_for('signin'))
+        redirect.set_cookie('Authorization', '')
+        return redirect
+
+    return RedirectResponse(app.ui_router.url_path_for('home'))    
 
-    return RedirectResponse(router.url_path_for('home'))    

src/routers/ui_routes.py

@@ -1,11 +1,13 @@
-import requests as url_requests
 from fastapi import APIRouter, Request, Depends, status, Response, HTTPException
 from fastapi.responses import RedirectResponse
 from fastapi.responses import HTMLResponse
 from fastapi.templating import Jinja2Templates
 from pathlib import Path
 import http3
 
+from sqlalchemy.orm import Session
+from src.helpers.database import get_db
+
 import src.oauth2 as oauth2
 from src.config import Settings
 from src import models, schemas
@@ -21,18 +23,18 @@
 
 
 @router.get("/", status_code=status.HTTP_200_OK)
-async def home(request: Request, response_model=HTMLResponse):
-
+async def home(request: Request, response_model=HTMLResponse, db: Session = Depends(get_db)):
     auth_token  = request.cookies.get('Authorization')
+
     if (auth_token):
-        # verify = oauth2.get_current_user(auth_token)
+        token_type, jwt_token = auth_token.split(' ')
+        redirect = RedirectResponse(router.url_path_for('signin'))
+        oauth2.verify_access_token(jwt_token, HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Invalid Credentials"))
         return TEMPLATES.TemplateResponse("home/index.html", {"request" : request})
 
     return RedirectResponse(router.url_path_for('signin'))    
 
 
-
-
 @router.get("/login", status_code=status.HTTP_200_OK)
 async def signin(request: Request, response_model=HTMLResponse):
     return TEMPLATES.TemplateResponse("accounts/login.html", {"request" : request})
@@ -85,6 +87,7 @@ async def register(request: Request, response_model=HTMLResponse):
 
     if (response.status_code==201):
         redirect = RedirectResponse(url=router.url_path_for('signin'))
+        # default redirect is 307, which maintains the reused 'POST' indictation, 302 changes it to 'GET'
         redirect.status_code = 302
         return redirect
 

src/sql_app.db

@@ -18,8 +18,10 @@
             </div>
             <ul class="navbar-nav  justify-content-end">
               <li class="nav-item d-flex align-items-center">
+                <a href="{{ url_for('logout') }}" class="nav-link text-body font-weight-bold px-0">
                   <i class="fa fa-user me-sm-1"></i>
                   <span class="d-sm-inline d-none">LOGOUT</span>
+                </a>
               </li>
               <li class="nav-item d-xl-none ps-3 d-flex align-items-center">
                 <a href="javascript:;" class="nav-link text-body p-0" id="iconNavbarSidenav">

src/templates/includes/navigation.html

@@ -136,6 +136,7 @@ <h6 class="ps-4 ms-2 text-uppercase text-xs font-weight-bolder opacity-6">Accoun
           </a>
         </li>
         <li class="nav-item">
+          <a class="nav-link  " href="{{ url_for('logout') }}">
             <div class="icon icon-shape icon-sm shadow border-radius-md bg-white text-center me-2 d-flex align-items-center justify-content-center">
               <svg width="12px" height="20px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
                 <title>spaceship</title>
@@ -154,6 +155,7 @@ <h6 class="ps-4 ms-2 text-uppercase text-xs font-weight-bolder opacity-6">Accoun
               </svg>
             </div>
             <span class="nav-link-text ms-1">Logout</span>
+          </a>
         </li>
       </ul>
     </div>