Nexom 1.0.4__py3-none-any.whl → 1.0.5__py3-none-any.whl

nexom/templates/auth.py

@@ -2,13 +2,16 @@
 from __future__ import annotations
 
 from importlib import resources
+import pathlib as plb
 
-from ..app.auth import AuthClient
+from ..app.auth import AuthClient, KEY_NAME
 from ..app.request import Request
-from ..app.response import HtmlResponse, JsonResponse
+from ..app.response import HtmlResponse, JsonResponse, Redirect, ErrorResponse
+from ..app.cookie import Cookie
+from ..app.path import Path, Router
 from ..core.object_html_render import HTMLDoc, ObjectHTML
+from ..core.error import NexomError, _status_for_auth_error
 
-from ..core.error import NexomError
 
 # --------------------
 # Object HTML
@@ -30,43 +33,106 @@ _OHTML: ObjectHTML = ObjectHTML(
 # Pages
 # --------------------
 
-class LoginPage:
-    def __init__(self, auth_server: str) -> None:
+class AuthPages(Path):
+    def __init__(self,
+        path: str,
+        auth_server: str,
+        *,
+        login_path: str = "login/",
+        signup_path: str = "signup/",
+        logout_path: str = "logout/"
+    ):
+        self.auth_server = auth_server
+
+        root = plb.Path(path)
+        self.routing = Router(
+            LoginPage(str(root / login_path), self.auth_server),
+            SignupPage(str(root / signup_path), self.auth_server),
+            LogoutPage(str(root / logout_path), self.auth_server),
+        )
+
+        super().__init__(path, self._handler, "UserAuthPage")
+
+    def _handler(self, req: Request, args: dict) -> JsonResponse:
+
+        p = self.routing.get(req.path)
+        return p.call_handler(req)
+
+
+class LoginPage(Path):
+    def __init__(self, path: str, auth_server: str) -> None:
+        super().__init__(path, self._handler, "LoginPage")
+
         self.client = AuthClient(auth_server)
 
-    def page(self, req: Request, args: dict) -> HtmlResponse | JsonResponse:
+    def _handler(self, req: Request, args: dict) -> JsonResponse:
         if req.method == "GET":
-            return HtmlResponse(_OHTML.render("login"))
+            return HtmlResponse(_OHTML.render("login", page_path=req.path))
 
         try:
             data = req.json() or {}
             token, user_id, exp = self.client.login(
-                user_id=data.get("user_id", ""),
-                password=data.get("password", ""),
+                user_id=str(data.get("user_id") or ""),
+                password=str(data.get("password") or ""),
             )
-            return JsonResponse({"ok": True, "user_id": user_id, "token": token, "expires_at": exp})
+
+            set_cookie = Cookie(KEY_NAME, token, Path="/", MaxAge=exp)
+            return JsonResponse({"ok": True, "user_id": user_id, "token": token, "expires_at": exp}, cookie=str(set_cookie))
         except NexomError as e:
-            return JsonResponse({"error": e.code}, status=401)
+            return JsonResponse({"ok": False, "error": e.code}, status=_status_for_auth_error(e.code))
+
         except Exception:
-            return JsonResponse({"error": "Internal Server Error"}, status=401)
+            return JsonResponse({"ok": False, "error": "InternalError"}, status=500)
+        
+class SignupPage(Path):
+    def __init__(self, path: str, auth_server: str) -> None:
+        super().__init__(path, self._handler, "SignupPage")
 
-class SignupPage:
-    def __init__(self, auth_server: str) -> None:
         self.client = AuthClient(auth_server)
 
-    def page(self, req: Request, args: dict) -> HtmlResponse | JsonResponse:
+    def _handler(self, req: Request, args: dict) -> JsonResponse:
         if req.method == "GET":
-            return HtmlResponse(_OHTML.render("signup"))
+            return HtmlResponse(_OHTML.render("signup", page_path=req.path))
 
         try:
             data = req.json() or {}
-            ok = self.client.signup(
-                user_id=data.get("user_id", ""),
-                public_name=data.get("public_name", ""),
-                password=data.get("password", ""),
+            self.client.signup(
+                user_id=str(data.get("user_id") or ""),
+                public_name=str(data.get("public_name") or ""),
+                password=str(data.get("password") or ""),
             )
-            return JsonResponse({"ok": ok})
+            return JsonResponse({"ok": True}, status=201)
+
         except NexomError as e:
-            return JsonResponse({"error": e.code}, status=401)
+            return JsonResponse({"ok": False, "error": e.code}, status=_status_for_auth_error(e.code))
+
         except Exception:
-            return JsonResponse({"error": "Internal Server Error"}, status=401)
+            return JsonResponse({"ok": False, "error": "InternalError"}, status=500)
+        
+
+class LogoutPage(Path):
+    def __init__(self, path: str, auth_server: str) -> None:
+        super().__init__(path, self._handler, "LogoutPage")
+        self.client = AuthClient(auth_server)
+
+    def _handler(self, req: Request, args: dict) -> Redirect | ErrorResponse:
+        if req.method != "GET":
+            return ErrorResponse(405, "Please make a GET request")
+
+        token = req.cookie.get(KEY_NAME) if req.cookie else None
+
+        redirect_url = req.headers.get("referer") or "/"
+        if not redirect_url.startswith("/"):
+            redirect_url = "/"
+
+        if token:
+            try:
+                self.client.logout(token=token)
+            except NexomError as e:
+                return ErrorResponse(500, e.code)
+            except Exception as e:
+                return ErrorResponse(500, str(e))
+
+        set_cookie = Cookie(KEY_NAME, "", Path="/", MaxAge=0)
+        return Redirect(redirect_url, cookie=str(set_cookie))
+

{nexom-1.0.4.dist-info → nexom-1.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Nexom
-Version: 1.0.4
+Version: 1.0.5
 Summary: Lightweight Python Web Framework (WSGI)
 Author: TouriAida
 License: MIT License
@@ -191,4 +191,4 @@ sudo systemd start banana-project@banana2
 sudo systemd start banana-project@banana3
 ```
 
-2026 1/25
+2026 1/27

{nexom-1.0.4.dist-info → nexom-1.0.5.dist-info}/RECORD

@@ -1,56 +1,57 @@
 nexom/__init__.py,sha256=V6US1i4gO-EOWsoHEgxzwbkrLPnzPhSn6TYue3uVsBA,367
 nexom/__main__.py,sha256=VKT7WSe6552_mzwLwJqa55tfag5Olr28eYVhVnf9kWY,6196
-nexom/app/__init__.py,sha256=meq2MgHUNgcjVn4V3dzm52EIlrGeIdNS-09sGLhita4,1090
-nexom/app/auth.py,sha256=iwaFIXjiwjkVFRGtDFUoQ2dK9aUeP-uxQF5xwd4vCTE,10020
+nexom/app/__init__.py,sha256=DgKTx8GtuRJkiRwBKmLhCLlf3l19zTWwXEmeRPznzlM,1089
+nexom/app/auth.py,sha256=vpu_rb35s4z9CZK3tNvgNFHiD8KFv8zs3uUsOHFyZD0,13209
 nexom/app/cookie.py,sha256=VCau9i8z6QlkaE_s8gKZXjcFtrV2bX1T4xssNtpJ5A0,2026
-nexom/app/db.py,sha256=gUJOlUJqDaHCYU5JkzGV_wf_OTvFlqDWvM7vJDNVulY,2816
+nexom/app/db.py,sha256=fl3SrNPOltTT3d5PqjISdS4u7SXEMRqLPotbJE0FXsY,3320
 nexom/app/http_status_codes.py,sha256=R4ka3n4rijqvfahF5n5kS-Qrg8bZSsrvF8lGnpKWAgY,1934
 nexom/app/middleware.py,sha256=7bHGtEem92QhgULOvTFDFlZ4K719CQgu9RKj1g7XOW8,1429
-nexom/app/path.py,sha256=o7HUr_p4oRLhXo7YAD8jqgXVkrrRW6KUoY2unAI7s1Y,6007
+nexom/app/path.py,sha256=k6Kzwf1xRHNPgqxwLwFQMAO3VqsGZNQ8RzjRfVKtCH0,6006
 nexom/app/request.py,sha256=4dvcfrrS9gKzVFtoizRw5eFvP7eHRXsavh21zEHXX2U,8867
-nexom/app/response.py,sha256=qmLm8wCcexLjUIj8DaOBxt0cK3_J4Rn6DuWn6wkE7cE,4299
-nexom/app/template.py,sha256=4V4YSaZ92Gq76lj6HgPaF7obvvzmM42Gh8f0e5oAIzM,3587
+nexom/app/response.py,sha256=a5297XDlDkoArymss-oxLTJ1a0I-MNjFUvFel0CQnN8,4483
+nexom/app/template.py,sha256=sGaO39EPrPs-K_4gUxdhtEOyjzYyEPTUzpBzJqFP-_Y,3650
 nexom/app/user.py,sha256=6KLLsb08Ma39CnLBbq5y290o33tfxtHFWu9lu1kT0NM,623
 nexom/assets/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nexom/assets/app/config.py,sha256=Ltpj40PE1--s0eRPTHiJNFqG8pFA7Lb6x02C39kwoYA,765
 nexom/assets/app/gunicorn.conf.py,sha256=0kAQ7ddfpnPpqLAZxIXqYPF6EuUzkjIC9aOTqfxn6rc,149
-nexom/assets/app/router.py,sha256=6VplXBlyvdsN144zy165sA3NZuvguMy6oO-mR0ebM2U,320
+nexom/assets/app/router.py,sha256=_agfa_NFOxpCzGkCzDZIR0x5EkTn4wyg_ROBUiZouGU,318
 nexom/assets/app/wsgi.py,sha256=o-GtCPPHKiavTOmr8qxqCY95iUFU_IvRmwLqLK3ecwU,1743
-nexom/assets/app/__pycache__/__init__.cpython-313.pyc,sha256=4WFkUYDuBZdpaXyXHrp3g5nTjc1XtExGRIyTPUyCFGM,195
+nexom/assets/app/__pycache__/__init__.cpython-313.pyc,sha256=5qiNgiTI26RZcyxr09EKigB5YYYBSqRJxyq8LCVWR14,195
 nexom/assets/app/pages/__init__.py,sha256=DlX9iwM39JaMKfzK4mbgjE2uVMX3ax0wd2mCVnpg0b4,61
-nexom/assets/app/pages/_templates.py,sha256=3lz42xOzHodOhFnujMhOuMX6IBJjMXGQKmOZ8SVhgE4,190
+nexom/assets/app/pages/_templates.py,sha256=1c8KUwfMHkoo7S4neFbYjs5ixK44evn-uFVAFR9Y834,213
 nexom/assets/app/pages/default.py,sha256=Kmm8ud8Uh1BAIba28Zp3Wz6WsTTx7cQ6-t6RMkuL9qU,257
 nexom/assets/app/pages/document.py,sha256=JI9ChJ2BTXFyOiCnm4PRUnOY1xaLHeOI1ZEqHMQ7zPI,245
-nexom/assets/app/pages/__pycache__/__init__.cpython-313.pyc,sha256=p0AGZjUdMtwO8e3cnmA3_R0rz1G5UFZNvVNICSHK8g0,273
+nexom/assets/app/pages/__pycache__/__init__.cpython-313.pyc,sha256=iQGBtjKUOXVUrrp1qQIfoj44NL_I2H_YGdL-RJ7gtC8,273
 nexom/assets/app/static/dog.jpeg,sha256=qGEhcg48FxRLRISzbmXvw1qvfbdluC_ukM8ZrHg7_XE,6559
-nexom/assets/app/static/style.css,sha256=mDKNWue0uRLdWB0w1RsMSn6h3tHsuTVLuk3xOOJl7X8,566
+nexom/assets/app/static/github.png,sha256=DUwjX--e_sVBdKfABfwP4M4tY9NcIYmKtRSFhxETl6k,6223
+nexom/assets/app/static/style.css,sha256=vPDDlaWkw3Qow1yF8lSmXMTIzAQU5VrVqfoTijj6AH0,11883
 nexom/assets/app/templates/base.html,sha256=RVW_63gA1sr7pqNkfB6Djk5an_VFpowahDIHGjfV-Wk,349
-nexom/assets/app/templates/default.html,sha256=EKG9NTYkXngdCiDodSI1Kuic_ZwVwdeRc3VLq6fX5UI,167
-nexom/assets/app/templates/document.html,sha256=16ClimpeqhLnXFNa8nMdMOlXUu8JOw7XxfpjU9DdIFs,6243
-nexom/assets/app/templates/footer.html,sha256=1NZbbarU-CQhs1OPs2MTzhnWu0h7YYiEKDIP_cgIl9I,98
-nexom/assets/app/templates/header.html,sha256=VgkCtCVE1J-eGEYvbBgWSUU-QauEf6xuvweOE-84U9c,75
+nexom/assets/app/templates/default.html,sha256=JTNSlSkRAXPLNoQd2ZlVwyvZ-Ypi0IFZphkYQfsWo1E,311
+nexom/assets/app/templates/document.html,sha256=QocJuK2CHl9NxGLbuQKmMICDwaV9Na_0ZGxluwmaorI,5706
+nexom/assets/app/templates/footer.html,sha256=mh0mm4f1nHIGV3cjDFFi8gpYwEpgk5Jqpbjokh9DPbA,94
+nexom/assets/app/templates/header.html,sha256=BQ4p0GOsx4WxusyjUNfdq1Lk1qlcmCoaYtgI288F5IE,345
 nexom/assets/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nexom/assets/auth/config.py,sha256=YgwEDhTsaxOxaOhUVSw6meay8Nc50A3GXafzmSdnhWo,804
 nexom/assets/auth/gunicorn.conf.py,sha256=PbCWHG-A2OCfL71G04XS9xr78aH_gg-1UpH2tJhTWUk,141
 nexom/assets/auth/wsgi.py,sha256=sMTj_ei0w1skoR_-xBNpveGAhRKWANfd1UaAItXQFO8,1698
-nexom/assets/auth/__pycache__/__init__.cpython-313.pyc,sha256=dRCVl1pZMRjC5NpwgaW4uanJl9l4J8u4gcLhOzVXOEk,196
-nexom/assets/auth_page/login.html,sha256=dMF098lsctmpDWHZL_wSDcqaBSLquiSXzcBZrtc5Phg,3536
-nexom/assets/auth_page/signup.html,sha256=1fjw5R02EDFk2pyxqaa7eDU83uKegnXAOVaBLgbfOd0,4014
+nexom/assets/auth/__pycache__/__init__.cpython-313.pyc,sha256=u5wF3QOdS5tOChvwNUS4T8fKJzNlX0__7QsHvXjkr0Q,196
+nexom/assets/auth_page/login.html,sha256=qxw8uxW_WnQn9SMOUlrkwSbe4NFmFG6qK2erjzYrS2U,7096
+nexom/assets/auth_page/signup.html,sha256=Iax5xyrfVRwY1_c_Welc4C44s3cLYslz7uDDSQKk588,9476
 nexom/assets/error_page/error.html,sha256=JFi47UVxcxef_TTt1hDOuo93_45uSWCfixOJCUQVTs4,1230
 nexom/assets/gateway/apache_app.conf,sha256=_QeZ0BqpuZaJfBONurNTW1FqJ7-PmunPrfbzAJRP3Qg,370
 nexom/assets/gateway/nginx_app.conf,sha256=PaHRPGjJEyNiUU9OZiXS9HQhGwSe1oosSZp-6lnlQO0,521
 nexom/buildTools/__init__.py,sha256=FbaFEMRjOKHNqNR-KuEatZjwPhmJf1CDZmR2hSH7YGk,19
-nexom/buildTools/build.py,sha256=DSmHUIHNrXCdLUogmfHvnl9PtO1QOfQyRU15F-HLztk,10782
+nexom/buildTools/build.py,sha256=JJxb5tHBW5WVSx2GWgu4uszP8FUKVSkDMsooFJYg2Vk,10796
 nexom/buildTools/run.py,sha256=HpSlkrNPFW961qgHjzedjGogdIYRQddhL95g3PcbM5s,5384
 nexom/core/__init__.py,sha256=_ohRDLTerW9deZyh0WEp-ZB2LExkLvM9f26MhEdcp8g,52
-nexom/core/error.py,sha256=1xwAynes65OEjhO8ZFC2lm_u_LGOAm4-nfGK-IedKOo,6199
+nexom/core/error.py,sha256=tGQer5P-d_-F-_maAtOgveZxm26m0xt_SeMv2ZxT5KA,9332
 nexom/core/log.py,sha256=q0FYz1-kkTUHvNkEBW5V1zvUv1phMYchOqwAfUXGHQI,3016
 nexom/core/object_html_render.py,sha256=4yT3Aihia4oG62gr1rqZd757wEXsu78mTCCpjpVE7JM,7027
 nexom/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nexom/templates/auth.py,sha256=eWThgPR4E7y7YFcQ6rFZaO6yPKGL2zIbBC4SuzQ5M44,2332
-nexom-1.0.4.dist-info/licenses/LICENSE,sha256=YbcHyxYLJ5jePeMS_NXpR9yiZjP5skhn32LvcKeknJw,1066
-nexom-1.0.4.dist-info/METADATA,sha256=RZkujq6lxxQlzFcGmuMVmk7HeEXVWIsxo04yEYjOrJ4,5886
-nexom-1.0.4.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-nexom-1.0.4.dist-info/entry_points.txt,sha256=0r1egKZmF1MUo25AKPt-2d55sk5Q_EIBOQwD3JC8RgI,46
-nexom-1.0.4.dist-info/top_level.txt,sha256=mTyUruscL3rqXvYJRo8KGwDM6PWXRzgf4CamLr8LSX4,6
-nexom-1.0.4.dist-info/RECORD,,
+nexom/templates/auth.py,sha256=Fh9nDCJZNIC8JE5_cmpgA6daIBtumVB4x0mRgme100o,4593
+nexom-1.0.5.dist-info/licenses/LICENSE,sha256=YbcHyxYLJ5jePeMS_NXpR9yiZjP5skhn32LvcKeknJw,1066
+nexom-1.0.5.dist-info/METADATA,sha256=D2eIXFEDHIff2s6DYOthznV5MFVCNlgcM-IXdgzEo60,5886
+nexom-1.0.5.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+nexom-1.0.5.dist-info/entry_points.txt,sha256=0r1egKZmF1MUo25AKPt-2d55sk5Q_EIBOQwD3JC8RgI,46
+nexom-1.0.5.dist-info/top_level.txt,sha256=mTyUruscL3rqXvYJRo8KGwDM6PWXRzgf4CamLr8LSX4,6
+nexom-1.0.5.dist-info/RECORD,,