From c146aa9fe156829b92c58bd5168e65480a96a17b Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Sat, 7 Oct 2023 18:37:01 +0200
Subject: [PATCH 01/24] Add initial setting list

---
 wafer/settings.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/wafer/settings.py b/wafer/settings.py
index c0b5437f..bb33a890 100644
--- a/wafer/settings.py
+++ b/wafer/settings.py
@@ -341,3 +341,20 @@
 
 # Specify DEFAULT_AUTO_FIELD to make Django >= 3.2 happy
 DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
+# List of social media sites that can be added to the user profile
+# We assume people will enter approriate urls
+# FIXME: Validation would be nice
+SOCIAL_MEDIA_ENTRIES = [
+    'twitter',
+    'massadon',
+    'other',
+]
+
+# List of code hosting sites that can be added to the user profile
+# See above
+CODE_HOSTING_ENTRIES = [
+    'github',
+    'gitlab',
+    'bitbucket',
+]

From 0bf7ee6d01e9a746812f5bd692815b7be6087cd2 Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Sat, 7 Oct 2023 18:42:06 +0200
Subject: [PATCH 02/24] Strip out old social media bits

---
 .../templates/wafer.schedule/penta_schedule.xml    |  6 ------
 wafer/schedule/views.py                            |  2 --
 wafer/users/forms.py                               |  4 ----
 wafer/users/models.py                              | 11 -----------
 wafer/users/templates/wafer.users/profile.html     | 12 ------------
 .../wafer.users/snippets/profile_20-bio.html       | 14 --------------
 6 files changed, 49 deletions(-)

diff --git a/wafer/schedule/templates/wafer.schedule/penta_schedule.xml b/wafer/schedule/templates/wafer.schedule/penta_schedule.xml
index 5677d04f..669fde44 100644
--- a/wafer/schedule/templates/wafer.schedule/penta_schedule.xml
+++ b/wafer/schedule/templates/wafer.schedule/penta_schedule.xml
@@ -64,9 +64,6 @@
                             {% if user.is_staff %}
                               {# We will want finer grained control off this eventually, but staff will do for now #}
                               <person id="{{ author.pk }}"
-                                {% if author.userprofile.twitter_handle %}
-                                      twitter="https://twitter.com/{{ author.userprofile.twitter_handle }}"
-                                {% endif %}
                                       contact="{{ author.email }}">{{ author.userprofile.display_name }}</person>
                             {% else %}
                               <person id="{{ author.pk }}">{{ author.userprofile.display_name }}</person>
@@ -100,9 +97,6 @@
                             {% if user.is_staff %}
                               {# We will want finer grained control off this eventually, but staff will do for now #}
                               <person id="{{ person.pk }}"
-                                {% if author.userprofile.twitter_handle %}
-                                      twitter="https://twitter.com/{{ person.userprofile.twitter_handle }}"
-                                {% endif %}
                                       contact="{{ person.email }}">{{ person.userprofile.display_name }}</person>
                             {% else %}
                               <person id="{{ person.pk }}">{{ person.userprofile.display_name }}</person>
diff --git a/wafer/schedule/views.py b/wafer/schedule/views.py
index 7312873c..5fc1e639 100644
--- a/wafer/schedule/views.py
+++ b/wafer/schedule/views.py
@@ -522,8 +522,6 @@ def get(self, request):
                     'name': person.userprofile.display_name(),
                     'email': person.email
                 }
-                if person.userprofile.twitter_handle:
-                    person_data['twitter'] = person.userprofile.twitter_handle
                 sched_event['authors'].append(person_data)
             sched_event['license'] = settings.WAFER_VIDEO_LICENSE
             sched_event['license_url'] = settings.WAFER_VIDEO_LICENSE_URL
diff --git a/wafer/users/forms.py b/wafer/users/forms.py
index aa4797e4..df585f94 100644
--- a/wafer/users/forms.py
+++ b/wafer/users/forms.py
@@ -42,10 +42,6 @@ def __init__(self, *args, **kwargs):
         username = kwargs['instance'].user.username
         self.helper.form_action = reverse('wafer_user_edit_profile',
                                           args=(username,))
-        self.helper['twitter_handle'].wrap(PrependedText,
-                                           '@', placeholder=_('handle'))
-        self.helper['github_username'].wrap(PrependedText,
-                                            '@', placeholder=_('username'))
         self.helper.add_input(Submit('submit', _('Save')))
 
     class Meta:
diff --git a/wafer/users/models.py b/wafer/users/models.py
index 41e885db..293fbde6 100644
--- a/wafer/users/models.py
+++ b/wafer/users/models.py
@@ -24,12 +24,6 @@
                                 PROVISIONAL, CANCELLED)
 
 
-# validate format of twitter handle
-# Max 15 characters, alphanumeric and _ only
-# Specification taken from https://support.twitter.com/articles/101299
-TwitterValidator = RegexValidator('^[A-Za-z0-9_]{1,15}$',
-                                  'Incorrectly formatted twitter handle')
-
 
 class UserProfile(models.Model):
 
@@ -44,11 +38,6 @@ class Meta:
     bio = models.TextField(_('bio'), null=True, blank=True)
 
     homepage = models.CharField(_('homepage'), max_length=256, null=True, blank=True)
-    # We should probably do social auth instead
-    # And care about other code hosting sites...
-    twitter_handle = models.CharField(_('Twitter handle'), max_length=15, null=True, blank=True,
-                                      validators=[TwitterValidator])
-    github_username = models.CharField(_('GitHub username'), max_length=32, null=True, blank=True)
 
     def __str__(self):
         return u'%s' % self.user
diff --git a/wafer/users/templates/wafer.users/profile.html b/wafer/users/templates/wafer.users/profile.html
index 035b8d13..d9764ba9 100644
--- a/wafer/users/templates/wafer.users/profile.html
+++ b/wafer/users/templates/wafer.users/profile.html
@@ -12,18 +12,6 @@
 {% endblock content %}
 {% block extra_foot %}
 <script type="text/javascript">
-  {% if profile.twitter_handle %}
-    // Twitter boilerplate
-    !function(d, s, id) {
-      var js, fjs = d.getElementsByTagName(s)[0];
-      if (! d.getElementById(id)) {
-        js = d.createElement(s);
-        js.id = id;
-        js.src = "//platform.twitter.com/widgets.js";
-        fjs.parentNode.insertBefore(js, fjs);
-      }
-    }(document, "script", "twitter-wjs");
-  {% endif %}
 
   $("#profile-avatar [rel=popover]").attr("data-bs-content", $("#profile-avatar .popover-contents").html());
   $("a[rel=popover]").popover();
diff --git a/wafer/users/templates/wafer.users/snippets/profile_20-bio.html b/wafer/users/templates/wafer.users/snippets/profile_20-bio.html
index be188317..aad01fe6 100644
--- a/wafer/users/templates/wafer.users/snippets/profile_20-bio.html
+++ b/wafer/users/templates/wafer.users/snippets/profile_20-bio.html
@@ -38,20 +38,6 @@ <h1>
           </h1>
         {% endblock name %}
         {% block social %}
-           {% if profile.twitter_handle %}
-             <p>
-               <a href="https://twitter.com/{{ profile.twitter_handle }}" class="twitter-follow-button" data-bs-show-count="false">
-                 {% blocktrans with handle=profile.twitter_handle %}Follow @{{ handle }}{% endblocktrans %}
-               </a>
-             </p>
-           {% endif %}
-           {% if profile.github_username %}
-             <p>
-               <a href="https://github.com/{{ profile.github_username }}">
-                 {% blocktrans with username=profile.github_username %}GitHub: {{ username }}{% endblocktrans %}
-               </a>
-             </p>
-           {% endif %}
         {% endblock social %}
         {% endspaceless %}
       </div>

From 1586b67dc45dd593cb8df8684bea36fabce6fbb1 Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Sat, 7 Oct 2023 18:45:45 +0200
Subject: [PATCH 03/24] Add migration to remove old social stuff

---
 ...0004_alter_userprofile_options_and_more.py | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 wafer/users/migrations/0004_alter_userprofile_options_and_more.py

diff --git a/wafer/users/migrations/0004_alter_userprofile_options_and_more.py b/wafer/users/migrations/0004_alter_userprofile_options_and_more.py
new file mode 100644
index 00000000..f466cc33
--- /dev/null
+++ b/wafer/users/migrations/0004_alter_userprofile_options_and_more.py
@@ -0,0 +1,21 @@
+# Generated by Django 4.1.1 on 2023-10-07 16:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0003_auto_20160329_2003"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="userprofile",
+            name="github_username",
+        ),
+        migrations.RemoveField(
+            model_name="userprofile",
+            name="twitter_handle",
+        ),
+    ]

From 2ef2035d50e00164bd56d952c435c1b8096a70df Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Sat, 7 Oct 2023 21:41:48 +0200
Subject: [PATCH 04/24] Hack in dynamic fields into the form

---
 wafer/users/forms.py | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/wafer/users/forms.py b/wafer/users/forms.py
index df585f94..4f44cc81 100644
--- a/wafer/users/forms.py
+++ b/wafer/users/forms.py
@@ -2,10 +2,11 @@
 from django.contrib.auth import get_user_model
 from django.urls import reverse
 from django.utils.translation import gettext as _
+from django.conf import settings
 
 from crispy_forms.bootstrap import PrependedText
 from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Submit
+from crispy_forms.layout import HTML, Submit
 
 from wafer.registration.validators import validate_username
 from wafer.users.models import UserProfile
@@ -37,13 +38,37 @@ class Meta:
 class UserProfileForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+
+        pre_social_index = len(self.fields)
+
+        for field_name in settings.SOCIAL_MEDIA_ENTRIES:
+            self.fields[field_name] = forms.CharField()
+
+        pre_code_index = len(self.fields)
+
+        for field_name in settings.CODE_HOSTING_ENTRIES:
+            self.fields[field_name] = forms.CharField()
+
         self.helper = FormHelper(self)
         self.helper.include_media = False
         username = kwargs['instance'].user.username
         self.helper.form_action = reverse('wafer_user_edit_profile',
                                           args=(username,))
+
+        # Add code hosting media header
+        # We do this in this order to avoid needing to do
+        # more maths
+        if settings.CODE_HOSTING_ENTRIES:
+            self.helper.layout.insert(pre_code_index, HTML('<p>Code</p>'))
+
+        # Add social media header
+        if settings.SOCIAL_MEDIA_ENTRIES:
+            self.helper.layout.insert(pre_social_index, HTML('<p>Socail</p>'))
+
+
         self.helper.add_input(Submit('submit', _('Save')))
 
     class Meta:
         model = UserProfile
         exclude = ('user', 'kv')
+

From 71e9fdf31b3a2c92137ddd1ef1395c2ad185a6d6 Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Sun, 8 Oct 2023 12:43:18 +0200
Subject: [PATCH 05/24] Better names

---
 wafer/settings.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/wafer/settings.py b/wafer/settings.py
index bb33a890..243e2f52 100644
--- a/wafer/settings.py
+++ b/wafer/settings.py
@@ -346,15 +346,15 @@
 # We assume people will enter approriate urls
 # FIXME: Validation would be nice
 SOCIAL_MEDIA_ENTRIES = [
-    'twitter',
-    'massadon',
+    'Twitter Profile link',
+    'Fediverse Profile link',
     'other',
 ]
 
 # List of code hosting sites that can be added to the user profile
 # See above
 CODE_HOSTING_ENTRIES = [
-    'github',
-    'gitlab',
-    'bitbucket',
+    'github profile',
+    'gitlab profile',
+    'bitbucket profile',
 ]

From 63c6d050160380c2153f8f440dc8c202604ebf69 Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Sun, 8 Oct 2023 12:44:23 +0200
Subject: [PATCH 06/24] Change to URLField

---
 wafer/users/forms.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/wafer/users/forms.py b/wafer/users/forms.py
index 4f44cc81..fda2261a 100644
--- a/wafer/users/forms.py
+++ b/wafer/users/forms.py
@@ -41,13 +41,15 @@ def __init__(self, *args, **kwargs):
 
         pre_social_index = len(self.fields)
 
+        # currently everything I'm asking for is an url, and this adds some
+        # validation - we may need to revisit this later
         for field_name in settings.SOCIAL_MEDIA_ENTRIES:
-            self.fields[field_name] = forms.CharField()
+            self.fields[field_name] = forms.URLField(max_length=1024)
 
         pre_code_index = len(self.fields)
 
         for field_name in settings.CODE_HOSTING_ENTRIES:
-            self.fields[field_name] = forms.CharField()
+            self.fields[field_name] = forms.URLField(max_length=1024)
 
         self.helper = FormHelper(self)
         self.helper.include_media = False

From 1cf4e69c9855c3fb012d0bf05d410373fc51d5da Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Sun, 8 Oct 2023 15:14:36 +0200
Subject: [PATCH 07/24] Change social entries to dicts to separate db key and
 help text

---
 wafer/settings.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/wafer/settings.py b/wafer/settings.py
index 243e2f52..e8fdd7d5 100644
--- a/wafer/settings.py
+++ b/wafer/settings.py
@@ -345,16 +345,17 @@
 # List of social media sites that can be added to the user profile
 # We assume people will enter approriate urls
 # FIXME: Validation would be nice
-SOCIAL_MEDIA_ENTRIES = [
-    'Twitter Profile link',
-    'Fediverse Profile link',
-    'other',
-]
+# These are dictionaries of database/kv key and then friendly text
+SOCIAL_MEDIA_ENTRIES = {
+    'twitter': 'Twitter Profile link',
+    'fediverse': 'Fediverse Profile link',
+    'other': 'other',
+}
 
 # List of code hosting sites that can be added to the user profile
 # See above
-CODE_HOSTING_ENTRIES = [
-    'github profile',
-    'gitlab profile',
-    'bitbucket profile',
-]
+CODE_HOSTING_ENTRIES = {
+    'github': 'github profile',
+    'gitlab': 'gitlab profile',
+    'bitbucket': 'bitbucket profile',
+}

From 8845310d2bd87c1ce6129dddbd5a4d8beb193b1e Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Sun, 8 Oct 2023 15:14:45 +0200
Subject: [PATCH 08/24] Update form generation

---
 wafer/users/forms.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/wafer/users/forms.py b/wafer/users/forms.py
index fda2261a..6f4eebd3 100644
--- a/wafer/users/forms.py
+++ b/wafer/users/forms.py
@@ -44,12 +44,14 @@ def __init__(self, *args, **kwargs):
         # currently everything I'm asking for is an url, and this adds some
         # validation - we may need to revisit this later
         for field_name in settings.SOCIAL_MEDIA_ENTRIES:
-            self.fields[field_name] = forms.URLField(max_length=1024)
+            self.fields[field_name] = forms.URLField(label=_(settings.SOCIAL_MEDIA_ENTRIES[field_name]), 
+                                                     max_length=1024, required=False)
 
         pre_code_index = len(self.fields)
 
         for field_name in settings.CODE_HOSTING_ENTRIES:
-            self.fields[field_name] = forms.URLField(max_length=1024)
+            self.fields[field_name] = forms.URLField(label=_(settings.CODE_HOSTING_ENTRIES[field_name]),
+                                                    max_length=1024, required=False)
 
         self.helper = FormHelper(self)
         self.helper.include_media = False

From 1814fb61d9c2b9aea841a2dac4ec44beeb36a287 Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Sun, 8 Oct 2023 15:15:24 +0200
Subject: [PATCH 09/24] Save user profile entries

---
 wafer/users/forms.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/wafer/users/forms.py b/wafer/users/forms.py
index 6f4eebd3..07fa18e1 100644
--- a/wafer/users/forms.py
+++ b/wafer/users/forms.py
@@ -1,5 +1,6 @@
 from django import forms
 from django.contrib.auth import get_user_model
+from django.contrib.auth.models import Group
 from django.urls import reverse
 from django.utils.translation import gettext as _
 from django.conf import settings
@@ -10,6 +11,7 @@
 
 from wafer.registration.validators import validate_username
 from wafer.users.models import UserProfile
+from wafer.kv.models import KeyValue
 
 
 class UserForm(forms.ModelForm):
@@ -72,6 +74,27 @@ def __init__(self, *args, **kwargs):
 
         self.helper.add_input(Submit('submit', _('Save')))
 
+    def save(self):
+        """We save the base profile, and then iterate over the
+           keys, adding/updating any new ones"""
+        # We don't currently delete keys that have been blamked,
+        # but perhaps we should.
+        profile = super().save()
+
+        group = Group.objects.get_by_natural_key('Online Profiles')
+
+        for field in settings.SOCIAL_MEDIA_ENTRIES:
+            if self.cleaned_data[field]:
+                profile.kv.get_or_create(group=group, key=field,
+                        defaults={'value': self.cleaned_data[field]})
+
+        for field in settings.CODE_HOSTING_ENTRIES:
+            if self.cleaned_data[field]:
+                profile.kv.get_or_create(group=group, key=field,
+                        defaults={'value': self.cleaned_data[field]})
+
+        return profile
+
     class Meta:
         model = UserProfile
         exclude = ('user', 'kv')

From 7d78d6c74888376500acda139a86b72cec9c6939 Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Sun, 8 Oct 2023 15:40:46 +0200
Subject: [PATCH 10/24] Add a group for the profle kvs

---
 wafer/management/commands/wafer_add_default_groups.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wafer/management/commands/wafer_add_default_groups.py b/wafer/management/commands/wafer_add_default_groups.py
index 0afd1ce4..252eeea8 100644
--- a/wafer/management/commands/wafer_add_default_groups.py
+++ b/wafer/management/commands/wafer_add_default_groups.py
@@ -30,6 +30,7 @@ class Command(BaseCommand):
             ('talks', 'view_all_talks'),
         ),
         'Registration': (),
+        'Online Profiles': (),
     }
 
     def add_wafer_groups(self):

From 4bb4a18c60433eb4d5ae338e74dbd1a939bbeb16 Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Sun, 8 Oct 2023 15:41:12 +0200
Subject: [PATCH 11/24] drop unused import

---
 wafer/users/forms.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/wafer/users/forms.py b/wafer/users/forms.py
index 07fa18e1..a9a87f32 100644
--- a/wafer/users/forms.py
+++ b/wafer/users/forms.py
@@ -11,7 +11,6 @@
 
 from wafer.registration.validators import validate_username
 from wafer.users.models import UserProfile
-from wafer.kv.models import KeyValue
 
 
 class UserForm(forms.ModelForm):

From f48846b6bde3aec454609d07402dc63ded51e384 Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Sun, 8 Oct 2023 15:41:25 +0200
Subject: [PATCH 12/24] Hack in some rendering

---
 .../wafer.users/snippets/profile_20-bio.html  |  6 +++++
 wafer/users/views.py                          | 22 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/wafer/users/templates/wafer.users/snippets/profile_20-bio.html b/wafer/users/templates/wafer.users/snippets/profile_20-bio.html
index aad01fe6..9aacae51 100644
--- a/wafer/users/templates/wafer.users/snippets/profile_20-bio.html
+++ b/wafer/users/templates/wafer.users/snippets/profile_20-bio.html
@@ -38,6 +38,12 @@ <h1>
           </h1>
         {% endblock name %}
         {% block social %}
+        {% for tag, site_url in social_sites.items %}
+          <p><b>{{ tag }}</b>: {{ site_url }}</p>
+        {% endfor %}
+        {% for tag, site_url in code_sites.items %}
+          <p><b>{{ tag }}</b>: {{ site_url }}</p>
+        {% endfor %}
         {% endblock social %}
         {% endspaceless %}
       </div>
diff --git a/wafer/users/views.py b/wafer/users/views.py
index 553bb576..d0ce54a4 100644
--- a/wafer/users/views.py
+++ b/wafer/users/views.py
@@ -2,7 +2,7 @@
 
 from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser
+from django.contrib.auth.models import AnonymousUser, Group
 from django.core.exceptions import PermissionDenied
 from django.http import Http404
 from django.urls import reverse
@@ -91,6 +91,26 @@ def get_object(self, *args, **kwargs):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['can_edit'] = self.can_edit(context['object'])
+        # Add social and code profile info
+        group = Group.objects.get_by_natural_key('Online Profiles')
+
+        context['social_sites'] = {}
+        context['code_sites'] = {}
+
+        profile = self.get_object().userprofile
+
+        for field in settings.SOCIAL_MEDIA_ENTRIES:
+            if profile.kv.filter(group=group, key=field).exists():
+                value = profile.kv.get(group=group, key=field).value
+                if value:
+                    context['social_sites'][settings.SOCIAL_MEDIA_ENTRIES[field]] = value
+
+        for field in settings.CODE_HOSTING_ENTRIES:
+            if profile.kv.filter(group=group, key=field).exists():
+                value = profile.kv.get(group=group, key=field).value
+                if value:
+                    context['code_sites'][settings.CODE_HOSTING_ENTRIES[field]] = value
+
         return context
 
     def can_edit(self, user):

From 05daac8708cc6639ba71b723cd010a25dbab98af Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Sun, 8 Oct 2023 15:59:59 +0200
Subject: [PATCH 13/24] Move group helpers into test_utils

---
 wafer/kv/tests/test_kv_api.py | 11 +----------
 wafer/tests/utils.py          |  8 ++++++++
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/wafer/kv/tests/test_kv_api.py b/wafer/kv/tests/test_kv_api.py
index f1a8975d..2b3e455e 100644
--- a/wafer/kv/tests/test_kv_api.py
+++ b/wafer/kv/tests/test_kv_api.py
@@ -1,20 +1,11 @@
 """Tests for wafer.kv api views."""
 
-from django.contrib.auth.models import Group
 from django.test import Client, TestCase
 
 from rest_framework.test import APIClient
 
 from wafer.kv.models import KeyValue
-from wafer.tests.utils import create_user
-
-
-def get_group(group):
-    return Group.objects.get(name=group)
-
-
-def create_group(group):
-    return Group.objects.create(name=group)
+from wafer.tests.utils import create_group, create_user, get_group
 
 
 def create_kv_pair(name, value, group):
diff --git a/wafer/tests/utils.py b/wafer/tests/utils.py
index 9bdac4c9..dd8a5c2c 100644
--- a/wafer/tests/utils.py
+++ b/wafer/tests/utils.py
@@ -4,6 +4,14 @@
 from django.contrib.auth.models import Group, Permission
 
 
+def get_group(group):
+    return Group.objects.get(name=group)
+
+
+def create_group(group):
+    return Group.objects.create(name=group)
+
+
 def create_user(username, email=None, superuser=False, perms=(), groups=()):
     if superuser:
         create = get_user_model().objects.create_superuser

From ce7a47d03322687516caa328f80c2af5c35d133a Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Sun, 8 Oct 2023 16:00:29 +0200
Subject: [PATCH 14/24] Use a common cosntant

---
 wafer/users/forms.py  | 4 ++--
 wafer/users/models.py | 2 ++
 wafer/users/views.py  | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/wafer/users/forms.py b/wafer/users/forms.py
index a9a87f32..21c92abe 100644
--- a/wafer/users/forms.py
+++ b/wafer/users/forms.py
@@ -10,7 +10,7 @@
 from crispy_forms.layout import HTML, Submit
 
 from wafer.registration.validators import validate_username
-from wafer.users.models import UserProfile
+from wafer.users.models import UserProfile, PROFILE_GROUP
 
 
 class UserForm(forms.ModelForm):
@@ -80,7 +80,7 @@ def save(self):
         # but perhaps we should.
         profile = super().save()
 
-        group = Group.objects.get_by_natural_key('Online Profiles')
+        group = Group.objects.get_by_natural_key(PROFILE_GROUP)
 
         for field in settings.SOCIAL_MEDIA_ENTRIES:
             if self.cleaned_data[field]:
diff --git a/wafer/users/models.py b/wafer/users/models.py
index 293fbde6..cc6e22d4 100644
--- a/wafer/users/models.py
+++ b/wafer/users/models.py
@@ -24,6 +24,8 @@
                                 PROVISIONAL, CANCELLED)
 
 
+PROFILE_GROUP = 'Online Profiles'
+
 
 class UserProfile(models.Model):
 
diff --git a/wafer/users/views.py b/wafer/users/views.py
index d0ce54a4..08f71d5c 100644
--- a/wafer/users/views.py
+++ b/wafer/users/views.py
@@ -15,7 +15,7 @@
 from wafer.talks.models import ACCEPTED, CANCELLED
 from wafer.users.forms import UserForm, UserProfileForm
 from wafer.users.serializers import UserSerializer
-from wafer.users.models import UserProfile
+from wafer.users.models import UserProfile, PROFILE_GROUP
 from wafer.utils import PaginatedBuildableListView
 
 log = logging.getLogger(__name__)
@@ -92,7 +92,7 @@ def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['can_edit'] = self.can_edit(context['object'])
         # Add social and code profile info
-        group = Group.objects.get_by_natural_key('Online Profiles')
+        group = Group.objects.get_by_natural_key(PROFILE_GROUP)
 
         context['social_sites'] = {}
         context['code_sites'] = {}

From fee2f5812ceb685d703ea652f41bf06609a77cd1 Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Sun, 8 Oct 2023 16:00:40 +0200
Subject: [PATCH 15/24] Create group in tests so they work

---
 wafer/users/tests/test_views.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wafer/users/tests/test_views.py b/wafer/users/tests/test_views.py
index 55e0b0e3..8a7da11b 100644
--- a/wafer/users/tests/test_views.py
+++ b/wafer/users/tests/test_views.py
@@ -6,9 +6,10 @@
 
 from django.test import Client, TestCase
 
+from wafer.users.models import PROFILE_GROUP
 from wafer.talks.models import ACCEPTED
 from wafer.talks.tests.fixtures import create_talk
-from wafer.tests.utils import create_user, mock_avatar_url
+from wafer.tests.utils import create_group, create_user, mock_avatar_url
 
 
 class UserProfileTests(TestCase):
@@ -17,6 +18,8 @@ def setUp(self):
         # Create 2 users
         create_user('test1')
         create_user('test2')
+        # create kv group
+        create_group(PROFILE_GROUP)
         # And a 3rd, with a talk
         create_talk(title="Test talk", status=ACCEPTED, username='test3')
         self.client = Client()

From aef005b4c4ff2b5cf387d4867690c055b0bd0d74 Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Thu, 12 Oct 2023 18:11:22 +0200
Subject: [PATCH 16/24] Move gettext hints to settings

---
 wafer/settings.py    | 12 ++++++------
 wafer/users/forms.py |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/wafer/settings.py b/wafer/settings.py
index e8fdd7d5..78623a69 100644
--- a/wafer/settings.py
+++ b/wafer/settings.py
@@ -347,15 +347,15 @@
 # FIXME: Validation would be nice
 # These are dictionaries of database/kv key and then friendly text
 SOCIAL_MEDIA_ENTRIES = {
-    'twitter': 'Twitter Profile link',
-    'fediverse': 'Fediverse Profile link',
-    'other': 'other',
+    'twitter': _('Twitter Profile link'),
+    'fediverse': _('Fediverse Profile link'),
+    'other': _('Other Social'),
 }
 
 # List of code hosting sites that can be added to the user profile
 # See above
 CODE_HOSTING_ENTRIES = {
-    'github': 'github profile',
-    'gitlab': 'gitlab profile',
-    'bitbucket': 'bitbucket profile',
+    'github': _('github profile'),
+    'gitlab': _('gitlab profile'),
+    'bitbucket': _('bitbucket profile'),
 }
diff --git a/wafer/users/forms.py b/wafer/users/forms.py
index 21c92abe..9f35ec38 100644
--- a/wafer/users/forms.py
+++ b/wafer/users/forms.py
@@ -45,13 +45,13 @@ def __init__(self, *args, **kwargs):
         # currently everything I'm asking for is an url, and this adds some
         # validation - we may need to revisit this later
         for field_name in settings.SOCIAL_MEDIA_ENTRIES:
-            self.fields[field_name] = forms.URLField(label=_(settings.SOCIAL_MEDIA_ENTRIES[field_name]), 
+            self.fields[field_name] = forms.URLField(label=settings.SOCIAL_MEDIA_ENTRIES[field_name], 
                                                      max_length=1024, required=False)
 
         pre_code_index = len(self.fields)
 
         for field_name in settings.CODE_HOSTING_ENTRIES:
-            self.fields[field_name] = forms.URLField(label=_(settings.CODE_HOSTING_ENTRIES[field_name]),
+            self.fields[field_name] = forms.URLField(label=settings.CODE_HOSTING_ENTRIES[field_name],
                                                     max_length=1024, required=False)
 
         self.helper = FormHelper(self)

From b275c7dd860065d7d236d1c06b2926d99024cbd7 Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Thu, 12 Oct 2023 18:13:42 +0200
Subject: [PATCH 17/24] Wrap profile headers in translation markers

---
 wafer/users/forms.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/wafer/users/forms.py b/wafer/users/forms.py
index 9f35ec38..58214403 100644
--- a/wafer/users/forms.py
+++ b/wafer/users/forms.py
@@ -64,12 +64,11 @@ def __init__(self, *args, **kwargs):
         # We do this in this order to avoid needing to do
         # more maths
         if settings.CODE_HOSTING_ENTRIES:
-            self.helper.layout.insert(pre_code_index, HTML('<p>Code</p>'))
+            self.helper.layout.insert(pre_code_index, HTML(_('<p>Code Hosting Profiles</p>')))
 
         # Add social media header
         if settings.SOCIAL_MEDIA_ENTRIES:
-            self.helper.layout.insert(pre_social_index, HTML('<p>Socail</p>'))
-
+            self.helper.layout.insert(pre_social_index, HTML(_('<p>Social Profiles</p>')))
 
         self.helper.add_input(Submit('submit', _('Save')))
 

From 9b9e8803d08cfb9ddbd616b8b2c0c6a11edf6e1d Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Thu, 12 Oct 2023 18:16:22 +0200
Subject: [PATCH 18/24] Rename migration to be clearer

---
 ...ns_and_more.py => 0004_remove_obselete_userprofile_entries.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename wafer/users/migrations/{0004_alter_userprofile_options_and_more.py => 0004_remove_obselete_userprofile_entries.py} (100%)

diff --git a/wafer/users/migrations/0004_alter_userprofile_options_and_more.py b/wafer/users/migrations/0004_remove_obselete_userprofile_entries.py
similarity index 100%
rename from wafer/users/migrations/0004_alter_userprofile_options_and_more.py
rename to wafer/users/migrations/0004_remove_obselete_userprofile_entries.py

From 8ff12ccf9ec3c5e55168ced0f44799221149121f Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Thu, 12 Oct 2023 18:49:52 +0200
Subject: [PATCH 19/24] Rework github sso to use simlar kv implementation to
 GitLab

Needed since we've dropped the github_username profile attribute.
---
 wafer/registration/sso.py | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/wafer/registration/sso.py b/wafer/registration/sso.py
index fbfb0a14..3c5c62aa 100644
--- a/wafer/registration/sso.py
+++ b/wafer/registration/sso.py
@@ -119,22 +119,28 @@ def github_sso(code):
             log.warning('Error extracting github email address: %s', e)
             raise SSOError('Failed to obtain email address from GitHub')
 
-    profile_fields = {
-        'github_username': login,
-    }
+    # TODO: Extend this to also set the github profile url KV
+    profile_fields = {}
     if 'blog' in gh:
         profile_fields['blog'] = gh['blog']
 
-    try:
-        user = get_user_model().objects.get(userprofile__github_username=login)
-    except MultipleObjectsReturned:
-        log.warning('Multiple accounts have GitHub username %s', login)
-        raise SSOError('Multiple accounts have GitHub username %s' % login)
-    except ObjectDoesNotExist:
-        user = None
+    group = Group.objects.get_by_natural_key('Registration')
+    user = None
+
+    for kv in KeyValue.objects.filter(
+            group=group, key='github_sso_account_id', value=login,
+            userprofile__isnull=False):
+        if kv.userprofile_set.count() > 1:
+            message = 'Multiple accounts have the same GitHub username %s'
+            log.warning(message, login)
+            raise SSOError(message % login)
+        user = kv.userprofile_set.first().user
+        break
 
     user = sso(user=user, desired_username=login, name=name, email=email,
                profile_fields=profile_fields)
+    user.userprofile.kv.get_or_create(group=group, key='github_sso_account_id',
+                                      defaults={'value': login})
     return user
 
 

From b95086c57c96f7dbe5a6c3f53c77441ea0e2b87a Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Fri, 13 Oct 2023 14:16:44 +0200
Subject: [PATCH 20/24] rework duplicate entry checks

---
 wafer/registration/sso.py | 59 ++++++++++++++++++++++++++++-----------
 1 file changed, 43 insertions(+), 16 deletions(-)

diff --git a/wafer/registration/sso.py b/wafer/registration/sso.py
index 3c5c62aa..9a804771 100644
--- a/wafer/registration/sso.py
+++ b/wafer/registration/sso.py
@@ -78,6 +78,28 @@ def _configure_user(user, name, email, profile_fields):
     profile.save()
 
 
+def _check_count(kv_search):
+    """Return the number of matches found.
+
+       We need to check for two possible sources of duplicates which
+       will make us unable to uniquely identify the user:
+         1) Multiple different KeyValues created with the same value
+         2) Multiple user profiles assigned to the same KeyValue
+       Both errors should require something strange to have happened - importing data
+       into an existing database, weird API interactions, etc -, but we
+       don't want to allow incorrect access to an existing account.
+       """
+    if kv_search.count() > 1:
+        # Multiple KeyValues
+        return kv_search.count()
+    if kv_search.count() == 1:
+        # Could have multiple user profiles
+        # Will be 1 in the case of a unique match, which is what we want
+        return kv_search[0].userprofile_set.count()
+    # No matches
+    return 0
+
+
 def github_sso(code):
     r = requests.post(
         'https://github.com/login/oauth/access_token', data={
@@ -127,15 +149,17 @@ def github_sso(code):
     group = Group.objects.get_by_natural_key('Registration')
     user = None
 
-    for kv in KeyValue.objects.filter(
+    kv_search = KeyValue.objects.filter(
             group=group, key='github_sso_account_id', value=login,
-            userprofile__isnull=False):
-        if kv.userprofile_set.count() > 1:
-            message = 'Multiple accounts have the same GitHub username %s'
-            log.warning(message, login)
-            raise SSOError(message % login)
-        user = kv.userprofile_set.first().user
-        break
+            userprofile__isnull=False)
+    count = _check_count(kv_search)
+    if count > 1:
+        message = 'Multiple accounts have the same GitHub SSO id: %s'
+        log.warning(message, login)
+        raise SSOError(message % login)
+
+    if count:
+        user = kv_search[0].userprofile_set.first().user
 
     user = sso(user=user, desired_username=login, name=name, email=email,
                profile_fields=profile_fields)
@@ -178,15 +202,18 @@ def gitlab_sso(code, redirect_uri):
 
     group = Group.objects.get_by_natural_key('Registration')
     user = None
-    for kv in KeyValue.objects.filter(
+    kv_search = KeyValue.objects.filter(
             group=group, key='gitlab_sso_account_id', value=gl['id'],
-            userprofile__isnull=False):
-        if kv.userprofile_set.count() > 1:
-            message = 'Multiple accounts have GitLab SSOed for User ID %s'
-            log.warning(message, gl['id'])
-            raise SSOError(message % gl['id'])
-        user = kv.userprofile_set.first().user
-        break
+            userprofile__isnull=False)
+
+    count = _check_count(kv_search)
+    if count > 1:
+        message = 'Multiple accounts have GitLab SSOed for User ID %s'
+        log.warning(message, gl['id'])
+        raise SSOError(message % gl['id'])
+
+    if count:
+        user = kv_search[0].userprofile_set.first().user
 
     user = sso(user=user, desired_username=username, name=name, email=email)
     user.userprofile.kv.get_or_create(group=group, key='gitlab_sso_account_id',

From 91d9e8872ad7dcaafda11e3e663bf0ff83a707ac Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Fri, 13 Oct 2023 14:17:03 +0200
Subject: [PATCH 21/24] Add some simple tests on SSO behaviour

---
 wafer/registration/tests/__init__.py |   0
 wafer/registration/tests/test_sso.py | 199 +++++++++++++++++++++++++++
 2 files changed, 199 insertions(+)
 create mode 100644 wafer/registration/tests/__init__.py
 create mode 100644 wafer/registration/tests/test_sso.py

diff --git a/wafer/registration/tests/__init__.py b/wafer/registration/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/wafer/registration/tests/test_sso.py b/wafer/registration/tests/test_sso.py
new file mode 100644
index 00000000..f09cc673
--- /dev/null
+++ b/wafer/registration/tests/test_sso.py
@@ -0,0 +1,199 @@
+"""Basic tests for the SSO behaviour
+
+These tests mock out the actual SSO interactions and only
+test that accounts are created correctly and some of the
+error paths"""
+
+
+import mock
+
+from django.test import TestCase
+from django.contrib.auth import get_user_model
+
+from wafer.tests.utils import create_group, create_user
+
+from wafer.registration.sso import github_sso, gitlab_sso, SSOError
+from wafer.kv.models import KeyValue
+
+
+# Helper classes for mocking request calls
+class SSOPost:
+
+    def __init__(self, status_code, access_token):
+        self.status_code = status_code
+        self.access_token = access_token
+
+    def json(self):
+        return {'access_token': self.access_token}
+
+class SSOGet:
+
+    def __init__(self, status_code, username, name, email):
+        self.status_code = status_code
+        self.username = username
+        self.name = name
+        self.email = email
+
+    def json(self):
+        # We duplicate username, id and login so we can use this for
+        # both gitlab and github
+        json = {
+            'login': self.username,
+            'username': self.username,
+            'id': self.username,
+            'name': self.name,
+        }
+        # We allow a null email address to remove the field for
+        # testing error cases
+        if self.email:
+            json['email'] = self.email
+        return json
+
+
+class RegistrationSSOTests(TestCase):
+
+    def setUp(self):
+        self.reg_group = create_group('Registration')
+
+    @mock.patch('requests.post', new=lambda x, **kw: SSOPost(status_code=200, access_token='aaaa'))
+    @mock.patch('requests.get', new=lambda x, **kw: SSOGet(status_code=200, username='joe',
+                                                          name='Joe Soap', email='joe@nowhere.test'))
+    def test_github_success(self):
+        """Test that a successful github auth call creates the user and
+           sets the right values"""
+        # Check that no user currently exists
+        self.assertEqual(get_user_model().objects.filter(username='joe').count(), 0)
+        with self.settings(WAFER_GITHUB_CLIENT_ID='testy', WAFER_GITHUB_CLIENT_SECRET='abc'):
+            user = github_sso('abcde')
+        self.assertEqual(user.username, 'joe')
+        self.assertEqual(user.first_name, 'Joe')
+        self.assertEqual(user.last_name, 'Soap')
+        self.assertEqual(user.email, 'joe@nowhere.test')
+
+        kv = KeyValue.objects.filter(group=self.reg_group, key="github_sso_account_id").get()
+        self.assertEqual(kv.value, user.username)
+
+        # Check that calling this again gives the same user back
+        with self.settings(WAFER_GITHUB_CLIENT_ID='testy', WAFER_GITHUB_CLIENT_SECRET='abc'):
+            user2 = github_sso('abcde')
+
+        self.assertEqual(user, user2)
+        # Check we only created 1 user
+        self.assertEqual(get_user_model().objects.filter(username='joe').count(), 1)
+
+    def test_github_fail(self):
+        """Test that a failed github auth call doesn't create a user"""
+        # Test incorrect code response
+        cur_users = get_user_model().objects.count()
+        with (self.assertRaises(SSOError) as cm,
+                self.settings(WAFER_GITHUB_CLIENT_ID='testy', WAFER_GITHUB_CLIENT_SECRET='abc'),
+                mock.patch('requests.post', new=lambda x, **kw: SSOPost(status_code=333, access_token='aaaa'))):
+            user = github_sso('abcde')
+        self.assertTrue('Invalid code' in str(cm.exception))
+        self.assertEqual(cur_users, get_user_model().objects.count())
+
+        # Test auth token response failure
+        with (self.assertRaises(SSOError) as cm,
+                self.settings(WAFER_GITHUB_CLIENT_ID='testy', WAFER_GITHUB_CLIENT_SECRET='abc'),
+                mock.patch('requests.post', new=lambda x, **kw: SSOPost(status_code=200, access_token='aaaa')),
+                mock.patch('requests.get', new=lambda x, **kw: SSOGet(status_code=333, username='github_dup',
+                                                                      name='Joe Soap', email='joe@nowhere.test'))):
+            user = github_sso('abcde')
+        self.assertTrue('Failed response from GitHub' in str(cm.exception))
+        self.assertEqual(cur_users, get_user_model().objects.count())
+
+    @mock.patch('requests.post', new=lambda x, **kw: SSOPost(status_code=200, access_token='aaaa'))
+    @mock.patch('requests.get', new=lambda x, **kw: SSOGet(status_code=200, username='github_dup',
+                                                           name='Joe Soap', email='joe@nowhere.test'))
+    def test_github_duplicate(self):
+        """Test that we get the expected error message if someone tries
+           to reuse the github username for sso"""
+        # This tests multiple KeyValues with the same data
+        dup1 = create_user('github_dup1')
+        dup1.userprofile.kv.get_or_create(group=self.reg_group,
+                                          key='github_sso_account_id',
+                                          defaults={'value': 'github_dup'})
+        dup2 = create_user('github_dup2')
+        dup2.userprofile.kv.get_or_create(group=self.reg_group,
+                                          key='github_sso_account_id',
+                                          defaults={'value': 'github_dup'})
+        with (self.assertRaises(SSOError) as cm, self.settings(WAFER_GITHUB_CLIENT_ID='testy', WAFER_GITHUB_CLIENT_SECRET='abcd')):
+            user = github_sso('abcdef')
+        exception = cm.exception
+        self.assertTrue('Multiple accounts have the same GitHub' in str(exception))
+
+    @mock.patch('requests.post', new=lambda x, **kw: SSOPost(status_code=200, access_token='aaaa'))
+    @mock.patch('requests.get', new=lambda x, **kw: SSOGet(status_code=200, username='joe2',
+                                                           name='Joe2 Soap', email='joe2@nowhere.test'))
+    def test_gitlab_success(self):
+        """Test that a successful gitlab auth call creates the user and
+           sets the right values"""
+        # Check that no user currently exists
+        self.assertEqual(get_user_model().objects.filter(username='joe2').count(), 0)
+        with self.settings(WAFER_GITLAB_CLIENT_ID='testy', WAFER_GITLAB_CLIENT_SECRET='abc'):
+            user = gitlab_sso('abcde', 'http://localhost/')
+        self.assertEqual(user.username, 'joe2')
+        self.assertEqual(user.first_name, 'Joe2')
+        self.assertEqual(user.last_name, 'Soap')
+        self.assertEqual(user.email, 'joe2@nowhere.test')
+
+        kv = KeyValue.objects.filter(group=self.reg_group, key="gitlab_sso_account_id").get()
+        self.assertEqual(kv.value, user.username)
+
+        # Check that calling this again gives the same user back
+        with self.settings(WAFER_GITLAB_CLIENT_ID='testy', WAFER_GITLAB_CLIENT_SECRET='abc'):
+            user2 = gitlab_sso('abcde', 'http://localhost/')
+
+        self.assertEqual(user, user2)
+        # Check we only created 1 user
+        self.assertEqual(get_user_model().objects.filter(username='joe2').count(), 1)
+
+    def test_gitlab_fail(self):
+        """Test that a failed gitlab auth call doesn't create a user"""
+        # Test incorrect code response
+        cur_users = get_user_model().objects.count()
+        with (self.assertRaises(SSOError) as cm,
+                self.settings(WAFER_GITLAB_CLIENT_ID='testy', WAFER_GITLAB_CLIENT_SECRET='abc'),
+                mock.patch('requests.post', new=lambda x, **kw: SSOPost(status_code=333, access_token='aaaa'))):
+            user = gitlab_sso('abcde', 'http://localhost/')
+        self.assertTrue('Invalid code' in str(cm.exception))
+        self.assertEqual(cur_users, get_user_model().objects.count())
+
+        # Test auth token response failure
+        with (self.assertRaises(SSOError) as cm,
+                self.settings(WAFER_GITLAB_CLIENT_ID='testy', WAFER_GITLAB_CLIENT_SECRET='abc'),
+                mock.patch('requests.post', new=lambda x, **kw: SSOPost(status_code=200, access_token='aaaa')),
+                mock.patch('requests.get', new=lambda x, **kw: SSOGet(status_code=333, username='github_dup',
+                                                                      name='Joe Soap', email='joe@nowhere.test'))):
+            user = gitlab_sso('abcde', 'http://localhost/')
+        self.assertTrue('Failed response from GitLab' in str(cm.exception))
+        self.assertEqual(cur_users, get_user_model().objects.count())
+        # Test profile error
+        with (self.assertRaises(SSOError) as cm,
+                self.settings(WAFER_GITLAB_CLIENT_ID='testy', WAFER_GITLAB_CLIENT_SECRET='abc'),
+                mock.patch('requests.post', new=lambda x, **kw: SSOPost(status_code=200, access_token='aaaa')),
+                mock.patch('requests.get', new=lambda x, **kw: SSOGet(status_code=200, username='github_dup',
+                                                                      name='Joe Soap', email=None))):
+            user = gitlab_sso('abcde', 'http://localhost/')
+        self.assertEqual('GitLab profile missing required content', str(cm.exception))
+        self.assertEqual(cur_users, get_user_model().objects.count())
+
+    @mock.patch('requests.post', new=lambda x, **kw: SSOPost(status_code=200, access_token='aaaa'))
+    @mock.patch('requests.get', new=lambda x, **kw: SSOGet(status_code=200, username='dup2',
+                                                           name='Joe2 Soap', email='joe2@nowhere.test'))
+    def test_gitlab_duplicate(self):
+        """Test that we get the expected error message if someone tries
+           to reuse the gitlab username for sso"""
+        # Thi tests mulitple users sharing a single KeyValue entry
+        dup1 = create_user('gitlab_dup1')
+        dup1.userprofile.kv.get_or_create(group=self.reg_group,
+                                          key='gitlab_sso_account_id',
+                                          defaults={'value': 'dup2'})
+        dup2 = create_user('gitlab_dup2')
+        kv = KeyValue.objects.filter(group=self.reg_group, key='gitlab_sso_account_id', value='dup2').get()
+        kv.userprofile_set.add(dup2.userprofile)
+        with (self.assertRaises(SSOError) as cm, self.settings(WAFER_GITLAB_CLIENT_ID='testy', WAFER_GITLAB_CLIENT_SECRET='abcd')):
+            gitlab_sso('abcdef', 'http://localhost/')
+        exception = cm.exception
+        self.assertTrue('Multiple accounts have GitLab' in str(exception))
+

From 30f22fdf6546e6aafa485bf3274a3a726633c62e Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Fri, 13 Oct 2023 15:18:48 +0200
Subject: [PATCH 22/24] Add simple tests for key-value entries in the profile

---
 wafer/users/tests/test_forms.py | 56 +++++++++++++++++++++++++++
 wafer/users/tests/test_views.py | 68 ++++++++++++++++++++++++++++++++-
 2 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 wafer/users/tests/test_forms.py

diff --git a/wafer/users/tests/test_forms.py b/wafer/users/tests/test_forms.py
new file mode 100644
index 00000000..5d5e9d28
--- /dev/null
+++ b/wafer/users/tests/test_forms.py
@@ -0,0 +1,56 @@
+"""Test user profile forms, especially the content influenced by settings"""
+
+from django.test import Client, TestCase
+from wafer.tests.utils import create_group, create_user
+from wafer.users.models import PROFILE_GROUP
+from wafer.kv.models import KeyValue
+
+
+class UserProfileFormContentTests(TestCase):
+
+    def setUp(self):
+        self.user1 = create_user('test1')
+        self.group = create_group(PROFILE_GROUP)
+        self.client = Client()
+
+    def test_entires(self):
+        """Test that all the fields in the settings show up as expected"""
+        self.client.login(username='test1', password='test1_password')
+        with self.settings(CODE_HOSTING_ENTRIES={'gitlab': 'GitLab', 'github': 'GitHub'},
+                           SOCIAL_MEDIA_ENTRIES={'twitter': 'Twitter', 'fedivere': 'Fediverse'}):
+            form = self.client.get('/users/test1/edit_profile/').content
+            self.assertTrue(b'Twitter' in form)
+            self.assertTrue(b'Fediverse' in form)
+            self.assertTrue(b'GitLab' in form)
+            self.assertTrue(b'GitHub' in form)
+
+        # Test with a reduced set
+        with self.settings(CODE_HOSTING_ENTRIES={'gitlab': 'GitLab'},
+                           SOCIAL_MEDIA_ENTRIES={'twitter': 'Twitter'}):
+            form = self.client.get('/users/test1/edit_profile/').content
+            self.assertTrue(b'Twitter' in form)
+            self.assertTrue(b'Fediverse' not in form)
+            self.assertTrue(b'GitLab' in form)
+            self.assertTrue(b'GitHub' not in form)
+
+    def test_save(self):
+        """Test that saving a form adds the data correctly"""
+        self.client.login(username='test1', password='test1_password')
+        with self.settings(CODE_HOSTING_ENTRIES={'gitlab': 'GitLab', 'github': 'GitHub'},
+                           SOCIAL_MEDIA_ENTRIES={'twitter': 'Twitter', 'fediverse': 'Fediverse'}):
+            self.client.post('/users/test1/edit_profile/',
+                data={'bio': 'A bio',
+                      'twitter': 'https://twitter.com/test',
+                      'fediverse': 'https://myserver.test/test',
+                      'github': 'https://github.com/test'})
+            self.assertEqual(KeyValue.objects.filter(group=self.group, key='twitter').count(), 1)
+            self.assertEqual(KeyValue.objects.filter(group=self.group, key='fediverse').count(), 1)
+            self.assertEqual(KeyValue.objects.filter(group=self.group, key='github').count(), 1)
+            self.assertEqual(KeyValue.objects.filter(group=self.group, key='gitlab').count(), 0)
+
+            kv = KeyValue.objects.filter(group=self.group, key='twitter').get()
+            self.assertEqual(kv.value, 'https://twitter.com/test')
+            kv = KeyValue.objects.filter(group=self.group, key='github').get()
+            self.assertEqual(kv.value, 'https://github.com/test')
+            kv = KeyValue.objects.filter(group=self.group, key='fediverse').get()
+            self.assertEqual(kv.value, 'https://myserver.test/test')
diff --git a/wafer/users/tests/test_views.py b/wafer/users/tests/test_views.py
index 8a7da11b..bafefda1 100644
--- a/wafer/users/tests/test_views.py
+++ b/wafer/users/tests/test_views.py
@@ -12,7 +12,8 @@
 from wafer.tests.utils import create_group, create_user, mock_avatar_url
 
 
-class UserProfileTests(TestCase):
+class UserProfilePermissionTests(TestCase):
+    """Tests the various permission models for the profile view"""
 
     def setUp(self):
         # Create 2 users
@@ -132,3 +133,68 @@ def test_logged_in_pulic_userlist(self):
             self.assertEqual(response.status_code, 404)
             response = self.client.get('/users/does_not_exist/edit_profile/')
             self.assertEqual(response.status_code, 404)
+
+
+class UserProfileViewTests(TestCase):
+    """Test the dynamic content influence by settings"""
+
+    def setUp(self):
+        # Create 2 users
+        user1 = create_user('test1')
+        user2 = create_user('test2')
+        # create kv group
+        group = create_group(PROFILE_GROUP)
+        self.client = Client()
+
+        # Create some entries
+        user1.userprofile.kv.get_or_create(group=group, key='github',
+                defaults={'value': 'https://github.com/aaa'})
+        user1.userprofile.kv.get_or_create(group=group, key='gitlab',
+                defaults={'value': 'https://gitlab.com/aaa'})
+        user1.userprofile.kv.get_or_create(group=group, key='twitter',
+                defaults={'value': 'https://twitter.com/aaa'})
+        user1.userprofile.kv.get_or_create(group=group, key='fediverse',
+                defaults={'value': 'https://myserver.org/fediverse/aaa'})
+        user2.userprofile.kv.get_or_create(group=group, key='github',
+                defaults={'value': 'https://github.com/bbb'})
+        user2.userprofile.kv.get_or_create(group=group, key='twitter',
+                defaults={'value': 'https://twitter.com/bbb'})
+
+    @mock.patch('wafer.users.models.UserProfile.avatar_url', mock_avatar_url)
+    def test_social_entries(self):
+        # Test that we see the expected results with the default setting
+        user1_view = self.client.get('/users/test1/').content
+        self.assertTrue(b'https://twitter.com/aaa' in user1_view)
+        self.assertTrue(b'https://myserver.org/fediverse/aaa' in user1_view)
+        self.assertTrue(b'https://twitter.com/bbb' not in user1_view)
+
+        user2_view = self.client.get('/users/test2/').content
+        self.assertTrue(b'https://twitter.com/bbb' in user2_view)
+        self.assertTrue(b'https://twitter.com/aaa' not in user2_view)
+        # Test that removing twitter from the settings results in it not being rendered,
+        with self.settings(SOCIAL_MEDIA_ENTRIES={'fediverse': 'Fediverse'}):
+            user1_view = self.client.get('/users/test1/').content
+            self.assertTrue(b'https://twitter.com/aaa' not in user1_view)
+            self.assertTrue(b'https://myserver.org/fediverse/aaa' in user1_view)
+
+            user2_view = self.client.get('/users/test2/').content
+            self.assertTrue(b'https://twitter.com/bbb' not in user2_view)
+
+    @mock.patch('wafer.users.models.UserProfile.avatar_url', mock_avatar_url)
+    def test_code_entries(self):
+        user1_view = self.client.get('/users/test1/').content
+        self.assertTrue(b'https://github.com/aaa' in user1_view)
+        self.assertTrue(b'https://gitlab.com/aaa' in user1_view)
+        self.assertTrue(b'https://github.com/bbb' not in user1_view)
+
+        user2_view = self.client.get('/users/test2/').content
+        self.assertTrue(b'https://github.com/bbb' in user2_view)
+        self.assertTrue(b'https://github.com/aaa' not in user2_view)
+        # Test that removing twitter from the settings results in it not being rendered,
+        with self.settings(CODE_HOSTING_ENTRIES={'gitlab': 'GitLab'}):
+            user1_view = self.client.get('/users/test1/').content
+            self.assertTrue(b'https://github.com/aaa' not in user1_view)
+            self.assertTrue(b'https://gitlab.com/aaa' in user1_view)
+
+            user2_view = self.client.get('/users/test2/').content
+            self.assertTrue(b'https://github.com/bbb' not in user2_view)

From f3e3450618ca88fc13bdfb5a071ed95b3fdc23b8 Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Fri, 13 Oct 2023 16:05:48 +0200
Subject: [PATCH 23/24] Don't use 3.10+ syntax for nested context managers

---
 wafer/registration/tests/test_sso.py | 72 ++++++++++++++++------------
 1 file changed, 42 insertions(+), 30 deletions(-)

diff --git a/wafer/registration/tests/test_sso.py b/wafer/registration/tests/test_sso.py
index f09cc673..9d7d3c2c 100644
--- a/wafer/registration/tests/test_sso.py
+++ b/wafer/registration/tests/test_sso.py
@@ -85,20 +85,24 @@ def test_github_fail(self):
         """Test that a failed github auth call doesn't create a user"""
         # Test incorrect code response
         cur_users = get_user_model().objects.count()
-        with (self.assertRaises(SSOError) as cm,
-                self.settings(WAFER_GITHUB_CLIENT_ID='testy', WAFER_GITHUB_CLIENT_SECRET='abc'),
-                mock.patch('requests.post', new=lambda x, **kw: SSOPost(status_code=333, access_token='aaaa'))):
-            user = github_sso('abcde')
+        # We use the nested syntax to have something legible that supports Python < 3.10
+        with self.assertRaises(SSOError) as cm:
+            with self.settings(WAFER_GITHUB_CLIENT_ID='testy', WAFER_GITHUB_CLIENT_SECRET='abc'):
+                with mock.patch('requests.post', new=lambda x, **kw: SSOPost(status_code=333, access_token='aaaa')):
+                    user = github_sso('abcde')
         self.assertTrue('Invalid code' in str(cm.exception))
         self.assertEqual(cur_users, get_user_model().objects.count())
 
         # Test auth token response failure
-        with (self.assertRaises(SSOError) as cm,
-                self.settings(WAFER_GITHUB_CLIENT_ID='testy', WAFER_GITHUB_CLIENT_SECRET='abc'),
-                mock.patch('requests.post', new=lambda x, **kw: SSOPost(status_code=200, access_token='aaaa')),
-                mock.patch('requests.get', new=lambda x, **kw: SSOGet(status_code=333, username='github_dup',
-                                                                      name='Joe Soap', email='joe@nowhere.test'))):
-            user = github_sso('abcde')
+        with self.assertRaises(SSOError) as cm:
+            with self.settings(WAFER_GITHUB_CLIENT_ID='testy', WAFER_GITHUB_CLIENT_SECRET='abc'):
+                with mock.patch('requests.post', new=lambda x, **kw: SSOPost(status_code=200, 
+                                                                             access_token='aaaa')):
+                    with mock.patch('requests.get', new=lambda x, **kw: SSOGet(status_code=333,
+                                                                               username='github_dup',
+                                                                               name='Joe Soap',
+                                                                               email='joe@no.test')):
+                        user = github_sso('abcde')
         self.assertTrue('Failed response from GitHub' in str(cm.exception))
         self.assertEqual(cur_users, get_user_model().objects.count())
 
@@ -117,8 +121,9 @@ def test_github_duplicate(self):
         dup2.userprofile.kv.get_or_create(group=self.reg_group,
                                           key='github_sso_account_id',
                                           defaults={'value': 'github_dup'})
-        with (self.assertRaises(SSOError) as cm, self.settings(WAFER_GITHUB_CLIENT_ID='testy', WAFER_GITHUB_CLIENT_SECRET='abcd')):
-            user = github_sso('abcdef')
+        with self.assertRaises(SSOError) as cm:
+            with self.settings(WAFER_GITHUB_CLIENT_ID='testy', WAFER_GITHUB_CLIENT_SECRET='abcd'):
+                user = github_sso('abcdef')
         exception = cm.exception
         self.assertTrue('Multiple accounts have the same GitHub' in str(exception))
 
@@ -152,29 +157,35 @@ def test_gitlab_fail(self):
         """Test that a failed gitlab auth call doesn't create a user"""
         # Test incorrect code response
         cur_users = get_user_model().objects.count()
-        with (self.assertRaises(SSOError) as cm,
-                self.settings(WAFER_GITLAB_CLIENT_ID='testy', WAFER_GITLAB_CLIENT_SECRET='abc'),
-                mock.patch('requests.post', new=lambda x, **kw: SSOPost(status_code=333, access_token='aaaa'))):
-            user = gitlab_sso('abcde', 'http://localhost/')
+        with self.assertRaises(SSOError) as cm:
+            with self.settings(WAFER_GITLAB_CLIENT_ID='testy', WAFER_GITLAB_CLIENT_SECRET='abc'):
+                with mock.patch('requests.post', new=lambda x, **kw: SSOPost(status_code=333,
+                                                                             access_token='aaaa')):
+                    user = gitlab_sso('abcde', 'http://localhost/')
         self.assertTrue('Invalid code' in str(cm.exception))
         self.assertEqual(cur_users, get_user_model().objects.count())
 
         # Test auth token response failure
-        with (self.assertRaises(SSOError) as cm,
-                self.settings(WAFER_GITLAB_CLIENT_ID='testy', WAFER_GITLAB_CLIENT_SECRET='abc'),
-                mock.patch('requests.post', new=lambda x, **kw: SSOPost(status_code=200, access_token='aaaa')),
-                mock.patch('requests.get', new=lambda x, **kw: SSOGet(status_code=333, username='github_dup',
-                                                                      name='Joe Soap', email='joe@nowhere.test'))):
-            user = gitlab_sso('abcde', 'http://localhost/')
+        with self.assertRaises(SSOError) as cm:
+            with self.settings(WAFER_GITLAB_CLIENT_ID='testy', WAFER_GITLAB_CLIENT_SECRET='abc'):
+                with mock.patch('requests.post', new=lambda x, **kw: SSOPost(status_code=200,
+                                                                             access_token='aaaa')):
+                    with mock.patch('requests.get', new=lambda x, **kw: SSOGet(status_code=333,
+                                                                               username='github_dup',
+                                                                               name='Joe Soap',
+                                                                               email='joe@nowhere.test')):
+                        user = gitlab_sso('abcde', 'http://localhost/')
         self.assertTrue('Failed response from GitLab' in str(cm.exception))
         self.assertEqual(cur_users, get_user_model().objects.count())
         # Test profile error
-        with (self.assertRaises(SSOError) as cm,
-                self.settings(WAFER_GITLAB_CLIENT_ID='testy', WAFER_GITLAB_CLIENT_SECRET='abc'),
-                mock.patch('requests.post', new=lambda x, **kw: SSOPost(status_code=200, access_token='aaaa')),
-                mock.patch('requests.get', new=lambda x, **kw: SSOGet(status_code=200, username='github_dup',
-                                                                      name='Joe Soap', email=None))):
-            user = gitlab_sso('abcde', 'http://localhost/')
+        with self.assertRaises(SSOError) as cm:
+            with self.settings(WAFER_GITLAB_CLIENT_ID='testy', WAFER_GITLAB_CLIENT_SECRET='abc'):
+                with mock.patch('requests.post', new=lambda x, **kw: SSOPost(status_code=200, access_token='aaaa')):
+                    with mock.patch('requests.get', new=lambda x, **kw: SSOGet(status_code=200,
+                                                                               username='github_dup',
+                                                                               name='Joe Soap',
+                                                                               email=None)):
+                        user = gitlab_sso('abcde', 'http://localhost/')
         self.assertEqual('GitLab profile missing required content', str(cm.exception))
         self.assertEqual(cur_users, get_user_model().objects.count())
 
@@ -192,8 +203,9 @@ def test_gitlab_duplicate(self):
         dup2 = create_user('gitlab_dup2')
         kv = KeyValue.objects.filter(group=self.reg_group, key='gitlab_sso_account_id', value='dup2').get()
         kv.userprofile_set.add(dup2.userprofile)
-        with (self.assertRaises(SSOError) as cm, self.settings(WAFER_GITLAB_CLIENT_ID='testy', WAFER_GITLAB_CLIENT_SECRET='abcd')):
-            gitlab_sso('abcdef', 'http://localhost/')
+        with self.assertRaises(SSOError) as cm:
+            with self.settings(WAFER_GITLAB_CLIENT_ID='testy', WAFER_GITLAB_CLIENT_SECRET='abcd'):
+                gitlab_sso('abcdef', 'http://localhost/')
         exception = cm.exception
         self.assertTrue('Multiple accounts have GitLab' in str(exception))
 

From bf2b82a4b94241caf4c191083d93c70bfe44e65d Mon Sep 17 00:00:00 2001
From: Neil Muller <drnlmuller@gmail.com>
Date: Fri, 13 Oct 2023 17:06:22 +0200
Subject: [PATCH 24/24] Mention new settings in the docs

---
 docs/settings.rst | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index f497aa26..57159060 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -13,11 +13,33 @@ in the ``wafer.settings`` module, so you can import this in your app's
 Wafer's settings
 ================
 
+``CODE_HOSTING_ENTRIES``
+    A dictionary of code hosting sites for the user profile.
+    Entries should be of the form: **keyname**: "Description" .
+
+    Each entry in the dictionary will be added as a form field
+    on the profile page - entries are assumed to be for urls to
+    the approriate site.
+
+    Entries in this dictionary will be grouped together on
+    the edit profile form and on the profile display.
+
 ``PAGE_DIR``
     The directory that the ``load_pages`` management command will load
     pages from.
     Should be an absolute path with a trailing ``/``.
 
+``SOCIAL_MEDIA_ENTRIES``
+    A dictionary of social sites for the user profile.
+    Entries should be of the form: **keyname**: "Description" .
+
+    Each entry in the dictionary will be added as a form field
+    on the profile page - entries are assumed to be for urls to
+    the approriate site.
+
+    Entries in this dictionary will be grouped together on
+    the edit profile form and on the profile display.
+
 ``WAFER_CACHE``
     The name of the Django cache backend that wafer can use.
     Defaults to ``'wafer_cache'``.
@@ -165,6 +187,7 @@ Wafer's settings
     email address of someone who will review the talk's video, once it
     is ready to publish.
 
+
 Third party settings
 ====================