[17기_조예지] HTTPS 과제 제출합니다.

.github/workflows/deploy.yml

@@ -3,7 +3,7 @@ name: Deploy to EC2
 on:
   push:
     branches:
-      - dev
+      - master
 
 jobs:
 

.gitignore

@@ -170,5 +170,6 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 .idea/
-
+.env
+.env.prod
 # End of https://www.toptal.com/developers/gitignore/api/django

Dockerfile

@@ -1,6 +1,8 @@
+# pyhton 3.8.3 버전을 담은 이미지를 개조해서 사용할 예정
 FROM python:3.8.3-alpine
 ENV PYTHONUNBUFFERED 1
 
+# 이미지 내에서 명령어를 실행할 디렉토리 설정
 RUN mkdir /app
 WORKDIR /app
 

account/admin.py

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

account/apps.py

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

account/forms.py

@@ -0,0 +1,70 @@
+from django import forms
+from django.contrib.auth.forms import ReadOnlyPasswordHashField
+from django.utils.translation import ugettext_lazy as _
+from .models import User,UserManager
+
+
+# 회원가입 시 필요한 아이디, 이메일, 비밀번호
+class UserCreateForm(forms.ModelForm):
+    user_id=forms.CharField(
+        label=('User ID'),
+        required=True,
+        widget=forms.TextInput(
+            attrs={
+                'class': 'form-control',
+                'placeholder':_('User ID'),
+                'required': 'True',
+            }
+        )
+    )
+    email = forms.EmailField(
+        label=('Email'),
+        required=True,
+        widget=forms.EmailInput(
+            attrs={
+                'class': 'form-control',
+                'placeholder':_('Email address'),
+                'required': 'True',
+            }
+        )
+    )
+    password1 = forms.CharField(
+        label=_('Password'),
+        widget=forms.PasswordInput(
+            attrs={
+                'class': 'form-control',
+                'placeholder': _('Password'),
+                'required': 'True',
+            }
+        )
+    )
+    password2 = forms.CharField(
+        label=_('Password confirmation'),
+        widget=forms.PasswordInput(
+            attrs={
+                'class': 'form-control',
+                'placeholder': _('Password confirmation'),
+                'required': 'True',
+            }
+        )
+    )
+
+    class Meta:
+        model = User
+        fields = ('login_id', 'email')
+
+        def clean_password2(self):
+            password1 = self.cleaned_data.get("password1")
+            password2 = self.cleaned_data.get("password2")
+            if password1 and password2 and password1 != password2:
+                raise forms.ValidationError("Passwords don't match")
+            return password2
+
+        def save(self, commit=True):
+            # Save the provided password in hashed format
+            user = super(UserCreateForm, self).save(commit=False)
+            user.user_id = UserManager.normalize_email(self.cleaned_data['login_id'])
+            user.set_password(self.cleaned_data["password1"])
+            if commit:
+                user.save()
+            return user

account/migrations/0001_initial.py

@@ -0,0 +1,63 @@
+# Generated by Django 3.2.16 on 2023-03-31 15:00
+
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='School',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('school_name', models.CharField(max_length=100)),
+            ],
+            options={
+                'ordering': ['-created_at', '-updated_at'],
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='UserManager',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+            ],
+            options={
+                'ordering': ['-created_at', '-updated_at'],
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='User',
+            fields=[
+                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('user_id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('id', models.CharField(max_length=20, verbose_name='아이디')),
+                ('password', models.CharField(max_length=128, verbose_name='비밀번호')),
+                ('email', models.EmailField(max_length=128, unique=True, verbose_name='이메일')),
+                ('nickname', models.CharField(max_length=20, unique=True, verbose_name='닉네임')),
+                ('class_of', models.IntegerField(verbose_name='입학연도')),
+                ('name', models.CharField(max_length=20, verbose_name='이름')),
+                ('join_date', models.DateField(auto_now_add=True, verbose_name='가입일')),
+                ('is_active', models.BooleanField(default=True)),
+                ('is_admin', models.BooleanField(default=False)),
+                ('school_id', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='account.school')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

account/migrations/0002_delete_usermanager.py

@@ -0,0 +1,16 @@
+# Generated by Django 3.2.16 on 2023-05-02 14:11
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='UserManager',
+        ),
+    ]

account/migrations/0003_alter_user_class_of.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.16 on 2023-05-02 14:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0002_delete_usermanager'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='class_of',
+            field=models.IntegerField(null=True, verbose_name='입학연도'),
+        ),
+    ]

account/migrations/0004_auto_20230502_2316.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.2.16 on 2023-05-02 14:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0003_alter_user_class_of'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='join_date',
+            field=models.DateField(auto_now_add=True, null=True, verbose_name='가입일'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='name',
+            field=models.CharField(max_length=20, null=True, verbose_name='이름'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='school_id',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='account.school'),
+        ),
+    ]

account/models.py

@@ -0,0 +1,68 @@
+from django.db import models
+from django.contrib.auth.models import AbstractBaseUser, BaseUserManager, PermissionsMixin
+from core.models import TimestampedModel
+import uuid
+
+
+class School(TimestampedModel):
+    school_name = models.CharField(max_length=100)
+
+    def __str__(self):
+        return self.school_name
+
+
+class UserManager(BaseUserManager):
+    # 필수로 필요한 데이터를 선언
+    def create_user(self, id, email, password, nickname):
+        if not id:
+            raise ValueError('Users must have an user_id')
+        if not password:
+            raise ValueError('Password must have and password')
+        print("usermanager 디버깅")
+        user = self.model(
+            id=id,
+            email=email,
+            nickname=nickname,
+        )
+        user.set_password(password)
+        user.save(using=self._db)
+        return user
+
+    # python manage.py createsuperuser 사용 시 해당 함수가 사용됨
+    def create_superuser(self, id, email, password=None):
+        user = self.create_user(
+            email,
+            id=id,
+            password=password
+        )
+        user.is_admin = True
+        user.save(using=self._db)
+        return user
+
+
+class User(AbstractBaseUser,TimestampedModel):
+    user_id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
+
+    id = models.CharField("아이디", max_length= 20)
+    password = models.CharField("비밀번호", max_length=128)
+    email = models.EmailField("이메일", max_length=128, unique=True)
+    nickname = models.CharField("닉네임",max_length=20, unique= True)
+    class_of = models.IntegerField("입학연도", null=True)
+    name = models.CharField("이름",max_length=20, null=True)
+    join_date = models.DateField("가입일", auto_now_add=True, null=True)
+
+    is_active = models.BooleanField(default=True)
+    is_admin = models.BooleanField(default=False)
+
+    school_id = models.ForeignKey(School, on_delete=models.PROTECT, null=True)
+
+    REQUIRED_FIELDS = ['password']  # 필수로 값을 받아야하는 필드
+    USERNAME_FIELD = 'email'
+
+    # custom user 생성 시 필요
+    objects = UserManager()
+
+    def __str__(self):
+        return self.name
+
+