backend google auth

server/CompanionApp/admin.py

@@ -1,7 +1,8 @@
 from django.contrib import admin
-from .models import Curso, Matricula, Facultad
+from .models import Curso, Matricula, Facultad, User
 
 # Register your models here.
 admin.site.register(Curso)
 admin.site.register(Matricula)
 admin.site.register(Facultad)
+admin.site.register(User)

server/CompanionApp/migrations/0001_initial.py

@@ -1,6 +1,10 @@
-# Generated by Django 3.1.2 on 2020-10-08 23:09
+# Generated by Django 3.0.8 on 2020-11-02 23:35
 
+import django.contrib.auth.models
+import django.contrib.auth.validators
 from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -8,6 +12,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        ('auth', '0011_update_proxy_permissions'),
     ]
 
     operations = [
@@ -16,6 +21,59 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=150)),
+                ('code', models.CharField(max_length=9)),
+                ('creditos', models.IntegerField(default=0)),
             ],
         ),
+        migrations.CreateModel(
+            name='Facultad',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('fname', models.CharField(max_length=150)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='User',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('password', models.CharField(max_length=128, verbose_name='password')),
+                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
+                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
+                ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
+                ('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')),
+                ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
+                ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
+                ('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')),
+                ('gpa', models.DecimalField(decimal_places=2, default=0, max_digits=3)),
+                ('fac_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='CompanionApp.Facultad')),
+                ('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')),
+            ],
+            options={
+                'verbose_name': 'user',
+                'verbose_name_plural': 'users',
+                'abstract': False,
+            },
+            managers=[
+                ('objects', django.contrib.auth.models.UserManager()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Matricula',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('section', models.CharField(max_length=5)),
+                ('prof', models.CharField(max_length=150)),
+                ('grade', models.CharField(max_length=3)),
+                ('semestre', models.IntegerField(default=0)),
+                ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='CompanionApp.Curso')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='curso',
+            name='fac_id',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='CompanionApp.Facultad'),
+        ),
     ]

server/CompanionApp/migrations/0002_curso_code.py

@@ -1,19 +0,0 @@
-# Generated by Django 3.1.2 on 2020-10-08 23:11
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('CompanionApp', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='curso',
-            name='code',
-            field=models.CharField(default=0, max_length=9),
-            preserve_default=False,
-        ),
-    ]

server/CompanionApp/migrations/0003_auto_20201015_1100.py

@@ -1,43 +0,0 @@
-# Generated by Django 3.1.1 on 2020-10-15 15:00
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('CompanionApp', '0002_curso_code'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Facultad',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('fname', models.CharField(max_length=150)),
-            ],
-        ),
-        migrations.AddField(
-            model_name='curso',
-            name='creditos',
-            field=models.IntegerField(default=0),
-        ),
-        migrations.CreateModel(
-            name='Matricula',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('section', models.CharField(max_length=5)),
-                ('prof', models.CharField(max_length=150)),
-                ('grade', models.CharField(max_length=3)),
-                ('semestre', models.IntegerField(default=0)),
-                ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='CompanionApp.curso')),
-            ],
-        ),
-        migrations.AddField(
-            model_name='curso',
-            name='fac_id',
-            field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.CASCADE, to='CompanionApp.facultad'),
-            preserve_default=False,
-        ),
-    ]

server/CompanionApp/models.py

@@ -1,5 +1,5 @@
 from django.db import models
-
+from django.contrib.auth.models import AbstractUser
 # Create your models here.
 # diego, Diego1999$
 
@@ -19,3 +19,6 @@ class Matricula(models.Model):
     grade = models.CharField(max_length=3)
     semestre = models.IntegerField(default=0)
 
+class User(AbstractUser):
+    gpa = models.DecimalField(default = 0, max_digits = 3, decimal_places = 2)
+    fac_id = models.ForeignKey(Facultad, on_delete=models.CASCADE, default=1)

server/CompanionApp/views.py

@@ -5,7 +5,9 @@ sys.path.insert(1,'C:/Users/diego/Documents/companion_app/organizar/')
 from organizar import files3
 
 
-from django.shortcuts import render
+from rest_auth.registration.views import SocialLoginView
+from allauth.socialaccount.providers.google.views import GoogleOAuth2Adapter
+
 
 from django.http.response import JsonResponse
 from rest_framework.parsers import JSONParser 
@@ -15,10 +17,14 @@ from .models import Facultad, Curso
 from .serializers import FacultadSerializer, CursoSerializer 
 from rest_framework.decorators import api_view
 
-
+# clientID: 965339169610-8et02d4qpfk96vclngd0otths1rs8661.apps.googleusercontent.com
+# clientSecret: zeY8NoW6ORBHP8pDQLE2x_Z2
 
 # Create your views here.
 
+class GoogleLogin(SocialLoginView):
+    adapter_class = GoogleOAuth2Adapter
+
 @api_view(['POST',])
 def insertarFacultades(request):
     faculties = [ 'Administración de Empresas', 'Administración de Empresas graduado', 'Arquitectura', 'Arquitectura Graduado', 'Asuntos Académicos',
@@ -58,9 +64,9 @@ def insertarTodosLosCursos(request):
 
 @api_view(['GET', 'POST'])
 def hello_world(request):
-    if request.method == 'POST':
-        return JsonResponse({"message": "Got some data!", "data": request.data})
-    return JsonResponse({"message": "Hello, world!"})
-   
+    if request.user.is_authenticated:
+        if request.method == 'GET':
+            return JsonResponse({'msg': request.user.email}, status = status.HTTP_200_OK)
+    return JsonResponse({'msg': 'no'})
 
 

server/restful/settings.py

@@ -26,7 +26,6 @@ SECRET_KEY = 'j(q!!tj1a0yae#js(^7h-@y(g%=no817zm_t5*mf@p0t53l3qf'
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = []
 
 import os
 
@@ -57,10 +56,25 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'CompanionApp',
+   
     'rest_framework',
-    'corsheaders'
+    'rest_framework.authtoken',
+    'rest_auth',
+
+    'django.contrib.sites',
+    'allauth',
+    'allauth.account',
+    'rest_auth.registration',
+
+    'allauth.socialaccount',
+    'allauth.socialaccount.providers.facebook',
+    'allauth.socialaccount.providers.google',
+
+    'corsheaders',
 ]
 
+SITE_ID = 2
+
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -91,6 +105,18 @@ TEMPLATES = [
     },
 ]
 
+# REST_FRAMEWORK = {
+#     # 'DEFAULT_AUTHENTICATION_CLASSES': (
+#     #     'rest_framework.authentication.TokenAuthentication',
+#     # ),
+#     'DEFAULT_PERMISSION_CLASSES': (
+#         'rest_framework.permissions.IsAuthenticated', )
+# }
+
+ALLOWED_HOSTS = ['*']
+
+AUTH_USER_MODEL = 'CompanionApp.User' # new
+
 WSGI_APPLICATION = 'restful.wsgi.application'
 
 

server/restful/urls.py

@@ -14,13 +14,15 @@ Including another URLconf
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
-# from django.urls import path, include, 
+from django.urls import path, include 
 from django.conf.urls import url, include 
+from CompanionApp.views import GoogleLogin
 
 
 
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
+    url(r'^rest-auth/google', GoogleLogin.as_view(), name='google_login'),
     url(r'^', include('CompanionApp.urls'))
 ]