🔀: main과 develop 브랜치 병합

GHJM/urls.py

@@ -27,4 +27,3 @@
     path('bucket-list/', include('bucket_list.urls')),
     path('monthly-goal/', include('monthly_goal.urls')),
 ]
-

accounts/middleware.py

@@ -37,7 +37,10 @@ def __call__(self, request):
             id = payload.get('user_id')
 
             # 추출된 사용자 식별 정보를 사용하여 사용자를 가져옴.
-            user = CustomUser.objects.get(id=id)
+            try:
+                user = CustomUser.objects.get(id=id)
+            except CustomUser.DoesNotExist:
+                return JsonResponse({'error': '해당 id에 대한 user 객체가 존재하지 않습니다.'}, status=404)
 
             # 인증이 성공하면 요청에 사용자를 할당.
             request.user = user
@@ -61,6 +64,3 @@ def check_path_to_exclude_middleware(self, path):
             if each_path in path:
                 return True
         return False
-
-
-

accounts/urls.py

@@ -8,6 +8,7 @@
 urlpatterns = [
     path('kakao/login/', views.kakao_login),
     path('kakao/login/callback/', views.KakaoCallbackView.as_view()),
-    path('token/refresh/', views.reissue_token),
-    path('logout/', views.logout)
+    path('reissue-token/', views.reissue_token),
+    path('logout/', views.logout),
+    path('my/', views.delete_user)
 ]

accounts/views.py

@@ -9,6 +9,7 @@
 from jwt import DecodeError, ExpiredSignatureError, InvalidTokenError
 from .jwt import generate_access_token, generate_refresh_token, decode_token, get_token_exp,save_refresh_token, get_token_exp_in_str_format
 from GHJM.json_response_setting import JsonResponse
+from django.views.decorators.http import require_http_methods
 import requests
 
 REFRESH_TOKEN = 'refresh-token'
@@ -34,7 +35,7 @@ def get(self, request):
         token_data = token_response.json()
 
         if 'error' in token_data:
-            return JsonResponse({'error': token_data['error']}, status=status.HTTP_400_BAD_REQUEST)
+            return JsonResponse({'error': token_data['error']}, status=400)
 
         access_token = token_data.get("access_token")
 
@@ -78,7 +79,7 @@ def get(self, request):
         return JsonResponse(response_data)
 
 
-
+require_http_methods(['POST'])
 def reissue_token(request):
     refresh_token = request.headers.get(REFRESH_TOKEN)
 
@@ -110,6 +111,7 @@ def reissue_token(request):
         return JsonResponse(response_data)
 
 
+@require_http_methods(['DELETE'])
 # user가 로그아웃 버튼을 직접 클릭 했을 경우    
 def logout(request):
     refresh_token = request.headers.get(REFRESH_TOKEN)
@@ -130,3 +132,11 @@ def logout(request):
     cache.delete(user_id)
 
     return JsonResponse({'message': '로그아웃 되었습니다.'}, status=204)
+
+
+@require_http_methods(['DELETE'])
+def delete_user(request):
+    user = request.user
+    user.delete()
+
+    return JsonResponse({'Success': '회원탈퇴가 완료되었습니다.'})