diff --git a/WAKe_server/middleware.py b/WAKe_server/middleware.py deleted file mode 100644 index ee26acc..0000000 --- a/WAKe_server/middleware.py +++ /dev/null @@ -1,33 +0,0 @@ -from django.core.handlers.wsgi import WSGIRequest -from django.utils.deprecation import MiddlewareMixin -from rest_framework.response import Response -from rest_framework_simplejwt.tokens import SlidingToken - - -class CustomAuthenticationMiddleware(MiddlewareMixin): - - def set_jwt_cookie(self, request: WSGIRequest, response: Response): - if request.user.is_authenticated: - jwt = SlidingToken.for_user(request.user) - origin = request.headers.get('origin') - is_local = False if origin is None or 'localhost' not in origin else True - domain = None if is_local else '.zps.kr' - response.set_cookie( - 'jwt', - str(jwt), - max_age=3600 * 24 * 3, - domain=domain, - secure=(not is_local), - httponly=True, - samesite=False, - ) - elif request.COOKIES.get('jwt', None) is not None: - response.set_cookie( - 'jwt', max_age=0, domain='.zps.kr', secure=True, - expires='Thu, 01 Jan 1970 00:00:00 GMT', samesite=False, - ) - - return response - - def process_response(self, request, response): - return self.set_jwt_cookie(request, response) diff --git a/WAKe_server/settings/base.py b/WAKe_server/settings/base.py index f3fdfca..a968d68 100644 --- a/WAKe_server/settings/base.py +++ b/WAKe_server/settings/base.py @@ -66,7 +66,6 @@ "django.middleware.common.CommonMiddleware", "django.middleware.csrf.CsrfViewMiddleware", "django.contrib.auth.middleware.AuthenticationMiddleware", - "WAKe_server.middleware.CustomAuthenticationMiddleware", "django.contrib.messages.middleware.MessageMiddleware", "django.middleware.clickjacking.XFrameOptionsMiddleware", "allauth.account.middleware.AccountMiddleware", diff --git a/social_app/views.py b/social_app/views.py index 389d63e..b5f7f3e 100644 --- a/social_app/views.py +++ b/social_app/views.py @@ -18,7 +18,7 @@ from allauth.socialaccount.providers.kakao import views as kakao_view from allauth.socialaccount.providers.oauth2.client import OAuth2Client from accounts.models import User, CommonProfile -from accounts.serializers import UserSerializer, LogoutSerializer, KakaoCallbackSerializer +from accounts.serializers import LogoutSerializer, KakaoCallbackSerializer from accounts.utils import token_serializer KAKAO_TOKEN_API = "https://kauth.kakao.com/oauth/token" @@ -91,26 +91,7 @@ def callback(self, request: Request): user = User.objects.get(email=email) token = token_serializer(user) access_token = token['access'] - refresh_token = token['refresh'] - res = redirect(LOGIN_REDIRECT_URL+f'?access={access_token}&refresh={refresh_token}') - res.set_cookie( - 'access', - access_token, - max_age=3600 * 24 * 3, - domain='.zps.kr', - secure=True, - httponly=True, - samesite=False, - ) - res.set_cookie( - 'refresh', - refresh_token, - max_age=3600 * 24 * 3, - domain='.zps.kr', - secure=True, - httponly=True, - samesite=False, - ) + res = redirect(LOGIN_REDIRECT_URL+f'?t={access_token}') return res except User.DoesNotExist: @@ -132,26 +113,7 @@ def callback(self, request: Request): user = User.objects.get(email=email) token = token_serializer(user) access_token = token['access'] - refresh_token = token['refresh'] - res = redirect(LOGIN_REDIRECT_URL+f'?access={access_token}&refresh={refresh_token}') - res.set_cookie( - 'access', - access_token, - max_age=3600 * 24 * 3, - domain='.zps.kr', - secure=True, - httponly=True, - samesite=False, - ) - res.set_cookie( - 'refresh', - refresh_token, - max_age=3600 * 24 * 3, - domain='.zps.kr', - secure=True, - httponly=True, - samesite=False, - ) + res = redirect(LOGIN_REDIRECT_URL + f'?t={access_token}') return res except Exception as e: return Response(status=status.HTTP_400_BAD_REQUEST) @@ -163,5 +125,5 @@ class KaKaoLogin(SocialLoginView): client_class = OAuth2Client def post(self, request, *args, **kwargs): - print(request.POST) - return super().post(request, *args, **kwargs) \ No newline at end of file + res = super().post(request, *args, **kwargs) + return res \ No newline at end of file