Merge pull request #14 from app-generator/social-auth

make email optional

Author: app-generator

api/authentication/viewsets/social_login.py

@@ -32,11 +32,14 @@ def get(self, request):
         user_data = requests.get('https://api.github.com/user', headers={
             "Authorization": "Bearer " + access_token
         }).json()
-
-        if User.objects.filter(username=user_data['login'], email=user_data['email']).exists():
-            user = User.objects.get(username=user_data['login'], email=user_data['email'])
+        
+        if User.objects.filter(username=user_data['login']).exists():
+            user = User.objects.get(username=user_data['login'])
         else:
-            user = User.objects.create_user(username=user_data['login'], email=user_data['email'])
+            try:
+                user = User.objects.create(username=user_data['login'], email=user_data['email'])
+            except:
+                user = User.objects.create(username=user_data['login'])
 
         try:
             session = ActiveSession.objects.get(user=user)

api/user/migrations/0002_alter_user_email.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.13 on 2022-12-08 04:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api_user', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='email',
+            field=models.EmailField(blank=True, db_index=True, max_length=254, null=True, unique=True),
+        ),
+    ]

api/user/models.py

@@ -42,7 +42,7 @@ def create_superuser(self, username, email, password):
 
 class User(AbstractBaseUser, PermissionsMixin):
     username = models.CharField(db_index=True, max_length=255, unique=True)
-    email = models.EmailField(db_index=True, unique=True)
+    email = models.EmailField(db_index=True, unique=True, null=True, blank=True)
     is_active = models.BooleanField(default=True)
     is_staff = models.BooleanField(default=False)
     date = models.DateTimeField(auto_now_add=True)
@@ -53,4 +53,4 @@ class User(AbstractBaseUser, PermissionsMixin):
     objects = UserManager()
 
     def __str__(self):
-        return f"{self.email}"
+        return f"{self.username}"