Merge pull request #456 from OpenGeoscience/require-usernames

Require username

Author: annehaley

uvdat/core/rest/serializers.py

@@ -31,7 +31,13 @@
 class UserSerializer(serializers.ModelSerializer):
     class Meta:
         model = User
-        fields = ["id", "first_name", "last_name", "is_superuser"]
+        fields = ["id", "username", "first_name", "last_name"]
+
+
+class MeSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = User
+        fields = ["id", "username", "first_name", "last_name", "is_superuser"]
 
 
 class BasemapSerializer(serializers.ModelSerializer):

uvdat/core/rest/user.py

@@ -8,7 +8,7 @@
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.viewsets import ReadOnlyModelViewSet
 
-from .serializers import UserSerializer
+from .serializers import MeSerializer, UserSerializer
 
 
 class UserViewSet(ReadOnlyModelViewSet):
@@ -22,4 +22,4 @@ def me(self, request):
         """Return the currently logged in user's information."""
         if request.user.is_anonymous:
             return HttpResponse(status=204)
-        return HttpResponse(json.dumps(UserSerializer(request.user).data), status=200)
+        return HttpResponse(json.dumps(MeSerializer(request.user).data), status=200)

uvdat/core/tests/factories.py

@@ -36,7 +36,7 @@ class UserFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = User
 
-    username = factory.SelfAttribute("email")
+    username = factory.Faker("user_name")
     email = factory.Faker("safe_email")
     first_name = factory.Faker("first_name")
     last_name = factory.Faker("last_name")
@@ -46,7 +46,7 @@ class SuperUserFactory(UserFactory):
     class Meta:
         model = User
 
-    username = factory.SelfAttribute("email")
+    username = factory.Faker("user_name")
     email = factory.Faker("safe_email")
     first_name = factory.Faker("first_name")
     last_name = factory.Faker("last_name")

uvdat/settings/base.py

@@ -121,6 +121,11 @@
 ACCOUNT_LOGOUT_REDIRECT_URL = "/"
 ACCOUNT_SIGNUP_FORM_CLASS = "resonant_utils.allauth.FullNameSignupForm"
 
+# Override defaults set by Resonant: https://github.com/kitware-resonant/cookiecutter-resonant/blob/master/django-resonant-settings/resonant_settings/allauth.py#L36
+ACCOUNT_ADAPTER = "allauth.account.adapter.DefaultAccountAdapter"
+ACCOUNT_SIGNUP_FIELDS = ["username*", "email*", "password1*", "password2*"]
+ACCOUNT_USER_MODEL_USERNAME_FIELD = "username"
+
 # Use codes for email verification; links can be modified by Microsoft Safe Links
 ACCOUNT_EMAIL_VERIFICATION_BY_CODE_ENABLED = True
 

web/src/components/projects/AccessControl.vue

@@ -24,6 +24,18 @@ const editMode = computed(
   () => projectStore.permissions[props.project.id] === "owner",
 );
 
+function userSearch(
+  value: string,
+  queryText: string,
+  item: { raw: Record<string, string> } | undefined,
+) {
+  if (!item) return false;
+  const lowercaseValues = Object.entries(item.raw)
+    .filter(([key]) => ["first_name", "last_name", "username"].includes(key))
+    .map(([, v]) => v.toLowerCase());
+  return lowercaseValues.some((v) => v.includes(queryText.toLowerCase()));
+}
+
 function savePermissions() {
   if (!editMode.value || props.project.owner.id === undefined) return;
   let owner: number = props.project.owner.id;
@@ -203,6 +215,8 @@ onMounted(() => {
             :clearable="userSelectDialogMode === 'add'"
             :chips="userSelectDialogMode === 'add'"
             :closable-chips="userSelectDialogMode === 'add'"
+            item-title="username"
+            :custom-filter="userSearch"
             @update:model-value="
               (v: User | User[]) => {
                 if (Array.isArray(v)) selectedUsers = v;

web/src/components/projects/UserProfile.vue

@@ -21,7 +21,7 @@ const initials = computed(() => {
 </script>
 
 <template>
-  <v-list-item v-if="props.user">
+  <v-list-item v-if="props.user" :subtitle="props.user.username">
     <template #title>
       <span style="text-transform: capitalize">{{ nameLabel }}</span>
     </template>
@@ -37,7 +37,7 @@ const initials = computed(() => {
         <span v-if="initials" style="text-transform: uppercase">
           {{ initials }}
           <v-tooltip activator="parent" location="end">
-            {{ nameLabel }}
+            {{ props.user.username }}
           </v-tooltip>
         </span>
         <v-icon v-else icon="mdi-account"></v-icon>

web/src/types.ts

@@ -2,6 +2,7 @@ import type { MapGeoJSONFeature, StyleSpecification } from "maplibre-gl";
 
 export interface User {
   id: number | undefined; // undefined id is unauthenticated
+  username?: string;
   first_name?: string;
   last_name?: string;
   is_superuser?: boolean;