Merge branch 'develop' into Fix-compliance-filter-groups

Author: kflemin

CHANGELOG.md

@@ -1,3 +1,41 @@
+# SEED Version 3.2.4
+
+<!-- Release notes generated using configuration in .github/release.yml at 3.2.4-release-prep -->
+
+## What's Changed
+### New Features 🎉
+* Django settings endpoint by @kflemin in https://github.com/SEED-platform/seed/pull/4936
+### Improvements 📈
+* Move JWT token claims to v3_users_current by @crutan in https://github.com/SEED-platform/seed/pull/4939
+* Add user serializer by @crutan in https://github.com/SEED-platform/seed/pull/4940
+### Bug Fixes 🐛
+* Make data type column wide enough to see completely by @crutan in https://github.com/SEED-platform/seed/pull/4919
+* Fix group meter interval by @haneslinger in https://github.com/SEED-platform/seed/pull/4937
+
+
+**Full Changelog**: https://github.com/SEED-platform/seed/compare/v3.2.3...v3.2.4
+
+# SEED Version 3.2.3
+
+<!-- Release notes generated using configuration in .github/release.yml at 3.2.3-release-prep -->
+
+## What's Changed
+### Improvements 📈
+* Add meter of type Electric to BSyncR analysis by @kflemin in https://github.com/SEED-platform/seed/pull/4923
+* Save org settings & 2fa prompt by @perryr16 in https://github.com/SEED-platform/seed/pull/4905
+* Add Simple JWT to authorization setup by @crutan in https://github.com/SEED-platform/seed/pull/4926
+* Portfolio Summary updates by @perryr16 in https://github.com/SEED-platform/seed/pull/4909
+### Maintenance 🧹
+* Remove inventory list `Data` nav item by @axelstudios in https://github.com/SEED-platform/seed/pull/4920
+* Remove server settings from the session cookie by @axelstudios in https://github.com/SEED-platform/seed/pull/4927
+### Bug Fixes 🐛
+* Fix  upgrade recommendation by @haneslinger in https://github.com/SEED-platform/seed/pull/4917
+* Fix inventory groups add inventory bug by @perryr16 in https://github.com/SEED-platform/seed/pull/4932
+* Show default display name on analyses by @perryr16 in https://github.com/SEED-platform/seed/pull/4924
+
+
+**Full Changelog**: https://github.com/SEED-platform/seed/compare/v3.2.2...v3.2.3
+
 # SEED Version 3.2.2
 
 <!-- Release notes generated using configuration in .github/release.yml at 3.2.2-release-prep -->

config/settings/common.py

@@ -4,6 +4,7 @@
 """
 
 import os
+from datetime import timedelta
 from distutils.util import strtobool
 
 from django.utils.translation import gettext_lazy as _
@@ -101,6 +102,7 @@
     "two_factor.plugins.phonenumber",  # <- if you want phone number capability.
     "two_factor.plugins.email",  # <- if you want email capability.
     # "two_factor.plugins.yubikey",  # <- for yubikey capability.
+    "rest_framework_simplejwt",
 )
 
 
@@ -268,6 +270,7 @@
 # Django Rest Framework
 REST_FRAMEWORK = {
     "DEFAULT_AUTHENTICATION_CLASSES": (
+        "rest_framework_simplejwt.authentication.JWTAuthentication",
         "rest_framework.authentication.SessionAuthentication",
         "seed.authentication.SEEDAuthentication",
     ),
@@ -304,6 +307,13 @@
     "LOGOUT_URL": "/accounts/logout",
 }
 
+SIMPLE_JWT = {
+    "ACCESS_TOKEN_LIFETIME": timedelta(minutes=5),
+    "AUTH_HEADER_TYPES": ("Bearer",),
+    "TOKEN_OBTAIN_SERIALIZER": "seed.landing.serializers.SeedTokenObtainPairSerializer",
+    "ROTATE_REFRESH_TOKENS": True,
+}
+
 try:
     EEEJ_LOAD_SMALL_TEST_DATASET = bool(strtobool(os.environ.get("EEEJ_LOAD_SMALL_TEST_DATASET", "False")))
 except Exception:

config/urls.py

@@ -10,12 +10,13 @@
 from drf_yasg import openapi
 from drf_yasg.views import get_schema_view
 from rest_framework import permissions
+from rest_framework_simplejwt.views import TokenObtainPairView, TokenRefreshView
 from two_factor.urls import urlpatterns as tf_urls
 
 from config.views import robots_txt
 from seed.api.base.urls import urlpatterns as api
 from seed.landing.views import CustomLoginView, password_reset_complete, password_reset_confirm, password_reset_done
-from seed.views.main import angular_js_tests, health_check, version
+from seed.views.main import angular_js_tests, config, health_check, version
 
 schema_view = get_schema_view(
     openapi.Info(
@@ -51,9 +52,13 @@ def trigger_error(request):
     # root configuration items
     re_path(r"^i18n/", include("django.conf.urls.i18n")),
     re_path(r"^robots\.txt", robots_txt, name="robots_txt"),
-    # API
+    # API (explicit no-auth)
+    re_path(r"^api/config/$", config, name="config"),
     re_path(r"^api/health_check/$", health_check, name="health_check"),
+    # API
     re_path(r"^api/swagger/$", schema_view.with_ui("swagger", cache_timeout=0), name="schema-swagger-ui"),
+    re_path(r"^api/token/$", TokenObtainPairView.as_view(), name="token_obtain_pair"),
+    re_path(r"^api/token/refresh/$", TokenRefreshView.as_view(), name="token_refresh"),
     re_path(r"^api/version/$", version, name="version"),
     re_path(r"^api/", include((api, "seed"), namespace="api")),
     re_path(r"^account/login", CustomLoginView.as_view(), name="login"),

docs/source/migrations.rst

@@ -38,6 +38,14 @@ local_untracked.py file
         ),
     )
 
+Version 3.2.4
+-------------
+- There are no special migrations needed for this version. Simply run ``./manage.py migrate``.
+
+Version 3.2.3
+-------------
+- There are no special migrations needed for this version. Simply run ``./manage.py migrate``.
+
 Version 3.2.2
 -------------
 - There are no special migrations needed for this version. Simply run ``./manage.py migrate``.

locale/en_US/LC_MESSAGES/django.mo

@@ -360,6 +360,12 @@ msgstr "Advanced Settings"
 msgid "Alias"
 msgstr "Alias"
 
+msgid "All Canonical Fields"
+msgstr "All Canonical Fields"
+
+msgid "All Extra Data Fields"
+msgstr "All Extra Data Fields"
+
 msgid "An Audit Template organization token, user email and password are required"
 msgstr "An Audit Template organization token, user email and password are required"
 
@@ -970,6 +976,12 @@ msgstr "Create a New Sub-Organization"
 msgid "Create a Program to get started!"
 msgstr "Create a Program to get started!"
 
+msgid "Create a Property"
+msgstr "Create a Property"
+
+msgid "Create a Tax Lot"
+msgstr "Create a Tax Lot"
+
 msgid "Create a new rule"
 msgstr "Create a new rule"
 
@@ -4342,6 +4354,9 @@ msgstr "Unsuccessful Exports"
 msgid "Until last date of"
 msgstr "Until last date of"
 
+msgid "Update"
+msgstr "Update"
+
 msgid "Update Charts"
 msgstr "Update Charts"
 
@@ -4351,6 +4366,9 @@ msgstr "Update Derived Data"
 msgid "Update Filters"
 msgstr "Update Filters"
 
+msgid "Update Password"
+msgstr "Update Password"
+
 msgid "Update Property Labels"
 msgstr "Update Property Labels"
 

locale/en_US/LC_MESSAGES/django.po

@@ -5,7 +5,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: lokalise.com\n"
 "Project-Id-Version: SEED Platform\n"
-"PO-Revision-Date: 2024-12-14 00:26\n"
+"PO-Revision-Date: 2025-02-03 16:29\n"
 "Last-Translator: lokalise.com\n"
 "Language-Team: lokalise.com\n\n"
 "Language: es\n"
@@ -461,6 +461,12 @@ msgstr "Configuración avanzada"
 msgid "Alias"
 msgstr "Alias"
 
+msgid "All Canonical Fields"
+msgstr "Todos los campos canónicos"
+
+msgid "All Extra Data Fields"
+msgstr "Todos los campos de datos adicionales"
+
 #, fuzzy
 msgid "An Audit Template organization token, user email and password are required"
 msgstr "Se requiere un token de organización de Plantilla de Auditoría, un correo electrónico de usuario y una contraseña"
@@ -1245,6 +1251,12 @@ msgstr "Crear una nueva suborganización"
 msgid "Create a Program to get started!"
 msgstr "Cree un programa para empezar"
 
+msgid "Create a Property"
+msgstr "Crear una propiedad"
+
+msgid "Create a Tax Lot"
+msgstr "Crear un lote de impuestos"
+
 #, fuzzy
 msgid "Create a new rule"
 msgstr "Crear una nueva regla"
@@ -5632,6 +5644,9 @@ msgstr "Exportaciones fallidas"
 msgid "Until last date of"
 msgstr "Hasta la última fecha de"
 
+msgid "Update"
+msgstr "Actualizar"
+
 #, fuzzy
 msgid "Update Charts"
 msgstr "Actualizar gráficos"
@@ -5644,6 +5659,9 @@ msgstr "Actualizar datos derivados"
 msgid "Update Filters"
 msgstr "Actualizar filtros"
 
+msgid "Update Password"
+msgstr "Actualizar contraseña"
+
 #, fuzzy
 msgid "Update Property Labels"
 msgstr "Actualizar etiquetas de propiedad"

locale/es/LC_MESSAGES/django.mo

@@ -364,6 +364,12 @@ msgstr "Réglages avancés"
 msgid "Alias"
 msgstr "Alias"
 
+msgid "All Canonical Fields"
+msgstr "Tous les champs canoniques"
+
+msgid "All Extra Data Fields"
+msgstr "Tous les champs de données supplémentaires"
+
 msgid "An Audit Template organization token, user email and password are required"
 msgstr "Un jeton d'organisation Audit Template, un e-mail d'utilisateur et un mot de passe sont requis"
 
@@ -980,6 +986,12 @@ msgstr "Créer une nouvelle sous-organisation"
 msgid "Create a Program to get started!"
 msgstr "Créez un programme pour commencer !"
 
+msgid "Create a Property"
+msgstr "Créer une propriété"
+
+msgid "Create a Tax Lot"
+msgstr "Créer un lot fiscal"
+
 msgid "Create a new rule"
 msgstr "Créer une nouvelle règle"
 
@@ -4376,6 +4388,9 @@ msgstr "Exportations infructueuses"
 msgid "Until last date of"
 msgstr "Jusqu'à la dernière date de"
 
+msgid "Update"
+msgstr "Mise à jour"
+
 msgid "Update Charts"
 msgstr "Mettre à jour les graphiques"
 
@@ -4385,6 +4400,9 @@ msgstr "Mettre à jour les données dérivées"
 msgid "Update Filters"
 msgstr "Mise à jour les filtres"
 
+msgid "Update Password"
+msgstr "Mettre à jour le mot de passe"
+
 msgid "Update Property Labels"
 msgstr "Mettre à jour les étiquettes de propriété"
 

locale/es/LC_MESSAGES/django.po

@@ -1,6 +1,6 @@
 {
   "name": "seed",
-  "version": "3.2.2",
+  "version": "3.2.4",
   "description": "Standard Energy Efficiency Data (SEED) Platform™",
   "license": "SEE LICENSE IN LICENSE.md",
   "directories": {

locale/fr_CA/LC_MESSAGES/django.mo

@@ -27,6 +27,7 @@ django-pint==0.7.3
 
 # API
 djangorestframework==3.15.1  # Update after Django 4.2
+djangorestframework-simplejwt==5.3.1 # Update after Django 4.2
 django-post_office==3.8.0  # Update after Django 4.2
 drf-yasg==1.21.7
 django-filter==22.1  # Update after Django 4.2 and drf-spectacular

locale/fr_CA/LC_MESSAGES/django.po

@@ -15,6 +15,8 @@
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from rest_framework import exceptions
+from rest_framework_simplejwt.exceptions import TokenError
+from rest_framework_simplejwt.tokens import AccessToken
 
 from seed.lib.superperms.orgs.models import Organization
 
@@ -82,23 +84,29 @@ def process_header_request(cls, request):
             return None
 
         try:
-            if not auth_header.startswith("Basic"):
-                raise exceptions.AuthenticationFailed("Only Basic HTTP_AUTHORIZATION is supported")
-
-            auth_header = auth_header.split()[1]
-            auth_header = base64.urlsafe_b64decode(auth_header).decode("utf-8")
-            username, api_key = auth_header.split(":")
-
-            valid_api_key = re.search("^[a-f0-9]{40}$", api_key)
-            if not valid_api_key:
-                raise exceptions.AuthenticationFailed("Invalid API key")
-
-            user = SEEDUser.objects.get(api_key=api_key, username=username)
-            return user
+            if auth_header.startswith("Basic"):
+                auth_header = auth_header.split()[1]
+                auth_header = base64.urlsafe_b64decode(auth_header).decode("utf-8")
+                username, api_key = auth_header.split(":")
+
+                valid_api_key = re.search("^[a-f0-9]{40}$", api_key)
+                if not valid_api_key:
+                    raise exceptions.AuthenticationFailed("Invalid API key")
+
+                user = SEEDUser.objects.get(api_key=api_key, username=username)
+                return user
+            elif auth_header.startswith("Bearer"):
+                at = AccessToken(auth_header.removeprefix("Bearer "))
+                user = SEEDUser.objects.get(pk=at["user_id"])
+                return user
+            else:
+                raise exceptions.AuthenticationFailed("Only Basic HTTP_AUTHORIZATION or BEARER Tokens are supported")
         except ValueError:
             raise exceptions.AuthenticationFailed("Invalid HTTP_AUTHORIZATION Header")
+        except TokenError:
+            raise exceptions.AuthenticationFailed("Invalid Bearer Token")
         except SEEDUser.DoesNotExist:
-            raise exceptions.AuthenticationFailed("Invalid API key")
+            raise exceptions.AuthenticationFailed("Invalid API key or Bearer Token")
 
     def get_absolute_url(self):
         return f"/users/{quote(self.username)}/"
@@ -149,3 +157,9 @@ def save(self, *args, **kwargs):
         if self.email.lower() != self.username:
             self.email = self.username
         return super().save(*args, **kwargs)
+
+    def serialize(self):
+        from seed.serializers.users import UserSerializer
+
+        serializer = UserSerializer(self)
+        return serializer.data

package-lock.json

@@ -0,0 +1,12 @@
+from rest_framework_simplejwt.serializers import TokenObtainPairSerializer
+
+
+class SeedTokenObtainPairSerializer(TokenObtainPairSerializer):
+    @classmethod
+    def get_token(cls, user):
+        token = super().get_token(user)
+
+        # Add custom claims
+        # token["name"] = f"{user.first_name} {user.last_name}".strip()
+
+        return token

package.json

@@ -847,6 +847,13 @@ def merge_relationships(cls, merged_state, state1, state2):
 
         return merged_state
 
+    def default_display_value(self):
+        try:
+            field = self.organization.property_display_field
+            return self.extra_data.get(field) or getattr(self, field)
+        except AttributeError:
+            return None
+
 
 @receiver(pre_delete, sender=PropertyState)
 def pre_delete_state(sender, **kwargs):