Save accepted terms in db

server/basicknowledge/migrations/0006_auto_20200519_0933.py

@@ -0,0 +1,21 @@
+# Generated by Django 2.1.15 on 2020-05-19 09:33
+
+from django.db import migrations
+import wagtail.core.blocks
+import wagtail.core.fields
+import wagtail.images.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('basicknowledge', '0005_auto_20200408_0834'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='basicknowledge',
+            name='contents',
+            field=wagtail.core.fields.StreamField([('text_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock(features=['bold', 'ul', 'brand', 'secondary']))])), ('image_block', wagtail.images.blocks.ImageChooserBlock()), ('link_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.TextBlock()), ('url', wagtail.core.blocks.URLBlock())])), ('video_block', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock())])), ('document_block', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock())])), ('section_title', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.TextBlock())])), ('infogram_block', wagtail.core.blocks.StructBlock([('id', wagtail.core.blocks.TextBlock()), ('title', wagtail.core.blocks.TextBlock())])), ('genially_block', wagtail.core.blocks.StructBlock([('id', wagtail.core.blocks.TextBlock())])), ('thinglink_block', wagtail.core.blocks.StructBlock([('id', wagtail.core.blocks.TextBlock())])), ('subtitle', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.TextBlock())]))], blank=True, null=True),
+        ),
+    ]

server/books/migrations/0021_auto_20200519_0933.py

@@ -0,0 +1,24 @@
+# Generated by Django 2.1.15 on 2020-05-19 09:33
+
+import assignments.models
+from django.db import migrations
+import surveys.models
+import wagtail.core.blocks
+import wagtail.core.fields
+import wagtail.images.blocks
+import wagtail.snippets.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('books', '0020_topic_instructions'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contentblock',
+            name='contents',
+            field=wagtail.core.fields.StreamField([('text_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock(features=['ul']))])), ('basic_knowledge', wagtail.core.blocks.StructBlock([('description', wagtail.core.blocks.RichTextBlock(required=False)), ('basic_knowledge', wagtail.core.blocks.PageChooserBlock(required=True, target_model=['basicknowledge.BasicKnowledge']))])), ('assignment', wagtail.core.blocks.StructBlock([('assignment_id', wagtail.snippets.blocks.SnippetChooserBlock(assignments.models.Assignment))])), ('survey', wagtail.core.blocks.StructBlock([('survey_id', wagtail.snippets.blocks.SnippetChooserBlock(surveys.models.Survey))])), ('image_block', wagtail.images.blocks.ImageChooserBlock()), ('image_url_block', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.TextBlock()), ('url', wagtail.core.blocks.URLBlock())])), ('link_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.TextBlock()), ('url', wagtail.core.blocks.URLBlock())])), ('solution', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock(features=['ul']))], icon='tick')), ('video_block', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock())])), ('document_block', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock())])), ('infogram_block', wagtail.core.blocks.StructBlock([('id', wagtail.core.blocks.TextBlock()), ('title', wagtail.core.blocks.TextBlock())])), ('genially_block', wagtail.core.blocks.StructBlock([('id', wagtail.core.blocks.TextBlock())])), ('thinglink_block', wagtail.core.blocks.StructBlock([('id', wagtail.core.blocks.TextBlock())])), ('subtitle', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.TextBlock())])), ('instruction', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock()), ('text', wagtail.core.blocks.TextBlock(required=False))])), ('module_room_slug', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.TextBlock())])), ('content_list_item', wagtail.core.blocks.StreamBlock([('text_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock(features=['ul']))])), ('basic_knowledge', wagtail.core.blocks.StructBlock([('description', wagtail.core.blocks.RichTextBlock(required=False)), ('basic_knowledge', wagtail.core.blocks.PageChooserBlock(required=True, target_model=['basicknowledge.BasicKnowledge']))])), ('assignment', wagtail.core.blocks.StructBlock([('assignment_id', wagtail.snippets.blocks.SnippetChooserBlock(assignments.models.Assignment))])), ('survey', wagtail.core.blocks.StructBlock([('survey_id', wagtail.snippets.blocks.SnippetChooserBlock(surveys.models.Survey))])), ('image_block', wagtail.images.blocks.ImageChooserBlock()), ('image_url_block', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.TextBlock()), ('url', wagtail.core.blocks.URLBlock())])), ('link_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.TextBlock()), ('url', wagtail.core.blocks.URLBlock())])), ('solution', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock(features=['ul']))], icon='tick')), ('video_block', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock())])), ('document_block', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock())])), ('infogram_block', wagtail.core.blocks.StructBlock([('id', wagtail.core.blocks.TextBlock()), ('title', wagtail.core.blocks.TextBlock())])), ('genially_block', wagtail.core.blocks.StructBlock([('id', wagtail.core.blocks.TextBlock())])), ('thinglink_block', wagtail.core.blocks.StructBlock([('id', wagtail.core.blocks.TextBlock())])), ('subtitle', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.TextBlock())])), ('instruction', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock()), ('text', wagtail.core.blocks.TextBlock(required=False))])), ('module_room_slug', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.TextBlock())]))]))], blank=True, null=True),
+        ),
+    ]

server/core/settings.py

@@ -387,6 +387,7 @@ ALLOW_BETA_LOGIN = True
 HEP_ADMIN_USER = os.environ.get("HEP_ADMIN_USER")
 HEP_ADMIN_PASSWORD = os.environ.get("HEP_ADMIN_PASSWORD")
 HEP_URL = os.environ.get("HEP_URL")
+HEP_MYSKILLBOX_GROUP_ID = 5
 
 TASKBASE_USER = os.environ.get("TASKBASE_USER")
 TASKBASE_PASSWORD = os.environ.get("TASKBASE_PASSWORD")

server/users/managers.py

@@ -1,6 +1,7 @@
 from datetime import timedelta
 
 from django.apps import apps
+from django.conf import settings
 from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.utils import timezone
@@ -119,6 +120,10 @@ class UserManager(DjangoUserManager):
         user.hep_id = user_data['id']
         user.hep_group_id = user_data['group_id']
         user.save()
+
+        if user.hep_group_id == settings.HEP_MYSKILLBOX_GROUP_ID:
+            apps.get_model('users.UserData').objects.create(user=user, accepted_terms=True)
+
         return user
 
 

server/users/migrations/0018_userdata.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.1.15 on 2020-05-19 09:33
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0017_auto_20200430_1251'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='UserData',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('accepted_terms', models.BooleanField(default=False)),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='user_data', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

server/users/models.py

@@ -236,6 +236,11 @@ class UserSetting(models.Model):
     selected_class = models.ForeignKey(SchoolClass, blank=True, null=True, on_delete=models.CASCADE)
 
 
+class UserData(models.Model):
+    user = models.OneToOneField(get_user_model(), on_delete=models.CASCADE, related_name='user_data')
+    accepted_terms = models.BooleanField(default=False)
+
+
 class License(models.Model):
     for_role = models.ForeignKey(Role, blank=False, null=True, on_delete=models.CASCADE)
     licensee = models.ForeignKey(User, blank=False, null=True, on_delete=models.CASCADE)

server/users/tests/test_login.py

@@ -13,6 +13,7 @@ from datetime import timedelta
 from unittest.mock import patch
 
 import requests
+from django.conf import settings
 from django.contrib.sessions.middleware import SessionMiddleware
 from django.test import TestCase, RequestFactory
 from django.utils import timezone
@@ -24,10 +25,13 @@ from core.hep_client import HepClient
 from core.tests.mock_hep_data_factory import MockResponse, ME_DATA, VALID_STUDENT_ORDERS, VALID_TEACHERS_ORDERS, \
     NOT_CONFIRMED_ME
 from users.factories import LicenseFactory
-from users.models import Role, User, SchoolClass, License
+from users.models import Role, User, SchoolClass, License, UserData
 
 TOKEN = 'abcd12345!'
 
+MYSKILLBOX_GROUP_ID_ME_DATA = ME_DATA.copy()
+MYSKILLBOX_GROUP_ID_ME_DATA['group_id'] = settings.HEP_MYSKILLBOX_GROUP_ID
+
 
 class LoginTests(TestCase):
     def setUp(self):
@@ -159,6 +163,23 @@ class LoginTests(TestCase):
         self.assertTrue(result.get('data').get('login').get('success'))
         self.assertTrue(self.user.is_authenticated)
 
+        try:
+            UserData.objects.get(user=user)
+            self.fail('LoginTests.test_teacher_can_login_with_remote_user_and_remote_license: Userdata should not exist')
+        except:
+            pass
+
+    @patch.object(HepClient, '_customer_orders', return_value=VALID_TEACHERS_ORDERS)
+    @patch.object(HepClient, 'customer_me', return_value=MYSKILLBOX_GROUP_ID_ME_DATA)
+    @patch.object(HepClient, 'fetch_admin_token', return_value={'token': 'AABBCCDDEE**44566'})
+    def test_teacher_can_login_with_remote_user_and_remote_license_with_myskillbox_group_id(self, order_mock, me_mock, admin_token_mock):
+        self.make_login_mutation(TOKEN)
+        user = User.objects.get(email=MYSKILLBOX_GROUP_ID_ME_DATA['email'])
+        try:
+            UserData.objects.get(user=user)
+        except:
+            self.fail('LoginTests.test_teacher_can_login_with_remote_user_and_remote_license: Userdata should exist')
+
     @patch.object(HepClient, '_customer_orders', return_value=VALID_STUDENT_ORDERS)
     @patch.object(HepClient, 'customer_me', return_value=ME_DATA)
     @patch.object(HepClient, 'fetch_admin_token', return_value={'token': 'AABBCCDDEE**44566'})