reworked invite system

2026-01-01 04:10:06 -05:00 · 2021-05-28 16:49:03 +02:00
parent a14e33973c
commit c8054349b2
17 changed files with 410 additions and 52 deletions
--- a/cookbook/views/views.py
+++ b/cookbook/views/views.py
@@ -6,6 +6,7 @@ from uuid import UUID
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth import update_session_auth_hash
+from django.contrib.auth.decorators import login_required
 from django.contrib.auth.forms import PasswordChangeForm
 from django.contrib.auth.models import Group
 from django.contrib.auth.password_validation import validate_password
@@ -24,12 +25,14 @@ from rest_framework.authtoken.models import Token
 from cookbook.filters import RecipeFilter
 from cookbook.forms import (CommentForm, Recipe, RecipeBookEntryForm, User,
                            UserCreateForm, UserNameForm, UserPreference,
-                            UserPreferenceForm)
+                            UserPreferenceForm, SpaceJoinForm, SpaceCreateForm)
 from cookbook.helper.permission_helper import group_required, share_link_valid, has_group_permission
 from cookbook.models import (Comment, CookLog, InviteLink, MealPlan,
-                             RecipeBook, RecipeBookEntry, ViewLog, ShoppingList, Space)
+                             RecipeBook, RecipeBookEntry, ViewLog, ShoppingList, Space, Keyword, RecipeImport, Unit,
+                             Food)
 from cookbook.tables import (CookLogTable, RecipeTable, RecipeTableSmall,
                             ViewLogTable)
+from cookbook.views.data import Object
 from recipes.settings import DEMO
 from recipes.version import BUILD_REF, VERSION_NUMBER

@@ -99,13 +102,38 @@ def no_groups(request):
    return render(request, 'no_groups_info.html')


+@login_required
 def no_space(request):
-    if settings.SOCIAL_DEFAULT_ACCESS:
-        request.user.userpreference.space = Space.objects.first()
-        request.user.userpreference.save()
-        request.user.groups.add(Group.objects.get(name=settings.SOCIAL_DEFAULT_GROUP))
+    if request.user.userpreference.space:
        return HttpResponseRedirect(reverse('index'))
-    return render(request, 'no_space_info.html')
+
+    if request.POST:
+        create_form = SpaceCreateForm(request.POST, prefix='create')
+        join_form = SpaceJoinForm(request.POST, prefix='join')
+        if create_form.is_valid():
+            created_space = Space.objects.create(name=create_form.cleaned_data['name'], created_by=request.user)
+            request.user.userpreference.space = created_space
+            request.user.userpreference.save()
+            request.user.groups.add(Group.objects.filter(name='admin').get())
+
+            messages.add_message(request, messages.SUCCESS, _('You have successfully created your own recipe space. Start by adding some recipes or invite other people to join you.'))
+            return HttpResponseRedirect(reverse('index'))
+
+        if join_form.is_valid():
+            return HttpResponseRedirect(reverse('view_signup', args=[join_form.cleaned_data['token']]))
+    else:
+        if settings.SOCIAL_DEFAULT_ACCESS:
+            request.user.userpreference.space = Space.objects.first()
+            request.user.userpreference.save()
+            request.user.groups.add(Group.objects.get(name=settings.SOCIAL_DEFAULT_GROUP))
+            return HttpResponseRedirect(reverse('index'))
+        if 'signup_token' in request.session:
+            return HttpResponseRedirect(reverse('view_signup', args=[request.session.pop('signup_token', '')]))
+
+        create_form = SpaceCreateForm()
+        join_form = SpaceJoinForm()
+
+    return render(request, 'no_space_info.html', {'create_form': create_form, 'join_form': join_form})


 def no_perm(request):
@@ -390,36 +418,53 @@ def signup(request, token):
            return HttpResponseRedirect(reverse('index'))

        if link := InviteLink.objects.filter(valid_until__gte=datetime.today(), used_by=None, uuid=token).first():
-            if request.method == 'POST':
-                updated_request = request.POST.copy()
-                if link.username != '':
-                    updated_request.update({'name': link.username})
+            if request.user.is_authenticated:
+                if request.user.userpreference.space:
+                    messages.add_message(request, messages.WARNING, _('You are already member of a space and therefore cannot join this one.'))
+                    return HttpResponseRedirect(reverse('index'))

-                form = UserCreateForm(updated_request)
+                link.used_by = request.user
+                link.save()
+                request.user.groups.add(link.group)

-                if form.is_valid():
-                    if form.cleaned_data['password'] != form.cleaned_data['password_confirm']:  # noqa: E501
-                        form.add_error('password', _('Passwords dont match!'))
-                    else:
-                        user = User(username=form.cleaned_data['name'], )
-                        try:
-                            validate_password(form.cleaned_data['password'], user=user)
-                            user.set_password(form.cleaned_data['password'])
-                            user.save()
-                            messages.add_message(request, messages.SUCCESS, _('User has been created, please login!'))
+                request.user.userpreference.space = link.space
+                request.user.userpreference.save()

-                            link.used_by = user
-                            link.save()
-                            user.groups.add(link.group)
-
-                            user.userpreference.space = link.space
-                            user.userpreference.save()
-                            return HttpResponseRedirect(reverse('account_login'))
-                        except ValidationError as e:
-                            for m in e:
-                                form.add_error('password', m)
+                messages.add_message(request, messages.SUCCESS, _('Successfully joined space.'))
+                return HttpResponseRedirect(reverse('index'))
            else:
-                form = UserCreateForm()
+                request.session['signup_token'] = token
+
+                if request.method == 'POST':
+                    updated_request = request.POST.copy()
+                    if link.username != '':
+                        updated_request.update({'name': link.username})
+
+                    form = UserCreateForm(updated_request)
+
+                    if form.is_valid():
+                        if form.cleaned_data['password'] != form.cleaned_data['password_confirm']:  # noqa: E501
+                            form.add_error('password', _('Passwords dont match!'))
+                        else:
+                            user = User(username=form.cleaned_data['name'], )
+                            try:
+                                validate_password(form.cleaned_data['password'], user=user)
+                                user.set_password(form.cleaned_data['password'])
+                                user.save()
+                                messages.add_message(request, messages.SUCCESS, _('User has been created, please login!'))
+
+                                link.used_by = user
+                                link.save()
+                                user.groups.add(link.group)
+
+                                user.userpreference.space = link.space
+                                user.userpreference.save()
+                                return HttpResponseRedirect(reverse('account_login'))
+                            except ValidationError as e:
+                                for m in e:
+                                    form.add_error('password', m)
+                else:
+                    form = UserCreateForm()

            if link.username != '':
                form.fields['name'].initial = link.username
@@ -430,6 +475,26 @@ def signup(request, token):
        return HttpResponseRedirect(reverse('index'))


+@group_required('admin')
+def space(request):
+    space_users = UserPreference.objects.filter(space=request.space).all()
+
+    counts = Object()
+    counts.recipes = Recipe.objects.filter(space=request.space).count()
+    counts.keywords = Keyword.objects.filter(space=request.space).count()
+    counts.recipe_import = RecipeImport.objects.filter(space=request.space).count()
+    counts.units = Unit.objects.filter(space=request.space).count()
+    counts.ingredients = Food.objects.filter(space=request.space).count()
+    counts.comments = Comment.objects.filter(recipe__space=request.space).count()
+
+    counts.recipes_internal = Recipe.objects.filter(internal=True, space=request.space).count()
+    counts.recipes_external = counts.recipes - counts.recipes_internal
+
+    counts.recipes_no_keyword = Recipe.objects.filter(keywords=None, space=request.space).count()
+
+    return render(request, 'space.html', {'space_users': space_users, 'counts': counts})
+
+
 def markdown_info(request):
    return render(request, 'markdown_info.html', {})