Merge dev to main

accounts/serializers.py

@@ -27,7 +27,7 @@ class KakaoTokenSerializer(serializers.Serializer):
 class UserInfoUpdateSerializer(serializers.ModelSerializer):
     class Meta:
         model = User
-        fields = ("username", "position", "profile_image")
+        fields = ("id", "username", "position", "profile_image")
 
 
 class GetUserInfoSerializer(serializers.ModelSerializer):

accounts/urls.py

@@ -3,13 +3,12 @@
 
 # TODO swagger에 뜨는 api 관리
 urlpatterns = [
-    path("kakao/login/", views.kakao_login, name="kakao_login"),
-    path("kakao/callback/", views.kakao_callback, name="kakao_callback"),
+    path("/kakao", views.kakao_login, name="kakao_login"),
     path(
-        "kakao/login/finish/",
+        "/kakao/login",
         views.KakaoLoginView.as_view(),
         name="kakao_login_todjango",
     ),
-    path("update/", views.UpdateUserInfoView.as_view(), name="update_user_info"),
-    path("user/me", views.GetUserInfoView.as_view(), name="get_user_info"),
+    path("/update", views.UpdateUserInfoView.as_view(), name="update_user_info"),
+    path("/user/me", views.GetUserInfoView.as_view(), name="get_user_info"),
 ]

accounts/views.py

@@ -2,32 +2,26 @@
 
 import environ
 from pathlib import Path
-from django.db import transaction
 from drf_spectacular.utils import (
     extend_schema,
     OpenApiResponse,
     OpenApiExample,
     OpenApiParameter,
 )
-from django.http import JsonResponse
+from rest_framework_simplejwt.tokens import RefreshToken
 
 import requests
 from django.shortcuts import redirect
-from json.decoder import JSONDecodeError
-from rest_framework.decorators import api_view, permission_classes
+from django.contrib.auth import get_user_model
 from rest_framework.permissions import AllowAny, IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.views import APIView
 from rest_framework import status
 
-from allauth.socialaccount.providers.oauth2.client import OAuth2Client
 from dj_rest_auth.registration.views import SocialLoginView
-from allauth.socialaccount.providers.kakao import views as kakao_view
-from .models import CustomUser
 from .serializers import (
     UserInfoUpdateSerializer,
     GetUserInfoSerializer,
-    KakaoTokenSerializer,
 )
 import logging
 
@@ -42,148 +36,122 @@
 env.read_env(env_file)
 
 BASE_URL = env("BASE_URL")
-KAKAO_CALLBACK_URI = BASE_URL + "accounts/kakao/callback/"
+# KAKAO_CALLBACK_URI = BASE_URL + "accounts/kakao/callback/"
+KAKAO_CALLBACK_URI = "http://localhost:5173/accounts/kakao/callback"
 # KAKAO_CALLBACK_URI = "http://api.resumai.kr/accounts/kakao/callback/"
 REST_API_KEY = env("KAKAO_REST_API_KEY")
 CLIENT_SECRET = env("KAKAO_CLIENT_SECRET_KEY")
 
+User = get_user_model()
 
-@extend_schema(
-    summary="카카오 로그인",
-    description="카카오 로그인 페이지로 리다이렉트하여, 정보를 입력하면 카카오 **access_token, code**를 반환합니다.",
-    responses={200: KakaoTokenSerializer},
-)
-@api_view(["GET"])
-@permission_classes([AllowAny])
+
+@extend_schema(exclude=True)
 def kakao_login(request):
-    return redirect(
+    logger.fatal(
         f"https://kauth.kakao.com/oauth/authorize?client_id={REST_API_KEY}&redirect_uri={KAKAO_CALLBACK_URI}&response_type=code"
     )
-
-
-@permission_classes([AllowAny])
-def kakao_callback(request):
-    code = request.GET.get("code")
-
-    # Access Token Request
-    token_req = requests.get(
-        f"https://kauth.kakao.com/oauth/token?grant_type=authorization_code&client_id={REST_API_KEY}&client_secret={CLIENT_SECRET}&redirect_uri={KAKAO_CALLBACK_URI}&code={code}"
+    return redirect(
+        f"https://kauth.kakao.com/oauth/authorize?client_id={REST_API_KEY}&redirect_uri={KAKAO_CALLBACK_URI}&response_type=code"
     )
 
-    token_req_json = token_req.json()
 
-    error = token_req_json.get("error")
-    if error is not None:
-        raise JSONDecodeError(error)
+class KakaoLoginView(APIView):
 
-    access_token = token_req_json.get("access_token")
-
-    # Email Request
-    profile_request = requests.get(
-        "https://kapi.kakao.com/v2/user/me",
-        headers={"Authorization": f"Bearer {access_token}"},
-    )
-    profile_data = profile_request.json()
-
-    kakao_oid = profile_data.get("id")
-    kakao_account = profile_data.get("kakao_account")
-    username = kakao_account["profile"]["nickname"]
-    profile_image_url = kakao_account["profile"]["profile_image_url"]
-    email = kakao_account.get("email")
-
-    data = {"access_token": access_token, "code": code}
-    # TODO 유저 프로필 이미지 저장하도록
-    return JsonResponse(data)
-
-    # try:
-    #     user = CustomUser.objects.get(email=email)
-    #     # 유저가 존재하는 경우
-    #     logger.warning(f"user: {user}")
-    #     logger.warning("유저 존재")
-    #     accept = requests.post("https://api.resumai.kr/accounts/kakao/login/finish/", data=data)
-    #     logger.warning(f"accept: {accept}")
-    #     logger.warning(f"accept.reason: {accept.reason}")
-    #     logger.warning(f"accept.history: {accept.history}")
-    #     logger.warning(accept.content)
-    #     accept_status = accept.status_code
-    #     logger.warning(accept_status)
-    #
-    #     if accept_status != 200:
-    #         return Response({"err_msg": "failed to signin"}, status=accept_status)
-    #
-    #     accept_json = accept.json()
-    #     logger.warning(f"accept_json, {accept_json}")
-    #     # key 이름 변경
-    #     accept_json["accessToken"] = accept_json.pop("access")
-    #     accept_json["refreshToken"] = accept_json.pop("refresh")
-    #     accept_json["userProfile"] = accept_json.pop("user")
-    #     accept_json["userProfile"]["id"] = accept_json["userProfile"].pop("pk")
-    #     return JsonResponse(accept_json)
-    #
-    # except CustomUser.DoesNotExist:
-    #     # 기존에 가입된 유저가 없으면 새로 가입
-    #     logger.warning("유저 미존재")
-    #     accept = requests.post("http://localhost:8000/accounts/kakao/login/finish/", data=data)
-    #     logger.warning(f"accept: {accept}")
-    #     logger.warning(f"accept.reason: {accept.reason}")
-    #     logger.warning(f"accept.request: {accept.request}")
-    #     logger.warning(f"accept.raw: {accept.raw}")
-    #     accept_status = accept.status_code
-    #     logger.warning(accept_status)
-    #     if accept_status != 200:
-    #         return Response({"err_msg": "failed to signup"}, status=accept_status)
-    #
-    #     # user의 pk, email, first name, last name과 Access Token, Refresh token 가져옴
-    #     accept_json = accept.json()
-    #     logger.warning(f"accept_json, {accept_json}")
-    #     # key 이름 변경
-    #     accept_json["accessToken"] = accept_json.pop("access")
-    #     accept_json["refreshToken"] = accept_json.pop("refresh")
-    #     accept_json["userProfile"] = accept_json.pop("user")
-    #     accept_json["userProfile"]["id"] = accept_json["userProfile"].pop("pk")
-    #     return JsonResponse(accept_json)
-
-
-# @extend_schema(exclude=True)
-@extend_schema(
-    summary="카카오 로그인 마무리",
-    description="access token, code를 post 요청으로 보내면 access token, 유저 정보를 반환합니다. **(id_token은 불필요합니다.)**",
-    parameters=[
-        OpenApiParameter(
-            name="access_token",
-            type=str,
-            description="발급받은 카카오의 access_token 입니다.",
-        ),
-        OpenApiParameter(
-            name="code", type=str, description="발급받은 카카오의 code 입니다."
-        ),
-    ],
-    request={
-        "application/json": {
-            "type": "object",
-            "properties": {
-                "access_token": {"type": "string"},
-                "code": {"type": "string"},
+    @extend_schema(
+        summary="카카오 로그인 마무리",
+        description="code (인가 코드)를 post 요청으로 보내면 access token, 유저 정보를 반환합니다. **(id_token은 불필요합니다.)**",
+        request={
+            "application/json": {
+                "type": "object",
+                "properties": {
+                    "code": {"type": "string"},
+                },
             },
         },
-    },
-    examples=[
-        OpenApiExample(
-            response_only=True,
-            summary="Response Body Example입니다.",
-            name="success_example",
-            value={
-                "access": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbl90eXBlI",
-                "refresh": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbl90eXBl",
-                "user": {"pk": 6, "email": "[email protected]"},
+        examples=[
+            OpenApiExample(
+                response_only=True,
+                summary="Response Body Example입니다.",
+                name="success_example",
+                value={
+                    "access_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b",
+                    "refresh_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0",
+                    "user_info": {
+                        "id": 6,
+                        "email": "[email protected]",
+                        "username": "장영준",
+                        "profile_image": "https://k.kakaocdn.net/dn/cI6qGf/btsCovDyklV/ydaQojxohw6VnLxtcdKwuk/img_640x640.jpg",
+                        "is_created": False,
+                    },
+                },
+            ),
+        ],
+    )
+    def post(self, request, *args, **kwargs):
+        code = request.data.get("code")
+
+        if not code:
+            return Response(
+                {"error": "Code is required"}, status=status.HTTP_400_BAD_REQUEST
+            )
+
+        # 카카오 인가코드를 사용해 access_token 획득
+        token_res = requests.get(
+            f"https://kauth.kakao.com/oauth/token?grant_type=authorization_code&client_id={REST_API_KEY}&client_secret={CLIENT_SECRET}&redirect_uri={KAKAO_CALLBACK_URI}&code={code}"
+        )
+        logger.fatal(token_res)
+
+        if token_res.status_code != 200:
+            logger.fatal(token_res.json())
+            return Response(
+                {"error": "Failed to obtain access token"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        token_json = token_res.json()
+        access_token = token_json.get("access_token")
+
+        # 카카오 access_token으로부터 사용자 정보 획득
+        headers = {"Authorization": f"Bearer {access_token}"}
+        profile_res = requests.get("https://kapi.kakao.com/v2/user/me", headers=headers)
+
+        if profile_res.status_code != 200:
+            return Response(
+                {"error": "Failed to obtain user information"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        profile_json = profile_res.json()
+
+        kakao_oid = profile_json.get("id")
+        nickname = profile_json.get("properties")["nickname"]
+        profile_image = profile_json.get("properties")["profile_image"]
+        email = profile_json.get("kakao_account")["email"]
+
+        user, created = User.objects.get_or_create(
+            email=email,
+            defaults={
+                "username": f"{nickname}",
+                "kakao_oid": kakao_oid,
+                "profile_image": f"{profile_image}",
             },
-        ),
-    ],
-)
-class KakaoLoginView(SocialLoginView):
-    adapter_class = kakao_view.KakaoOAuth2Adapter
-    client_class = OAuth2Client
-    callback_url = KAKAO_CALLBACK_URI
+        )
+
+        # 사용자에 대한 토큰 생성
+        refresh = RefreshToken.for_user(user)
+        data = {
+            "access_token": str(refresh.access_token),
+            "refresh_token": str(refresh),
+            "user_info": {
+                "id": user.id,
+                "email": user.email,
+                "username": user.username,
+                "profile_image": user.profile_image,
+                "is_created": created,
+            },
+        }
+
+        return Response(data, status=status.HTTP_200_OK)
 
 
 class UpdateUserInfoView(APIView):

config/docker/entrypoint.prod.sh

@@ -1,6 +1,8 @@
 #!/bin/sh
 
-python manage.py migrate --noinput
+python manage.py makemigrations --no-input
+
+python manage.py migrate --no-input
 
 python manage.py collectstatic --no-input
 

docker-compose.yml

@@ -19,7 +19,7 @@ services:
     build:
       context: ./
       dockerfile: Dockerfile
-    command: sh -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000 --settings=resumai.settings.dev"
+    command: sh -c "python manage.py makemigrations && python manage.py migrate && python manage.py runserver 0.0.0.0:8000 --settings=resumai.settings.dev"
     environment:
       DJANGO_ENV: development
     env_file:

memos/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

memos/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class MemoConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "memos"

memos/migrations/0001_initial.py

@@ -0,0 +1,42 @@
+# Generated by Django 5.0.3 on 2024-04-01 17:21
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Memo",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("title", models.CharField(max_length=255)),
+                ("content", models.TextField()),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+        ),
+    ]