FastAPI-UI-Auth 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

{fastapi_ui_auth-0.3.0.dist-info → fastapi_ui_auth-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: FastAPI-UI-Auth
-Version: 0.3.0
+Version: 0.3.2
 Summary: Python module to add username and password authentication to specific FastAPI routes
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{fastapi_ui_auth-0.3.0.dist-info → fastapi_ui_auth-0.3.2.dist-info}/RECORD

@@ -1,18 +1,18 @@
-fastapi_ui_auth-0.3.0.dist-info/licenses/LICENSE,sha256=_sOIKJWdD2o1WwwDIwYB2qTP2nlSWqT5Tyg9jr1Xa4w,1070
+fastapi_ui_auth-0.3.2.dist-info/licenses/LICENSE,sha256=_sOIKJWdD2o1WwwDIwYB2qTP2nlSWqT5Tyg9jr1Xa4w,1070
 uiauth/__init__.py,sha256=hbHN-Vv4xTxDqpQW2lmgdl-OlEkAtL6JXAGL-nucaOU,211
-uiauth/endpoints.py,sha256=CJteXsGQWfn--U6_VdVN8VhnPsf3HSefYX1NOzAhacM,2837
+uiauth/endpoints.py,sha256=nacWM8IJWnReweMwsDOEffyPKXll_qtXnGTSA4NJysY,2953
 uiauth/enums.py,sha256=W_9U2luXbscyBEROXqEhKY5DHpJRV1J4VUOpkyUOOzU,334
 uiauth/logger.py,sha256=z67PBMs4zWOfy-Gfm_41dj5Uulm-ChvZxB_jmYKKXeI,391
 uiauth/models.py,sha256=56d8O9bExxwPZcOzMYL0IN9LOnVTJyfOSvD58kzTklc,3210
 uiauth/secure.py,sha256=ZOH6kT4BD56VqwaKdKocX7eSE8tqZcu-tK0QOmjY58k,1089
-uiauth/service.py,sha256=amj7899oG9PP3-HHMo_2OMjiBpUXnUUli9at1FQwwMw,7992
-uiauth/utils.py,sha256=WdkR3Ro6KLacBiCFZECaH377JqhsMWVCGF2SjGSxXRg,6989
-uiauth/version.py,sha256=EqIccytbgmIh3EOfv7QIiksdjJSlB-o2LbyXxRtoMGs,18
+uiauth/service.py,sha256=XeVFxWR5k7QIdgxjRBiUaE0oYpSlX3HE-RadJq-7HW4,7827
+uiauth/utils.py,sha256=Ga8RivN3PJX8zg2uu3RfEtJLGKaT1_iwphqvhh2XrPY,7007
+uiauth/version.py,sha256=zjuPzQ2OlxNtrLXb5A3OlPsaRb_b_Ln51AWN6r9VRho,18
 uiauth/templates/index.html,sha256=n8tOiKXEUI4zBh1YOQNlH5MKNMRTQ2adH0QIuvrEcv4,9071
 uiauth/templates/logout.html,sha256=JrWBJCbK1E4NfrNipMsLzfJ_-Fs2C6D4S0B6O7JNoek,3504
 uiauth/templates/session.html,sha256=EL4gajOED3IcOnrALMiJ2SzJl2at8GFfruTuExhgOVI,3040
 uiauth/templates/unauthorized.html,sha256=ahv78zLM04_Lu83LdX0Ua_toKeP5JZkYsTCWCrfCvHA,3002
-fastapi_ui_auth-0.3.0.dist-info/METADATA,sha256=o8U9Nz2gvix5n5WdqwF4eJeYxC4LEqQv4m2gvuxkUlw,3662
-fastapi_ui_auth-0.3.0.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-fastapi_ui_auth-0.3.0.dist-info/top_level.txt,sha256=ra3nGTbDTgQ7eChlkngJ7xGXhSCeFTWMvb_b6q8uPVA,7
-fastapi_ui_auth-0.3.0.dist-info/RECORD,,
+fastapi_ui_auth-0.3.2.dist-info/METADATA,sha256=Yx80vcs80ZJtOEmn3uJcJ3MaIUXJ1p7KZHTOkGt2bIg,3662
+fastapi_ui_auth-0.3.2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+fastapi_ui_auth-0.3.2.dist-info/top_level.txt,sha256=ra3nGTbDTgQ7eChlkngJ7xGXhSCeFTWMvb_b6q8uPVA,7
+fastapi_ui_auth-0.3.2.dist-info/RECORD,,

{fastapi_ui_auth-0.3.0.dist-info → fastapi_ui_auth-0.3.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (82.0.0)
+Generator: setuptools (82.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

uiauth/endpoints.py

@@ -19,6 +19,7 @@ def session(request: Request) -> HTMLResponse:
     return utils.deauthorize(
         models.templates.TemplateResponse(
             name="session.html",
+            request=request,
             context={
                 "request": request,
                 "signin": enums.APIEndpoints.fastapi_login,
@@ -41,6 +42,7 @@ def login(request: Request) -> HTMLResponse:
     return utils.deauthorize(
         models.templates.TemplateResponse(
             name="index.html",
+            request=request,
             context={
                 "request": request,
                 "signin": enums.APIEndpoints.fastapi_verify_login,
@@ -65,6 +67,7 @@ def logout(request: Request) -> HTMLResponse:
     return utils.deauthorize(
         models.templates.TemplateResponse(
             name="logout.html",
+            request=request,
             context={
                 "request": request,
                 "detail": "You have been successfully logged out.",
@@ -87,6 +90,7 @@ def error(request: Request) -> HTMLResponse:
     return utils.deauthorize(
         models.templates.TemplateResponse(
             name="unauthorized.html",
+            request=request,
             context={
                 "request": request,
                 "signin": enums.APIEndpoints.fastapi_login,

uiauth/service.py

@@ -1,3 +1,4 @@
+import inspect
 import logging
 import time
 from typing import Dict, List
@@ -139,26 +140,31 @@ class FastAPIUIAuth:
             path=enums.APIEndpoints.fastapi_login,
             endpoint=endpoints.login,
             methods=["GET"],
+            include_in_schema=False,
         )
         logout_route = APIRoute(
             path=enums.APIEndpoints.fastapi_logout,
             endpoint=endpoints.logout,
             methods=["GET"],
+            include_in_schema=False,
         )
         error_route = APIRoute(
             path=enums.APIEndpoints.fastapi_error,
             endpoint=endpoints.error,
             methods=["GET"],
+            include_in_schema=False,
         )
         session_route = APIRoute(
             path=enums.APIEndpoints.fastapi_session,
             endpoint=endpoints.session,
             methods=["GET"],
+            include_in_schema=False,
         )
         verify_route = APIRoute(
             path=enums.APIEndpoints.fastapi_verify_login,
             endpoint=self._verify_auth,
             methods=["POST"],
+            include_in_schema=False,
         )
         protected_paths = {route.path for route in self.routes}
         conflicting = [
@@ -174,22 +180,15 @@ class FastAPIUIAuth:
             )
             self.app.routes.remove(existing)
         for route in self.routes:
-            # WebSocket routes will not have a login path, they will be protected by session check
-            if isinstance(route, APIWebSocketRoute):
-                secure_route = APIWebSocketRoute(
-                    path=route.path,
-                    endpoint=route.endpoint,
-                    dependencies=list(route.dependencies)
-                    + [Depends(utils.verify_session)],
-                )
-            else:
-                secure_route = APIRoute(
-                    path=route.path,
-                    endpoint=route.endpoint,
-                    methods=list(route.methods) if route.methods else ["GET"],
-                    dependencies=list(route.dependencies)
-                    + [Depends(utils.verify_session)],
-                )
+            kwargs = {
+                name: getattr(route, name)
+                for name in inspect.signature(route.__class__.__init__).parameters
+                if name != "self" and hasattr(route, name)
+            }
+            kwargs["dependencies"] = list(route.dependencies) + [
+                Depends(utils.verify_session)
+            ]
+            secure_route = route.__class__(**kwargs)
             self.app.routes.append(secure_route)
         self.app.routes.extend(
             [login_route, logout_route, session_route, verify_route, error_route]

uiauth/utils.py

@@ -138,14 +138,14 @@ def verify_session(
             detail="Request or WebSocket connection is required for session check.",
         )
     session_token = request.cookies.get("session_token")
-    stored = models.ws_session.client_auth.get(request.client.host)
+    stored = models.ws_session.client_auth.get(request.client.host, {})
     if (
-        stored
+        stored.get("token")
         and session_token
         and secrets.compare_digest(session_token, stored["token"])
     ):
         if time.time() < stored["expires_at"]:
-            logger.CUSTOM_LOGGER.info(
+            logger.CUSTOM_LOGGER.debug(
                 "Session is valid for host: %s", request.client.host
             )
             return

uiauth/version.py

@@ -1 +1 @@
-version = "0.3.0"
+version = "0.3.2"