Merge pull request #7 from Team-MailedIt/feature-login

feat: fix app name account->member

member/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class MemberConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'member'

member/managers.py

@@ -0,0 +1,45 @@
+from django.contrib.auth.models import BaseUserManager
+
+
+class UserManager(BaseUserManager):
+    def _create_user(self, email, username, password, **extra_fields):
+
+        """
+
+        Create and save a user with the given username, email, and password.
+
+        """
+
+        email = self.normalize_email(email)
+
+        username = self.model.normalize_username(username)
+
+        user = self.model(email=email, username=username, **extra_fields)
+
+        user.set_password(password)
+
+        user.save(using=self._db)
+
+        return user
+
+    def create_user(self, email, username, password=None, **extra_fields):
+
+        extra_fields.setdefault("is_staff", False)
+
+        extra_fields.setdefault("is_superuser", False)
+
+        return self._create_user(email, username, password, **extra_fields)
+
+    def create_superuser(self, email, username, password, **extra_fields):
+
+        extra_fields.setdefault("is_staff", True)
+
+        extra_fields.setdefault("is_superuser", True)
+
+        if extra_fields.get("is_staff") is not True:
+            raise ValueError("Superuser must have is_staff=True.")
+
+        if extra_fields.get("is_superuser") is not True:
+            raise ValueError("Superuser must have is_superuser=True.")
+
+        return self._create_user(email, username, password, **extra_fields)

account/migrations/0001_initial.py → member/migrations/0001_initial.py

@@ -1,8 +1,9 @@
-# Generated by Django 3.0.8 on 2021-11-25 14:25
+# Generated by Django 3.0.8 on 2021-12-22 19:40
 
-import django.contrib.auth.models
+from django.conf import settings
 import django.contrib.auth.validators
 from django.db import migrations, models
+import django.db.models.deletion
 import django.utils.timezone
 
 
@@ -29,7 +30,7 @@ class Migration(migrations.Migration):
                 ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
                 ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
                 ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
-                ('part', models.CharField(choices=[('FE', '프론트엔드'), ('BE', '백엔드')], max_length=2)),
+                ('part', models.CharField(choices=[('frontend', 'frontend'), ('backend', 'backend')], max_length=10)),
                 ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')),
                 ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')),
             ],
@@ -38,8 +39,21 @@ class Migration(migrations.Migration):
                 'verbose_name_plural': 'users',
                 'abstract': False,
             },
-            managers=[
-                ('objects', django.contrib.auth.models.UserManager()),
+        ),
+        migrations.CreateModel(
+            name='Candidate',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=10)),
+                ('part', models.CharField(choices=[('frontend', 'frontend'), ('backend', 'backend')], max_length=10)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Vote',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('vote_candidate', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='cand_votes', to='member.Candidate')),
+                ('vote_user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user_votes', to=settings.AUTH_USER_MODEL)),
             ],
         ),
     ]

account/models.py → member/models.py

@@ -1,19 +1,25 @@
 from django.db import models
-from django.contrib.auth.models import AbstractUser, BaseUserManager
+from django.contrib.auth.models import AbstractUser
+from .managers import UserManager
+
+# Create your models here.
 
 PART_CHOICES = [
-    ("FE", "프론트엔드"),
-    ("BE", "백엔드"),
+    ("frontend", "frontend"),
+    ("backend", "backend"),
 ]
 
 
 class User(AbstractUser):
-    part = models.CharField(max_length=2, choices=PART_CHOICES)
+    part = models.CharField(max_length=10, choices=PART_CHOICES)
+
+    objects = UserManager()
+    REQUIRED_FIELDS = ["email"]
 
 
 class Candidate(models.Model):
-    name = models.CharField(max_length=30)
-    part = models.CharField(max_length=2, choices=PART_CHOICES)
+    name = models.CharField(max_length=10)
+    part = models.CharField(max_length=10, choices=PART_CHOICES)
 
     def __str__(self):
         return self.name

account/serializers.py → member/serializers.py

@@ -1,4 +1,3 @@
-from django.db.models.base import Model
 from rest_framework import serializers
 from django.contrib.auth import get_user_model
 from .models import Candidate, Vote
@@ -9,11 +8,12 @@
 class RegisterSerializer(serializers.ModelSerializer):
     class Meta:
         model = User
-        fields = ("username", "password", "part")
+        fields = ("username", "email", "password", "part")
 
     def create(self, validated_data):
         user = User(
             username=validated_data.get("username"),
+            email=validated_data.get("email"),
             part=validated_data.get("part"),
         )
         user.set_password(validated_data.get("password"))

account/urls.py → member/urls.py

@@ -8,6 +8,8 @@
     # path("token/refresh", TokenRefreshView.as_view(), name="token_refresh"),
     path("signin", AuthView.as_view()),
     path("signup", RegisterAPIView.as_view()),
+    path("duplicate/username", UsernameDuplicateView.as_view()),
+    path("duplicate/email", EmailDuplicateView.as_view()),
     path("candidate", CandidateListAPIView.as_view()),
     path("candidate/result", CandidateResultAPIView.as_view()),
     path("candidate/<int:pk>", CandidateDetailAPIView.as_view()),

account/views.py → member/views.py

@@ -16,7 +16,13 @@ class RegisterAPIView(APIView):
     def post(self, request):
         user_serializer = RegisterSerializer(data=request.data)
         if user_serializer.is_valid():
-            user = user_serializer.save()
+            try:
+                user = user_serializer.save()
+            except:
+                return Response(
+                    {"message": "email are required!!"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
             # access jwt token
             token = TokenObtainPairSerializer.get_token(user)
             refresh_token = str(token)
@@ -38,6 +44,20 @@ def post(self, request):
         return Response(user_serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
 
+class UsernameDuplicateView(APIView):
+    def post(self, request):
+        username = request.data.get("username")
+        isExist = User.objects.filter(username=username).exists()
+        return Response(isExist, status=status.HTTP_200_OK)
+
+
+class EmailDuplicateView(APIView):
+    def post(self, request):
+        email = request.data.get("email")
+        isExist = User.objects.filter(email=email).exists()
+        return Response(isExist, status=status.HTTP_200_OK)
+
+
 # 로그인
 class AuthView(APIView):
     # 유저정보 확인

requirements.txt

@@ -1,14 +1,24 @@
 asgiref==3.4.1
+certifi==2021.10.8
 cffi==1.15.0
+charset-normalizer==2.0.9
 cryptography==35.0.0
+defusedxml==0.7.1
 Django==3.0.8
+django-allauth==0.47.0
 django-cors-headers==3.10.0
 django-environ==0.4.5
 djangorestframework==3.12.4
 djangorestframework-simplejwt==5.0.0
 gunicorn==20.1.0
+idna==3.3
+oauthlib==3.1.1
 pycparser==2.21
 PyJWT==2.3.0
 PyMySQL==1.0.2
+python3-openid==3.2.0
 pytz==2021.3
+requests==2.26.0
+requests-oauthlib==1.3.0
 sqlparse==0.4.2
+urllib3==1.26.7

vote_mailedit/settings/base.py

@@ -32,7 +32,7 @@
 
 ALLOWED_HOSTS = []
 
-AUTH_USER_MODEL = "account.User"
+AUTH_USER_MODEL = "member.User"
 
 # Application definition
 
@@ -43,10 +43,25 @@
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
-    "account",
+    "django.contrib.sites",
+    # allauth
+    "allauth",
+    "allauth.account",
+    "allauth.socialaccount",
+    # provider
+    "allauth.socialaccount.providers.google",
+    "member",
     "corsheaders",
 ]
 
+# Social Login
+AUTHENTICATION_BACKENDS = (
+    "django.contrib.auth.backends.ModelBackend",
+    "allauth.account.auth_backends.AuthenticationBackend",
+)
+
+SITE_ID = 1
+
 MIDDLEWARE = [
     "django.middleware.security.SecurityMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",

vote_mailedit/urls.py

@@ -20,7 +20,8 @@
 
 urlpatterns = [
     path("admin/", admin.site.urls),
-    path("api/", include("account.urls")),
+    path("api/", include("member.urls")),
+    path("accounts/", include("allauth.urls")),
 ]
 
 if base.DEBUG: