From 273894f92a60bf90eb0aaa256f55de89237519f4 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Tue, 7 Jan 2025 16:58:49 -0800
Subject: [PATCH 1/9] Add "terms" option to AboutFAQ model & migration

---
 .../migrations/0006_alter_aboutfaq_kind.py     | 18 ++++++++++++++++++
 kolibri_instant_schools_plugin/models.py       |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 kolibri_instant_schools_plugin/migrations/0006_alter_aboutfaq_kind.py

diff --git a/kolibri_instant_schools_plugin/migrations/0006_alter_aboutfaq_kind.py b/kolibri_instant_schools_plugin/migrations/0006_alter_aboutfaq_kind.py
new file mode 100644
index 0000000..cd8aee1
--- /dev/null
+++ b/kolibri_instant_schools_plugin/migrations/0006_alter_aboutfaq_kind.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.25 on 2025-01-08 00:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('kolibri_instant_schools_plugin', '0005_aboutfaq'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='aboutfaq',
+            name='kind',
+            field=models.TextField(choices=[('FAQ', 'FAQ'), ('About', 'About'), ('Terms', 'Terms')]),
+        ),
+    ]
diff --git a/kolibri_instant_schools_plugin/models.py b/kolibri_instant_schools_plugin/models.py
index b52aa86..7646a86 100644
--- a/kolibri_instant_schools_plugin/models.py
+++ b/kolibri_instant_schools_plugin/models.py
@@ -11,7 +11,7 @@
 
 class AboutFAQ(models.Model):
     html = models.TextField()
-    kind = models.TextField(choices=(("FAQ", "FAQ"), ("About", "About")))
+    kind = models.TextField(choices=(("FAQ", "FAQ"), ("About", "About"), ("Terms", "Terms")))
 
     class Meta:
         app_label = "kolibri_instant_schools_plugin"

From e6efc74e735a8b303453258828334c93e20d4d7f Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Tue, 7 Jan 2025 16:59:34 -0800
Subject: [PATCH 2/9] use the terms API endpoint for TOS iframe src; use KModal
 API for cleaner UI

---
 .../assets/src/views/SignUpPage.vue                      | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/kolibri_instant_schools_plugin/assets/src/views/SignUpPage.vue b/kolibri_instant_schools_plugin/assets/src/views/SignUpPage.vue
index c1b64e0..c253bd4 100644
--- a/kolibri_instant_schools_plugin/assets/src/views/SignUpPage.vue
+++ b/kolibri_instant_schools_plugin/assets/src/views/SignUpPage.vue
@@ -110,18 +110,13 @@
         v-if="showTerms"
         :title="$tr('termsOfServiceModalHeader')"
         :size="'large'"
+        :cancelText="$tr('close')"
         @cancel="showTerms = false"
       >
         <iframe
           class="terms"
-          src="/content/databases/about/tos.txt"
+          src="/en/user/api/aboutfaq/Terms"
         ></iframe>
-        <KButton
-          :text="$tr('close')"
-          :primary="false"
-          :disabled="false"
-          @click="showTerms = false"
-        />
       </KModal>
     </div>
   </ImmersivePage>

From 2676beb6f030e18b3cfbfab222b5fb1b00555472 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Tue, 7 Jan 2025 17:31:15 -0800
Subject: [PATCH 3/9] PhoneNumberSignupSerializer is only used when handling a
 SignUp, so create the username mapping when the given username is validated

---
 kolibri_instant_schools_plugin/auth/api.py | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/kolibri_instant_schools_plugin/auth/api.py b/kolibri_instant_schools_plugin/auth/api.py
index 5e43f67..d952e03 100644
--- a/kolibri_instant_schools_plugin/auth/api.py
+++ b/kolibri_instant_schools_plugin/auth/api.py
@@ -37,26 +37,13 @@ def validate_username(self, value):
             _('An account already exists for this phone number. To add a new profile ' +
                 'under this account, you must first login. If you have forgotten your ' +
                 'password, you can reset it using the link on the login page.'))
-        return value
+        return create_new_username(value)
 
 
 class PhoneNumberSignUpViewSet(SignUpViewSet):
 
     serializer_class = PhoneNumberSignupSerializer
 
-    def extract_request_data(self, request):
-        data = super(PhoneNumberSignUpViewSet, self).extract_request_data(request)
-
-        # if there are already users for this number, use one, to trigger a validation error, else create a new one
-        usernames = get_usernames(hash_phone(data["username"]))
-        if usernames:
-            data["username"] = hash_phone(usernames[0])
-        else:
-            data["username"] = create_new_username(data["username"])
-
-        return data
-
-
 class PasswordResetTokenViewset(viewsets.ViewSet):
 
     def create(self, request):

From dc40f93351edf84e2dbb4030250434ff97b0a72a Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Wed, 8 Jan 2025 11:28:51 -0800
Subject: [PATCH 4/9] include missing AppBarPage import

---
 .../assets/src/views/SelectProfilePage/index.vue                | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kolibri_instant_schools_plugin/assets/src/views/SelectProfilePage/index.vue b/kolibri_instant_schools_plugin/assets/src/views/SelectProfilePage/index.vue
index f97c6fc..6809188 100644
--- a/kolibri_instant_schools_plugin/assets/src/views/SelectProfilePage/index.vue
+++ b/kolibri_instant_schools_plugin/assets/src/views/SelectProfilePage/index.vue
@@ -39,6 +39,7 @@
 <script>
 
   import urls from 'kolibri.urls';
+  import AppBarPage from 'kolibri.coreVue.components.AppBarPage';
   import { mapActions, mapState } from 'vuex';
   import NewProfileModal from './NewProfileModal';
   import ProfilesList from './ProfilesList';
@@ -46,6 +47,7 @@
   export default {
     name: 'SelectProfilePage',
     components: {
+      AppBarPage,
       NewProfileModal,
       ProfilesList,
     },

From 1de4e0a10575ad769a2be35eb3c9fd3808e8514f Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Wed, 8 Jan 2025 11:35:34 -0800
Subject: [PATCH 5/9] Add margin to "Back to about" button in FAQ page

---
 .../assets/src/views/about/FAQPage/index.vue                     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kolibri_instant_schools_plugin/assets/src/views/about/FAQPage/index.vue b/kolibri_instant_schools_plugin/assets/src/views/about/FAQPage/index.vue
index 5c1bfd9..855247a 100644
--- a/kolibri_instant_schools_plugin/assets/src/views/about/FAQPage/index.vue
+++ b/kolibri_instant_schools_plugin/assets/src/views/about/FAQPage/index.vue
@@ -6,6 +6,7 @@
       appearance="raised-button"
       :text="$tr('back')"
       :to="aboutRoute"
+      style="margin: 0.5em 0"
     />
 
     <iframe

From 6504aef0be7cabd6d0dfecacdf659171302a5706 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Wed, 8 Jan 2025 11:53:43 -0800
Subject: [PATCH 6/9] SignUp serializer validates on if usernames exist for
 phone number

I think that basically this validator would receive the already-updated hash preivously, so the iexact filter was being run against not the phone number, but the mapped username.

So here, we just check to see if there are usernames for the phone number, and if there are, we raise the error, otherwise we return the create_new_username, which both sets the value of username to the hash generated and creates the mapping between the phone number and the username.
---
 kolibri_instant_schools_plugin/auth/api.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kolibri_instant_schools_plugin/auth/api.py b/kolibri_instant_schools_plugin/auth/api.py
index d952e03..48015d9 100644
--- a/kolibri_instant_schools_plugin/auth/api.py
+++ b/kolibri_instant_schools_plugin/auth/api.py
@@ -32,11 +32,14 @@ def retrieve(self, request, pk=None):
 class PhoneNumberSignupSerializer(FacilityUserSerializer):
 
     def validate_username(self, value):
-        if FacilityUser.objects.filter(username__iexact=value).exists():
+        # Check if the phone number is already associated with an account
+        usernames = get_usernames(hash_phone(value))
+        if usernames:
             raise serializers.ValidationError(
             _('An account already exists for this phone number. To add a new profile ' +
                 'under this account, you must first login. If you have forgotten your ' +
                 'password, you can reset it using the link on the login page.'))
+
         return create_new_username(value)
 
 

From b7c02f1754142f8c634f13c44f50ffcb72f9ca69 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Wed, 8 Jan 2025 12:18:57 -0800
Subject: [PATCH 7/9] hide hash username in side panel

---
 .../assets/src/views/SideNav/AboutSideNavEntry.js      |  1 +
 .../assets/src/views/SideNav/fix.css                   | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 kolibri_instant_schools_plugin/assets/src/views/SideNav/fix.css

diff --git a/kolibri_instant_schools_plugin/assets/src/views/SideNav/AboutSideNavEntry.js b/kolibri_instant_schools_plugin/assets/src/views/SideNav/AboutSideNavEntry.js
index 723d5d0..c744de4 100644
--- a/kolibri_instant_schools_plugin/assets/src/views/SideNav/AboutSideNavEntry.js
+++ b/kolibri_instant_schools_plugin/assets/src/views/SideNav/AboutSideNavEntry.js
@@ -1,3 +1,4 @@
+import './fix.css';
 import { UserKinds, NavComponentSections } from 'kolibri.coreVue.vuex.constants';
 import registerNavItem from 'kolibri.utils.registerNavItem';
 import urls from 'kolibri.urls';
diff --git a/kolibri_instant_schools_plugin/assets/src/views/SideNav/fix.css b/kolibri_instant_schools_plugin/assets/src/views/SideNav/fix.css
new file mode 100644
index 0000000..91e90f9
--- /dev/null
+++ b/kolibri_instant_schools_plugin/assets/src/views/SideNav/fix.css
@@ -0,0 +1,10 @@
+/*  This is a hack introduced to hide the hashed username displayed within the side nav. */
+
+.user-information p:nth-child(3) {
+    /* Hide hashed username */
+    display: none !important;
+}
+.user-information p:nth-child(4) {
+    /* Better spacing between account type & full name */
+    margin-top: 0.5em !important;
+}
\ No newline at end of file

From ae532437145fb33d982380aaad6f4835e4c4d6ca Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Wed, 8 Jan 2025 15:44:21 -0800
Subject: [PATCH 8/9] clarifying comment re: TOS src

---
 .../assets/src/views/SignUpPage.vue                           | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kolibri_instant_schools_plugin/assets/src/views/SignUpPage.vue b/kolibri_instant_schools_plugin/assets/src/views/SignUpPage.vue
index c253bd4..9e297b5 100644
--- a/kolibri_instant_schools_plugin/assets/src/views/SignUpPage.vue
+++ b/kolibri_instant_schools_plugin/assets/src/views/SignUpPage.vue
@@ -113,6 +113,10 @@
         :cancelText="$tr('close')"
         @cancel="showTerms = false"
       >
+        <!-- 
+          aboutfaq/Terms returns the "Terms" kind of "AboutFAQ" model record 
+          configured in the Django admin panel
+         -->
         <iframe
           class="terms"
           src="/en/user/api/aboutfaq/Terms"

From 2e853910fc768d92dc7afe01eba3afb4237ec746 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Wed, 8 Jan 2025 15:44:33 -0800
Subject: [PATCH 9/9] GH build action watch develop, not main

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b58b3a7..36ed1c1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ name: Build and deploy
 on:
   push:
     branches:
-    - main
+    - develop
   workflow_dispatch:
 
 jobs: