[v1.2.2] Merge pull request #35 from KageRyo/develop

Update to RyoURL v1.2.2

RyoURL/shortURL/api.py

@@ -4,8 +4,8 @@
 
 from pydantic import AnyUrl
 
-from .apis.auth import auth_router, JWTAuth
-from .apis.short import url_router
+from .apis.auth_api import auth_router, JWTAuth
+from .apis.short_api import url_router
 
 # 自定義 JSON 編碼器和渲染器
 class CustomJSONEncoder(DjangoJSONEncoder):

RyoURL/shortURL/apis/__init__.py

@@ -1,2 +1,2 @@
-from .auth import auth_router
-from .short import url_router
+from .auth_api import auth_router
+from .short_api import url_router

RyoURL/shortURL/apis/short.py → RyoURL/shortURL/apis/short_api.py

@@ -27,23 +27,27 @@ class UrlSchema(Schema):
 class ErrorSchema(Schema):
     message: str
 
+# 身分驗證的函式
+def check_auth(request, required_type=None):
+    if not hasattr(request, 'auth'):
+        request.auth = None
+    if not request.auth or (required_type is not None and request.auth.user_type != required_type):
+        return False
+    return True
+
 # 權限檢查裝飾器
 def user_auth_required(func):
     @wraps(func)
     def wrapper(request, *args, **kwargs):
-        if not hasattr(request, 'auth'):
-            request.auth = None
-        if not request.auth:
+        if not check_auth(request):
             return api.create_response(request, {"message": "您必須登入才能執行此操作。"}, status=403)
         return func(request, *args, **kwargs)
     return wrapper
 
 def admin_auth_required(func):
     @wraps(func)
     def wrapper(request, *args, **kwargs):
-        if not hasattr(request, 'auth'):
-            request.auth = None
-        if not request.auth or request.auth.user_type != 2:
+        if not check_auth(request, required_type=2):
             return api.create_response(request, {"message": "您必須是管理員才能執行此操作。"}, status=403)
         return func(request, *args, **kwargs)
     return wrapper

RyoURL/shortURL/views.py

@@ -6,7 +6,6 @@
 from django.utils import timezone
 from django.http import HttpResponse, HttpResponseRedirect
 from django.db.models import F
-from typing import Optional
 
 from .models import Url
 

requirements.txt

@@ -9,10 +9,6 @@ djangorestframework-simplejwt
 python-dotenv
 requests
 
-# 測試
-pytest
-pytest-django
-
 # 監控與除錯
 sentry-sdk
 django-silk