augmentedreality: add guest users

adhocracy-plus/config/settings/base.py

@@ -16,6 +16,7 @@
 
 # Link to a dokuwiki instance containing a manual for aplus
 # Leave blank to disable
+# For guest users this is hardcoded in indicator.html
 APLUS_MANUAL_URL = ""
 
 # Application definition
@@ -42,6 +43,7 @@
     "allauth",
     "allauth.account",
     "allauth.socialaccount",
+    "guest_user",
     "rules.apps.AutodiscoverRulesConfig",
     "easy_thumbnails",
     "parler",
@@ -280,6 +282,7 @@
     "rules.permissions.ObjectPermissionBackend",
     "django.contrib.auth.backends.ModelBackend",
     "allauth.account.auth_backends.AuthenticationBackend",
+    "guest_user.backends.GuestBackend",
 )
 
 ACCOUNT_ADAPTER = "apps.users.adapters.AccountAdapter"
@@ -719,3 +722,13 @@
         },
     },
 }
+
+GUEST_USER = {
+    "NAME_GENERATOR": "guest_user.functions.generate_uuid_username",
+}
+
+
+GUEST_USER_REQUIRED_ANON_URL = "/accounts/guests/login"
+# Redirects below when guest user is required but currently regular user.
+# Currently only guest dashboard views use this, so redirects to user profile.
+GUEST_USER_REQUIRED_USER_URL = "/account/profile/"

adhocracy-plus/config/urls.py

@@ -27,6 +27,8 @@
 from adhocracy4.ratings.api import RatingViewSet
 from adhocracy4.reports.api import ReportViewSet
 from apps.account.api import AccountViewSet
+from apps.augmentedreality.api import CombinedCommentViewSet
+from apps.augmentedreality.api import CombinedRatingViewSet
 from apps.contrib import views as contrib_views
 from apps.contrib.sitemaps import static_sitemap_index
 from apps.documents.api import DocumentViewSet
@@ -87,12 +89,18 @@
 )
 ct_router.register(r"comment-moderate", CommentModerateSet, basename="comment-moderate")
 
+ar_router = a4routers.ContentTypeDefaultRouter()
+ar_router.register(r"arpas-comments", CombinedCommentViewSet, basename="arpas-comments")
+ar_router.register(r"arpas-ratings", CombinedRatingViewSet, basename="arpas-ratings")
+
+
 comment_router = a4routers.CommentDefaultRouter()
 comment_router.register(
     r"moderatorfeedback", ModeratorCommentFeedbackViewSet, basename="moderatorfeedback"
 )
 
 urlpatterns = [
+    path("api/", include(ar_router.urls)),
     # General platform urls
     re_path(r"^django-admin/", admin.site.urls),
     path("admin/", include("wagtail.admin.urls")),
@@ -112,6 +120,7 @@
     path("api/", include(comment_router.urls)),
     path("api/", include(moderation_router.urls)),
     path("api/", include(router.urls)),
+    # path("api/", include("apps.augmentedreality.urls")),
     re_path(r"^api/account/", AccountViewSet.as_view(), name="api-account"),
     # API JWT authentication
     re_path(r"^api/login", obtain_auth_token, name="api-login"),

apps/account/views.py

@@ -12,18 +12,20 @@
 from apps.users.models import User
 from apps.users.utils import set_session_language
 
+from guest_user.functions import is_guest_user
+from guest_user.mixins import GuestUserRequiredMixin, RegularUserRequiredMixin
+
 from . import forms
 from .emails import AccountDeletionEmail
 
 
-class AccountView(RedirectView):
+class AccountView(RegularUserRequiredMixin, RedirectView):
     permanent = False
     pattern_name = "account_profile"
     # Placeholder View to be replaced if we want to use a custom account
     # dashboard function overview.
 
-
-class ProfileUpdateView(LoginRequiredMixin, SuccessMessageMixin, generic.UpdateView):
+class ProfileUpdateView(LoginRequiredMixin, SuccessMessageMixin, RegularUserRequiredMixin, generic.UpdateView):
     model = User
     template_name = "a4_candy_account/profile.html"
     form_class = forms.ProfileForm

apps/augmentedreality/api.py

@@ -1,7 +1,14 @@
+from guest_user.mixins import AllowGuestUserMixin
+
 from adhocracy4.comments_async.api import CommentViewSet
+from adhocracy4.ratings.api import RatingViewSet
+
+
+class CombinedRatingViewSet(AllowGuestUserMixin, RatingViewSet):
+    http_method_names = ["post", "patch"]
 
 
-class CombinedCommentViewSet(CommentViewSet):
+class CombinedCommentViewSet(AllowGuestUserMixin, CommentViewSet):
     def get_queryset(self):
         comments = super().get_queryset()
         return comments

apps/augmentedreality/migrations/0005_alter_scene_content_type.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.18 on 2025-07-01 15:42
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("contenttypes", "0002_remove_content_type_name"),
+        ("arpas_augmentedreality", "0004_alter_arobject_scene"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="scene",
+            name="content_type",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="scenes",
+                to="contenttypes.contenttype",
+            ),
+        ),
+    ]

apps/augmentedreality/models.py

@@ -25,7 +25,9 @@ def validate_item_content_type(content_type):
 
 
 class Scene(models.Model):
-    content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
+    content_type = models.ForeignKey(
+        ContentType, on_delete=models.CASCADE, related_name="scenes"
+    )
     object_id = models.PositiveIntegerField()
     item = GenericForeignKey("content_type", "object_id")
 

apps/userdashboard/views.py

@@ -3,6 +3,7 @@
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
 from django.views import generic
+from guest_user.mixins import RegularUserRequiredMixin
 
 from adhocracy4.actions.models import Action
 from adhocracy4.comments.models import Comment
@@ -18,6 +19,7 @@
 
 class UserDashboardBaseMixin(
     LoginRequiredMixin,
+    RegularUserRequiredMixin,
     generic.base.ContextMixin,
     generic.base.TemplateResponseMixin,
     generic.base.View,

apps/users/models.py

@@ -126,6 +126,7 @@ class User(auth_models.AbstractBaseUser, auth_models.PermissionsMixin):
     objects = auth_models.UserManager()
 
     USERNAME_FIELD = "username"
+    PASSWORD_FIELD = "username"  # for django-guest-user
     REQUIRED_FIELDS = ["email"]
 
     def get_projects_follow_list(self, exclude_private_projects=False):

apps/users/templates/a4_candy_users/indicator.html

@@ -1,65 +1,77 @@
-{% load i18n static thumbnail settings %}
+{% load i18n static thumbnail settings guest_user %}
 {% if request.user.is_authenticated %}
-    <div class="dropdown userindicator__dropdown">
-        <button title="{% translate 'Menu' %}"
-                class="d-md-none dropdown-toggle btn btn--secondary-filled  btn--attached-top header-upper__mobile-toggle"
-                data-bs-toggle="dropdown"
-                data-flip="false"
-                aria-haspopup="true"
-                aria-expanded="false"
-                id="user-actions-mobile">
-            <span class="d-none d-sm-inline-block pe-1">{% translate 'Menu' %}</span>
-        </button>
-        <button title="{% translate 'Menu' %}"
-                class="d-none d-md-inline-block dropdown-toggle btn btn--secondary-filled btn--attached-top  btn--align-left header-upper__toggle"
-                data-bs-toggle="dropdown"
-                data-flip="false"
-                aria-haspopup="true"
-                aria-expanded="false"
-                id="user-actions">
-            <div class="userindicator__btn-img"
-                 style="background-image: {% if request.user.avatar %} url({{ request.user.avatar|thumbnail_url:'avatar' }}) {% else %}  url({{ request.user.avatar_fallback }}) {% endif %}">
+    {% with is_guest=user|is_guest_user %}
+        <div class="dropdown userindicator__dropdown">
+            <button title="{% translate 'Menu' %}"
+                    class="d-md-none dropdown-toggle btn btn--secondary-filled  btn--attached-top header-upper__mobile-toggle"
+                    data-bs-toggle="dropdown"
+                    data-flip="false"
+                    aria-haspopup="true"
+                    aria-expanded="false"
+                    id="user-actions-mobile">
+                <span class="d-none d-sm-inline-block pe-1">{% translate 'Menu' %}</span>
+            </button>
+            <button title="{% translate 'Menu' %}"
+                    class="d-none d-md-inline-block dropdown-toggle btn btn--secondary-filled btn--attached-top  btn--align-left header-upper__toggle"
+                    data-bs-toggle="dropdown"
+                    data-flip="false"
+                    aria-haspopup="true"
+                    aria-expanded="false"
+                    id="user-actions">
+                {% if not is_guest %}
+                    <div class="userindicator__btn-img"
+                        style="background-image: {% if request.user.avatar %} url({{ request.user.avatar|thumbnail_url:'avatar' }}) {% else %}  url({{ request.user.avatar_fallback }}) {% endif %}">
+                    </div>
+                {% endif %}
+                <div class="userindicator__btn-text text-start">
+                    <span class="userindicator__hello">{% translate "Hello" %}, </span>
+                    {% if not is_guest %}
+                        <br>
+                        <div class="u-overflow-ellipsis">{{ request.user.username }}</div>
+                    {% else %}
+                        <span>{% translate "Guest" %}</span>
+                    {% endif %}
+                </div>
+                <i class="fa fa-chevron-down" aria-hidden="true"></i>
+            </button>
+            <div class="dropdown-menu dropdown-menu-end userindicator__dropdown-menu"
+                aria-labelledby="user-actions user-actions-mobile">
+                {% if request.user.is_superuser %}
+                    <a class="dropdown-item" href="{% url 'admin:index' %}">{% translate "Admin" %}</a>
+                {% endif %}
+                {% if not is_guest %}
+                    <a class="dropdown-item" href="{% url 'userdashboard-overview' %}">{% translate 'My Overview' %}</a>
+                    <a class="dropdown-item" href="{% url 'account' %}">{% translate "Account Settings" %}</a>
+                    {% for organisation in request.user.organisations %}
+                        <a class="dropdown-item"
+                        href="{% url 'a4dashboard:project-list' organisation_slug=organisation.slug %}">
+                            {{ organisation.name }}
+                        </a>
+                    {% endfor %}
+                    {% settings_value "APLUS_MANUAL_URL" as manual_url %}
+                    {% if manual_url %}
+                        <a class="dropdown-item"
+                        href="{{ manual_url }}/{{ LANGUAGE_CODE }}:start"
+                        target="_blank">{% translate 'Help' %}</a>
+                    {% endif %}
+                {% else %} 
+                    <a class="dropdown-item" href="https://manual.adhocracy.plus/de:start" target="_blank">{% translate "Help" %}</a>
+                {% endif %}
+                <form class="form--inline"
+                    action="{% url 'account_logout' %}"
+                    method="post"
+                    aria-label="{% translate 'Logout' %}">
+                    {% csrf_token %}
+                    <input type="hidden" name="next" value="{{ redirect_field_value }}">
+                    <button type="submit" class="dropdown-item">{% translate "Logout" %}</button>
+                </form>
             </div>
-            <div class="userindicator__btn-text text-start">
-                <span class="userindicator__hello">{% translate "Hello" %}</span>
-                <br>
-                <div class="u-overflow-ellipsis">{{ request.user.username }}</div>
+    {% endwith %}
+        {% else %}
+            <div class="btn btn--secondary-filled btn--huge btn--attached-top">
+                <span class="navi__item"><a href="{% url 'account_login' %}?next={{ redirect_field_value }}">{% translate "Login" %}</a></span>
+                <span class="d-none d-md-inline">/</span>
+                <span class="navi__item"><a href="{% url 'account_signup' %}?next={{ redirect_field_value }}">{% translate "Register" %}</a></span>
             </div>
-            <i class="fa fa-chevron-down" aria-hidden="true"></i>
-        </button>
-        <div class="dropdown-menu dropdown-menu-end userindicator__dropdown-menu"
-             aria-labelledby="user-actions user-actions-mobile">
-            {% if request.user.is_superuser %}
-                <a class="dropdown-item" href="{% url 'admin:index' %}">{% translate "Admin" %}</a>
-            {% endif %}
-            <a class="dropdown-item" href="{% url 'userdashboard-overview' %}">{% translate 'My Overview' %}</a>
-            <a class="dropdown-item" href="{% url 'account' %}">{% translate "Account Settings" %}</a>
-            {% for organisation in request.user.organisations %}
-                <a class="dropdown-item"
-                   href="{% url 'a4dashboard:project-list' organisation_slug=organisation.slug %}">
-                    {{ organisation.name }}
-                </a>
-            {% endfor %}
-            {% settings_value "APLUS_MANUAL_URL" as manual_url %}
-            {% if manual_url %}
-                <a class="dropdown-item"
-                   href="{{ manual_url }}/{{ LANGUAGE_CODE }}:start"
-                   target="_blank">{% translate 'Help' %}</a>
-            {% endif %}
-            <form class="form--inline"
-                  action="{% url 'account_logout' %}"
-                  method="post"
-                  aria-label="{% translate 'Logout' %}">
-                {% csrf_token %}
-                <input type="hidden" name="next" value="{{ redirect_field_value }}">
-                <button type="submit" class="dropdown-item">{% translate "Logout" %}</button>
-            </form>
         </div>
-    {% else %}
-        <div class="btn btn--secondary-filled btn--huge btn--attached-top">
-            <span class="navi__item"><a href="{% url 'account_login' %}?next={{ redirect_field_value }}">{% translate "Login" %}</a></span>
-            <span class="d-none d-md-inline">/</span>
-            <span class="navi__item"><a href="{% url 'account_signup' %}?next={{ redirect_field_value }}">{% translate "Register" %}</a></span>
-        </div>
-    </div>
 {% endif %}

changelog/490.md

@@ -0,0 +1,8 @@
+### Added
+
+- unauthenticated users can add comments and ratings and a guest user will be created for them
+- deps: django-guest-user (liqd fork)
+
+### Changed
+
+- deps: a4 branch-off for AR comment labeling

changelog/526.md

@@ -1,12 +1,8 @@
 ### Added
 - New Api Endpoint for the ARC Part of this Project
+- Passing Variant Content Type to ARC App
+- Adding propertys to Variant so it works with Comments and Ratings
 
 ### Changed 
 - Comments and Variants on Desktop are bound to Variant instead of Topics
 
-### Added
-- Passing Variant Content Type to ARC App
-
-### Added
-- Adding propertys to Variant so it works with Comments and Ratings
-