From 5a6e4cececfd4d5228c87eac44bb1867f9301de3 Mon Sep 17 00:00:00 2001 From: Arnaud-D <35631001+Arnaud-D@users.noreply.github.com> Date: Thu, 10 Jun 2021 15:46:04 +0200 Subject: [PATCH] WIP Partage par lien --- assets/scss/main.scss | 1 + assets/scss/pages/_shareable-links.scss | 117 ++++++++++++++ templates/tutorialv2/view/content.html | 7 + .../tutorialv2/view/list_shareable_links.html | 115 ++++++++++++++ .../view/list_shareable_links.part.html | 96 ++++++++++++ zds/settings/abstract_base/django.py | 2 +- .../migrations/0042_shareablelink.py | 40 +++++ zds/tutorialv2/mixins.py | 4 +- zds/tutorialv2/models/__init__.py | 5 + zds/tutorialv2/models/shareable_links.py | 67 ++++++++ .../tests_views/shareable_links/__init__.py | 0 .../tests_createshareablelinkview.py | 47 ++++++ .../tests_deactivateshareablelinkview.py | 48 ++++++ .../tests_deleteshareablelinkview.py | 48 ++++++ .../tests_editshareablelinkview.py | 53 +++++++ .../tests_listshareablelinksview.py | 66 ++++++++ .../tests_reactivateshareablelinkview.py | 48 ++++++ .../tests_sharedcontentview.py | 48 ++++++ zds/tutorialv2/urls/urls_contents.py | 30 ++++ zds/tutorialv2/views/display/config.py | 3 + .../views/display/shared_content.py | 92 +++++++++++ zds/tutorialv2/views/shareable_links.py | 148 ++++++++++++++++++ 22 files changed, 1082 insertions(+), 3 deletions(-) create mode 100644 assets/scss/pages/_shareable-links.scss create mode 100644 templates/tutorialv2/view/list_shareable_links.html create mode 100644 templates/tutorialv2/view/list_shareable_links.part.html create mode 100644 zds/tutorialv2/migrations/0042_shareablelink.py create mode 100644 zds/tutorialv2/models/shareable_links.py create mode 100644 zds/tutorialv2/tests/tests_views/shareable_links/__init__.py create mode 100644 zds/tutorialv2/tests/tests_views/shareable_links/tests_createshareablelinkview.py create mode 100644 zds/tutorialv2/tests/tests_views/shareable_links/tests_deactivateshareablelinkview.py create mode 100644 zds/tutorialv2/tests/tests_views/shareable_links/tests_deleteshareablelinkview.py create mode 100644 zds/tutorialv2/tests/tests_views/shareable_links/tests_editshareablelinkview.py create mode 100644 zds/tutorialv2/tests/tests_views/shareable_links/tests_listshareablelinksview.py create mode 100644 zds/tutorialv2/tests/tests_views/shareable_links/tests_reactivateshareablelinkview.py create mode 100644 zds/tutorialv2/tests/tests_views/shareable_links/tests_sharedcontentview.py create mode 100644 zds/tutorialv2/views/display/shared_content.py create mode 100644 zds/tutorialv2/views/shareable_links.py diff --git a/assets/scss/main.scss b/assets/scss/main.scss index 33ea86bff0..ccb66d2bae 100644 --- a/assets/scss/main.scss +++ b/assets/scss/main.scss @@ -103,6 +103,7 @@ @import "pages/content-editor"; @import "pages/content-exports"; @import "pages/mass-edit-goals"; +@import "pages/shareable-links"; /*------------------------- 11. High pixel ratio (retina) diff --git a/assets/scss/pages/_shareable-links.scss b/assets/scss/pages/_shareable-links.scss new file mode 100644 index 0000000000..ac49d3afab --- /dev/null +++ b/assets/scss/pages/_shareable-links.scss @@ -0,0 +1,117 @@ +.main .content-wrapper.shareable-link-page { + h2 { + color: $accent-700; + border: 0; + } + + .new-link-button { + button { + float: none; + } + } + + .list_of_links { + list-style: none; + + .shareable-link-frame { + border: 1px solid black; + padding: $length-10; + margin-bottom: $length-20; + background: $true-white; + border: solid $length-1 $grey-200; + border-bottom: solid $length-2 $grey-200; + + header { + display: flex; + flex-wrap: wrap; + min-height: $length-24; + + .shareable-link-description { + flex-grow: 100; + display: inline-block; + margin: 0 0 $length-6 0; + padding: 0; + } + + .shareable-link-actions { + display: flex; + flex-wrap: wrap; + + .btn-holder { + min-height: 0; + height: $length-24; + margin: 0 0 $length-6 $length-20; + + + .btn-grey, .btn-cancel, .btn-submit { + padding: 0 $length-6; + line-height: normal; + height: $length-24; + } + + } + + .activation_status { + display: flex; + width: min-content; + + .btn-grey, .btn-submit, input [type="hidden"], input{ + padding: 0 $length-6; + line-height: normal; + height: $length-24; + } + + .status_display { + display: inline-block; + margin: auto; + padding: 0; + margin: 0 $length-6 $length-6 0; + } + + .status_active { + color:green; + vertical-align: middle; + } + + .status_active::before { + content: "✓"; + margin-right: $length-4; + } + + .status_inactive { + color:gray; + vertical-align: middle; + } + + .status_inactive::before { + content: "✕"; + margin-right: $length-4; + } + } + } + } + + section { + .shareable-link-url { + margin: $length-4 0; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + + .shareable-link-info { + display: flex; + flex-wrap: wrap; + + .shareable-link-info-line { + margin: 0 $length-20 0 0; + + &.shareable-link-has-expired { + color: $red-700; + } + } + } + } + } + } +} diff --git a/templates/tutorialv2/view/content.html b/templates/tutorialv2/view/content.html index bb197bdc86..c3e31787ce 100644 --- a/templates/tutorialv2/view/content.html +++ b/templates/tutorialv2/view/content.html @@ -181,6 +181,13 @@ {% include "tutorialv2/includes/sidebar/contributors_management.part.html" %} {% endif %} + {% if display_config.draft_actions.show_shareable_link_management %} +
  • + {% url "content:import" content.pk content.slug as import_url %} + {% trans "Gérer les liens de partage" %} +
    • + {% endif %} + {% endblock %} diff --git a/templates/tutorialv2/view/list_shareable_links.html b/templates/tutorialv2/view/list_shareable_links.html new file mode 100644 index 0000000000..23049ca993 --- /dev/null +++ b/templates/tutorialv2/view/list_shareable_links.html @@ -0,0 +1,115 @@ +{% extends "tutorialv2/base.html" %} +{% load i18n %} + +{% block breadcrumb %} +
  • {{ content.title }}
    • +
  • {% trans "Liens de partage" %}
    • +{% endblock %} + +{% block content_out %} +
    +
    +

    {% blocktrans %} Liens de partage pour « {{ content }} » {% endblocktrans %}

    +
    +
    +

    {% trans "Diffusez votre contenu en partageant un simple lien accessible sans incription sur le site." %}

    + +

    {% trans "Les liens de partages offrent les fonctionnalités suivantes :" %}

    + + {% blocktrans %} + + {% endblocktrans %} + +

    + + +

    +

    + + +

    {% trans "Liens actifs" %}

    + +

    + {% blocktrans %} + Les personnes disposant d'un lien actif peuvent l'utiliser pour lire le contenu. + Il est possible de désactiver un lien temporairement pour en interdire son usage, et le réactiver plus tard. + {% endblocktrans %} +

    + + {% if not active_links_and_forms %} + +

    {% trans "Vous n'avez pas de liens de partage actifs." %}

    + + {% else %} + + + + {% endif %} + + +

    {% trans "Liens expirés" %}

    + +

    + {% blocktrans %} + Un lien de partage expiré ne permet pas de lire le contenu. + Si un lien est expiré, vous pouvez modifier sa date d'expiration pour qu'il fonctionne de nouveau. + {% endblocktrans %} +

    + + {% if not expired_links_and_forms %} + +

    {% trans "Vous n'avez pas de liens de partage expirés." %}

    + + {% else %} + + + + {% endif %} + +

    {% trans "Liens inactifs" %}

    + +

    + {% blocktrans %} + Un lien de partage inactif ne permet pas de lire le contenu. + Vous pouvez le réactiver quand vous le souhaitez pour autoriser de nouveau son usage. + {% endblocktrans %} +

    + + {% if not inactive_links_and_forms %} + +

    {% trans "Vous n'avez pas de liens de partage inactifs." %}

    + + {% else %} + + + + {% endif %} +
    +
    +{% endblock %} diff --git a/templates/tutorialv2/view/list_shareable_links.part.html b/templates/tutorialv2/view/list_shareable_links.part.html new file mode 100644 index 0000000000..237add4321 --- /dev/null +++ b/templates/tutorialv2/view/list_shareable_links.part.html @@ -0,0 +1,96 @@ +{% load i18n %} + +
  • +
    +

    {{ link.description }}

    + +
    + {% if section == "active" or section == "expired" %} +
    +

    Actif

    +
    + {% csrf_token %} + +
    +
    + {% else %} +
    +

    Inactif

    +
    + {% csrf_token %} + +
    +
    + {% endif %} + +
    + + + +
    + +
    + + + +
    +
    +
    + +
    +
    {{ link.full_url }}
    +
    +

    + {% if link.type == "DRAFT" %} + {% trans "Lien vers le dernier brouillon" %} + {% elif link.type == "BETA" %} + {% trans "Lien vers la dernière bêta" %} + {% else %} + {% trans "Lien de type inconnu" %} + {% endif %} +

    + {% if link.valid_indefinitely %} +

    {% trans "Sans date d'expiration" %}

    + {% elif link.expired %} +

    + {% blocktrans with date=link.expiration|date:"DATE_FORMAT" %} + A expiré le {{ date }} + {% endblocktrans %} +

    + {% else %} +

    + {% blocktrans with date=link.expiration|date:"DATE_FORMAT" %} + Expire le {{ date }} + {% endblocktrans %} +

    + {% endif %} +

    +
    +
    +
    • diff --git a/zds/settings/abstract_base/django.py b/zds/settings/abstract_base/django.py index d18d6416af..a5bbfa57cc 100644 --- a/zds/settings/abstract_base/django.py +++ b/zds/settings/abstract_base/django.py @@ -41,7 +41,7 @@ # If you set this to False, Django will not format dates, numbers and # calendars according to the current locale. -USE_L10N = False +USE_L10N = True # If you set this to False, Django will not use timezone-aware datetimes. USE_TZ = False diff --git a/zds/tutorialv2/migrations/0042_shareablelink.py b/zds/tutorialv2/migrations/0042_shareablelink.py new file mode 100644 index 0000000000..4ff78de8c9 --- /dev/null +++ b/zds/tutorialv2/migrations/0042_shareablelink.py @@ -0,0 +1,40 @@ +# Generated by Django 3.2.15 on 2022-09-29 22:07 + +from django.db import migrations, models +import django.db.models.deletion +import uuid + + +class Migration(migrations.Migration): + + dependencies = [ + ("tutorialv2", "0041_remove_must_reindex"), + ] + + operations = [ + migrations.CreateModel( + name="ShareableLink", + fields=[ + ("id", models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), + ("active", models.BooleanField(default=True)), + ("expiration", models.DateTimeField(null=True)), + ("description", models.CharField(default="Lien de partage", max_length=150)), + ( + "type", + models.CharField( + choices=[("DRAFT", "Lien vers le dernier brouillon"), ("BETA", "Lien vers la dernière bêta")], + default="DRAFT", + max_length=10, + ), + ), + ( + "content", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to="tutorialv2.publishablecontent", + verbose_name="Contenu", + ), + ), + ], + ), + ] diff --git a/zds/tutorialv2/mixins.py b/zds/tutorialv2/mixins.py index 520309efdb..da27e8b03d 100644 --- a/zds/tutorialv2/mixins.py +++ b/zds/tutorialv2/mixins.py @@ -8,7 +8,6 @@ from django.views.generic import DetailView, FormView from django.views.generic import View -from zds.forum.models import Topic from zds.tutorialv2.models.database import PublishableContent, PublishedContent, ContentRead from zds.tutorialv2.utils import mark_read from zds.tutorialv2.models.help_requests import HelpWriting @@ -48,6 +47,7 @@ class SingleContentViewMixin: sha = None must_be_author = True authorized_for_staff = True + authorized_for_all = False # used for shareable links is_staff = False is_author = False must_redirect = False @@ -97,7 +97,7 @@ def get_versioned_object(self): is_beta = self.object.is_beta(self.sha) is_public = self.object.is_public(self.sha) and self.public_is_prioritary - if not is_beta and not is_public and not self.is_author: + if not is_beta and not is_public and not self.is_author and not self.authorized_for_all: if not self.is_staff or (not self.authorized_for_staff and self.must_be_author): raise PermissionDenied diff --git a/zds/tutorialv2/models/__init__.py b/zds/tutorialv2/models/__init__.py index e96c506d1f..d153119888 100644 --- a/zds/tutorialv2/models/__init__.py +++ b/zds/tutorialv2/models/__init__.py @@ -62,3 +62,8 @@ ("REJECT", _("Rejeté")), ("CANCEL", _("Annulé")), ) + +SHAREABLE_LINK_TYPES = ( + ("DRAFT", _("Lien vers le dernier brouillon")), + ("BETA", _("Lien vers la dernière bêta")), +) diff --git a/zds/tutorialv2/models/shareable_links.py b/zds/tutorialv2/models/shareable_links.py new file mode 100644 index 0000000000..3f91fcd0f9 --- /dev/null +++ b/zds/tutorialv2/models/shareable_links.py @@ -0,0 +1,67 @@ +import uuid +from datetime import datetime + +from django.conf import settings +from django.db import models +from django.db.models import Q +from django.urls import reverse +from django.utils.translation import gettext_lazy as _ + +from zds.tutorialv2.models import SHAREABLE_LINK_TYPES +from zds.tutorialv2.models.database import PublishableContent + + +class ShareableLinkQuerySet(models.QuerySet): + def for_content(self, content): + return self.filter(content=content) + + def active_and_for_content(self, content): + return self.for_content(content).active() + + def expired_and_for_content(self, content): + return self.for_content(content).expired() + + def inactive_and_for_content(self, content): + return self.for_content(content).inactive() + + def active(self): + pivot_date = datetime.now() + return self.filter(Q(active=True) & (Q(expiration__gte=pivot_date) | Q(expiration=None))) + + def expired(self): + pivot_date = datetime.now() + return self.filter(active=True, expiration__lt=pivot_date) + + def inactive(self): + return self.filter(active=False) + + +class ShareableLink(models.Model): + id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) + content = models.ForeignKey(PublishableContent, verbose_name="Contenu", on_delete=models.CASCADE) + active = models.BooleanField(default=True) + expiration = models.DateTimeField(null=True) + description = models.CharField(default=_("Lien de partage"), max_length=150) + # Types + # DRAFT: always points to the last draft version + # BETA: always points to the last beta version + type = models.CharField(max_length=10, choices=SHAREABLE_LINK_TYPES, default="DRAFT") + + objects = ShareableLinkQuerySet.as_manager() + + def full_url(self): + return settings.ZDS_APP["site"]["url"] + reverse("content:shareable-link-view", kwargs={"id": self.id}) + + def deactivate(self): + self.active = False + self.save() + + def reactivate(self): + self.active = True + self.save() + + def valid_indefinitely(self): + return not self.expiration + + def expired(self): + return self.expiration and self.expiration < datetime.now() diff --git a/zds/tutorialv2/tests/tests_views/shareable_links/__init__.py b/zds/tutorialv2/tests/tests_views/shareable_links/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/zds/tutorialv2/tests/tests_views/shareable_links/tests_createshareablelinkview.py b/zds/tutorialv2/tests/tests_views/shareable_links/tests_createshareablelinkview.py new file mode 100644 index 0000000000..181f59afe7 --- /dev/null +++ b/zds/tutorialv2/tests/tests_views/shareable_links/tests_createshareablelinkview.py @@ -0,0 +1,47 @@ +from django.test import TestCase +from django.urls import reverse + +from zds.member.tests.factories import ProfileFactory, StaffProfileFactory +from zds.tutorialv2.models.shareable_links import ShareableLink +from zds.tutorialv2.tests.factories import PublishableContentFactory +from zds.tutorialv2.views.shareable_links import CreateShareableLinkView + + +class CreateShareableLinkTests(TestCase): + def setUp(self): + # Create users + self.author = ProfileFactory().user + self.staff = StaffProfileFactory().user + self.outsider = ProfileFactory().user + + # Create a content + self.content = PublishableContentFactory(author_list=[self.author]) + + # Get information to be reused in tests + self.url = reverse("content:create-shareable-link", kwargs={"pk": self.content.pk}) + self.redirect_url = reverse("content:list-shareable-links", kwargs={"pk": self.content.pk}) + self.login_url = reverse("member-login") + "?next=" + self.url + + def test_not_authenticated(self): + self.client.logout() + response = self.client.post(self.url) + self.assertRedirects(response, self.login_url) + + def test_authenticated_author(self): + self.client.force_login(self.author) + n_links_before = ShareableLink.objects.all().count() + data = {"description": "Ceci n'est pas le lien vers La Blague", "expiration": "2042-08-01", "type": "BETA"} + response = self.client.post(self.url, data=data) + self.assertRedirects(response, self.redirect_url, target_status_code=200) + n_links_after = ShareableLink.objects.all().count() + self.assertEqual(n_links_after, n_links_before + 1) + + def test_authenticated_staff(self): + self.client.force_login(self.staff) + response = self.client.post(self.url) + self.assertEqual(response.status_code, 403) + + def test_authenticated_outsider(self): + self.client.force_login(self.outsider) + response = self.client.post(self.url) + self.assertEqual(response.status_code, 403) diff --git a/zds/tutorialv2/tests/tests_views/shareable_links/tests_deactivateshareablelinkview.py b/zds/tutorialv2/tests/tests_views/shareable_links/tests_deactivateshareablelinkview.py new file mode 100644 index 0000000000..0b99eec4ea --- /dev/null +++ b/zds/tutorialv2/tests/tests_views/shareable_links/tests_deactivateshareablelinkview.py @@ -0,0 +1,48 @@ +from django.test import TestCase +from django.urls import reverse + +from zds.member.tests.factories import ProfileFactory, StaffProfileFactory +from zds.tutorialv2.models.shareable_links import ShareableLink +from zds.tutorialv2.tests.factories import PublishableContentFactory +from zds.tutorialv2.views.shareable_links import DeactivateShareableLinkView + + +class DeactivateShareableLinkTests(TestCase): + def setUp(self): + # Create users + self.author = ProfileFactory().user + self.staff = StaffProfileFactory().user + self.outsider = ProfileFactory().user + + # Create a content and a link + self.content = PublishableContentFactory(author_list=[self.author]) + self.link = ShareableLink(content=self.content) + self.link.save() + + # Get information to be reused in tests + self.url = reverse("content:deactivate-shareable-link", kwargs={"id": self.link.id}) + self.redirect_url = reverse("content:list-shareable-links", kwargs={"pk": self.content.pk}) + self.login_url = reverse("member-login") + "?next=" + self.url + + def test_not_authenticated(self): + self.client.logout() + response = self.client.post(self.url) + self.assertRedirects(response, self.login_url) + + def test_authenticated_author(self): + self.client.force_login(self.author) + response = self.client.post(self.url, follow=True) + self.assertRedirects(response, self.redirect_url, target_status_code=200) + self.assertContains(response, DeactivateShareableLinkView.success_message) + self.link.refresh_from_db() + self.assertFalse(self.link.active) + + def test_authenticated_staff(self): + self.client.force_login(self.staff) + response = self.client.post(self.url) + self.assertEqual(response.status_code, 403) + + def test_authenticated_outsider(self): + self.client.force_login(self.outsider) + response = self.client.post(self.url) + self.assertEqual(response.status_code, 403) diff --git a/zds/tutorialv2/tests/tests_views/shareable_links/tests_deleteshareablelinkview.py b/zds/tutorialv2/tests/tests_views/shareable_links/tests_deleteshareablelinkview.py new file mode 100644 index 0000000000..0ee3f2ecce --- /dev/null +++ b/zds/tutorialv2/tests/tests_views/shareable_links/tests_deleteshareablelinkview.py @@ -0,0 +1,48 @@ +from django.test import TestCase +from django.urls import reverse + +from zds.member.tests.factories import ProfileFactory, StaffProfileFactory +from zds.tutorialv2.models.shareable_links import ShareableLink +from zds.tutorialv2.tests.factories import PublishableContentFactory +from zds.tutorialv2.views.shareable_links import DeleteShareableLinkView + + +class Tests(TestCase): + def setUp(self): + # Create users + self.author = ProfileFactory().user + self.staff = StaffProfileFactory().user + self.outsider = ProfileFactory().user + + # Create content and links + self.content = PublishableContentFactory(author_list=[self.author]) + self.link = ShareableLink(content=self.content) + self.link.save() + + # Get information to be reused in tests + self.url = reverse("content:delete-shareable-link", kwargs={"id": self.link.id}) + self.redirect_url = reverse("content:list-shareable-links", kwargs={"pk": self.content.pk}) + self.login_url = reverse("member-login") + "?next=" + self.url + + def test_not_authenticated(self): + self.client.logout() + response = self.client.post(self.url) + self.assertRedirects(response, self.login_url) + + def test_authenticated_author(self): + self.client.force_login(self.author) + response = self.client.post(self.url, follow=True) + self.assertRedirects(response, self.redirect_url, target_status_code=200) + self.assertContains(response, DeleteShareableLinkView.success_message) + with self.assertRaises(ShareableLink.DoesNotExist): + ShareableLink.objects.get(id=self.link.id) + + def test_authenticated_staff(self): + self.client.force_login(self.staff) + response = self.client.post(self.url) + self.assertEqual(response.status_code, 403) + + def test_authenticated_outsider(self): + self.client.force_login(self.outsider) + response = self.client.post(self.url) + self.assertEqual(response.status_code, 403) diff --git a/zds/tutorialv2/tests/tests_views/shareable_links/tests_editshareablelinkview.py b/zds/tutorialv2/tests/tests_views/shareable_links/tests_editshareablelinkview.py new file mode 100644 index 0000000000..c488d8cbe9 --- /dev/null +++ b/zds/tutorialv2/tests/tests_views/shareable_links/tests_editshareablelinkview.py @@ -0,0 +1,53 @@ +from datetime import datetime + +from django.test import TestCase +from django.urls import reverse + +from zds.member.tests.factories import ProfileFactory, StaffProfileFactory +from zds.tutorialv2.models.shareable_links import ShareableLink +from zds.tutorialv2.tests.factories import PublishableContentFactory +from zds.tutorialv2.views.shareable_links import EditShareableLinkView + + +class EditShareableLinkTests(TestCase): + def setUp(self): + # Create users + self.author = ProfileFactory().user + self.staff = StaffProfileFactory().user + self.outsider = ProfileFactory().user + + # Create a content and a link + self.content = PublishableContentFactory(author_list=[self.author]) + self.link = ShareableLink(content=self.content) + self.link.save() + + # Get information to be reused in tests + self.url = reverse("content:edit-shareable-link", kwargs={"id": self.link.id}) + self.redirect_url = reverse("content:list-shareable-links", kwargs={"pk": self.content.pk}) + self.login_url = reverse("member-login") + "?next=" + self.url + + def test_not_authenticated(self): + self.client.logout() + response = self.client.post(self.url) + self.assertRedirects(response, self.login_url) + + def test_authenticated_author(self): + self.client.force_login(self.author) + data = {"description": "Ceci n'est pas le lien vers La Blague", "expiration": "2042-08-01", "type": "BETA"} + response = self.client.post(self.url, data=data, follow=True) + self.assertRedirects(response, self.redirect_url, target_status_code=200) + self.assertContains(response, EditShareableLinkView.success_message) + self.link.refresh_from_db() + self.assertEqual(self.link.description, data["description"]) + self.assertEqual(self.link.expiration, datetime.strptime(data["expiration"], "%Y-%m-%d")) + self.assertEqual(self.link.type, data["type"]) + + def test_authenticated_staff(self): + self.client.force_login(self.staff) + response = self.client.post(self.url) + self.assertEqual(response.status_code, 403) + + def test_authenticated_outsider(self): + self.client.force_login(self.outsider) + response = self.client.post(self.url) + self.assertEqual(response.status_code, 403) diff --git a/zds/tutorialv2/tests/tests_views/shareable_links/tests_listshareablelinksview.py b/zds/tutorialv2/tests/tests_views/shareable_links/tests_listshareablelinksview.py new file mode 100644 index 0000000000..df067b42af --- /dev/null +++ b/zds/tutorialv2/tests/tests_views/shareable_links/tests_listshareablelinksview.py @@ -0,0 +1,66 @@ +from django.test import TestCase +from django.urls import reverse +from django.utils.translation import gettext_lazy as _ + +from zds.member.tests.factories import ProfileFactory, StaffProfileFactory +from zds.tutorialv2.models.shareable_links import ShareableLink +from zds.tutorialv2.tests import TutorialTestMixin +from zds.tutorialv2.tests.factories import PublishableContentFactory + + +class ListShareableLinksTests(TutorialTestMixin, TestCase): + def setUp(self): + # Create users + self.author = ProfileFactory().user + self.staff = StaffProfileFactory().user + self.outsider = ProfileFactory().user + + # Create a content + self.content = PublishableContentFactory(author_list=[self.author]) + + # Get information to be reused in tests + self.url = reverse("content:list-shareable-links", kwargs={"pk": self.content.pk}) + self.login_url = reverse("member-login") + "?next=" + self.url + + def test_not_authenticated(self): + self.client.logout() + response = self.client.get(self.url) + self.assertRedirects(response, self.login_url) + + def test_authenticated_author(self): + self.client.force_login(self.author) + response = self.client.get(self.url) + self.assertEqual(response.status_code, 200) + + def test_authenticated_staff(self): + self.client.force_login(self.staff) + response = self.client.get(self.url) + self.assertEqual(response.status_code, 403) + + def test_authenticated_outsider(self): + self.client.force_login(self.outsider) + response = self.client.get(self.url) + self.assertEqual(response.status_code, 403) + + def test_no_link(self): + self.client.force_login(self.author) + response = self.client.get(self.url) + self.assertContains(response, _("Vous n'avez pas de liens de partage actifs.")) + self.assertContains(response, _("Créer un lien de partage")) + + def test_one_link(self): + self.client.force_login(self.author) + ShareableLink(content=self.content).save() + response = self.client.get(self.url) + self.assertContains(response, _("Liens actifs")) + self.assertContains(response, _("Créer un lien de partage")) + self.assertContains(response, '
  • ', count=1) + + def test_two_links(self): + self.client.force_login(self.author) + ShareableLink(content=self.content).save() + ShareableLink(content=self.content).save() + response = self.client.get(self.url) + self.assertContains(response, _("Liens actifs")) + self.assertContains(response, _("Créer un lien de partage")) + self.assertContains(response, '
  • ', count=2) diff --git a/zds/tutorialv2/tests/tests_views/shareable_links/tests_reactivateshareablelinkview.py b/zds/tutorialv2/tests/tests_views/shareable_links/tests_reactivateshareablelinkview.py new file mode 100644 index 0000000000..25ba3cb850 --- /dev/null +++ b/zds/tutorialv2/tests/tests_views/shareable_links/tests_reactivateshareablelinkview.py @@ -0,0 +1,48 @@ +from django.test import TestCase +from django.urls import reverse + +from zds.member.tests.factories import ProfileFactory, StaffProfileFactory +from zds.tutorialv2.models.shareable_links import ShareableLink +from zds.tutorialv2.tests.factories import PublishableContentFactory +from zds.tutorialv2.views.shareable_links import ReactivateShareableLinkView + + +class ReactivateShareableLinkTests(TestCase): + def setUp(self): + # Create users + self.author = ProfileFactory().user + self.staff = StaffProfileFactory().user + self.outsider = ProfileFactory().user + + # Create a content and a link + self.content = PublishableContentFactory(author_list=[self.author]) + self.link = ShareableLink(content=self.content) + self.link.save() + + # Get information to be reused in tests + self.url = reverse("content:reactivate-shareable-link", kwargs={"id": self.link.id}) + self.redirect_url = reverse("content:list-shareable-links", kwargs={"pk": self.content.pk}) + self.login_url = reverse("member-login") + "?next=" + self.url + + def test_not_authenticated(self): + self.client.logout() + response = self.client.post(self.url) + self.assertRedirects(response, self.login_url) + + def test_authenticated_author(self): + self.client.force_login(self.author) + response = self.client.post(self.url, follow=True) + self.assertRedirects(response, self.redirect_url, target_status_code=200) + self.assertContains(response, ReactivateShareableLinkView.success_message) + self.link.refresh_from_db() + self.assertTrue(self.link.active) + + def test_authenticated_staff(self): + self.client.force_login(self.staff) + response = self.client.post(self.url) + self.assertEqual(response.status_code, 403) + + def test_authenticated_outsider(self): + self.client.force_login(self.outsider) + response = self.client.post(self.url) + self.assertEqual(response.status_code, 403) diff --git a/zds/tutorialv2/tests/tests_views/shareable_links/tests_sharedcontentview.py b/zds/tutorialv2/tests/tests_views/shareable_links/tests_sharedcontentview.py new file mode 100644 index 0000000000..7785902448 --- /dev/null +++ b/zds/tutorialv2/tests/tests_views/shareable_links/tests_sharedcontentview.py @@ -0,0 +1,48 @@ +from django.test import TestCase +from django.urls import reverse + +from zds.member.tests.factories import ProfileFactory, StaffProfileFactory +from zds.tutorialv2.models.shareable_links import ShareableLink +from zds.tutorialv2.tests.factories import PublishableContentFactory + + +class SharedContentViewTests(TestCase): + def setUp(self): + # Create users + self.author = ProfileFactory().user + self.staff = StaffProfileFactory().user + self.outsider = ProfileFactory().user + + # Create a content and a link + self.content = PublishableContentFactory(author_list=[self.author]) + self.link = ShareableLink(content=self.content) + self.link.save() + + # Get information to be reused in tests + self.link_url = reverse("content:shareable-link-view", kwargs={"id": self.link.id}) + + def test_not_authenticated(self): + self.client.logout() + response = self.client.get(self.link_url) + self.assertEqual(response.status_code, 200) + + def test_authenticated_author(self): + self.client.force_login(self.author) + response = self.client.get(self.link_url) + self.assertEqual(response.status_code, 200) + + def test_authenticated_staff(self): + self.client.force_login(self.staff) + response = self.client.get(self.link_url) + self.assertEqual(response.status_code, 200) + + def test_authenticated_outsider(self): + self.client.force_login(self.outsider) + response = self.client.get(self.link_url) + self.assertEqual(response.status_code, 200) + + def test_authenticated_author_inactive(self): + self.client.force_login(self.author) + self.link.deactivate() + response = self.client.get(self.link_url) + self.assertEqual(response.status_code, 403) diff --git a/zds/tutorialv2/urls/urls_contents.py b/zds/tutorialv2/urls/urls_contents.py index 89da39e1e1..6afb7640ed 100644 --- a/zds/tutorialv2/urls/urls_contents.py +++ b/zds/tutorialv2/urls/urls_contents.py @@ -11,6 +11,7 @@ EditIntroductionView, EditConclusionView, ) +from zds.tutorialv2.views.display.shared_content import ContentSharedView, ContainerSharedView from zds.tutorialv2.views.thumbnail import EditThumbnailView from zds.tutorialv2.views.display.container import ContainerValidationView from zds.tutorialv2.views.display.content import ContentValidationView @@ -18,6 +19,14 @@ from zds.tutorialv2.views.goals import EditGoals, MassEditGoals, ViewContentsByGoal from zds.tutorialv2.views.labels import EditLabels, ViewContentsByLabel from zds.tutorialv2.views.licence import EditContentLicense +from zds.tutorialv2.views.shareable_links import ( + ListShareableLinksView, + CreateShareableLinkView, + DeactivateShareableLinkView, + EditShareableLinkView, + ReactivateShareableLinkView, + DeleteShareableLinkView, +) from zds.tutorialv2.views.validations_contents import ActivateJSFiddleInContent from zds.tutorialv2.views.containers_extracts import ( CreateContainer, @@ -68,6 +77,26 @@ path("flux/atom/", RedirectView.as_view(pattern_name="publication:feed-atom", permanent=True), name="feed-atom"), ] +shareable_links = [ + path("partage/gerer//", ListShareableLinksView.as_view(), name="list-shareable-links"), + path("partage/creer//", CreateShareableLinkView.as_view(), name="create-shareable-link"), + path("partage/modifier//", EditShareableLinkView.as_view(), name="edit-shareable-link"), + path("partage/desactiver//", DeactivateShareableLinkView.as_view(), name="deactivate-shareable-link"), + path("partage/reactiver//", ReactivateShareableLinkView.as_view(), name="reactivate-shareable-link"), + path("partage/supprimer//", DeleteShareableLinkView.as_view(), name="delete-shareable-link"), + path( + "partage////", + ContainerSharedView.as_view(), + name="shareable-link-container", + ), + path( + "partage///", + ContainerSharedView.as_view(), + name="shareable-link-container", + ), + path("partage//", ContentSharedView.as_view(), name="shareable-link-view"), +] + def get_beta_pages(): base_pattern = "beta//" @@ -121,6 +150,7 @@ def get_version_pages(): urlpatterns = ( feeds + + shareable_links + get_version_pages() + get_beta_pages() + get_validation_pages() diff --git a/zds/tutorialv2/views/display/config.py b/zds/tutorialv2/views/display/config.py index 7e6344a4cf..8d3b84c3b0 100644 --- a/zds/tutorialv2/views/display/config.py +++ b/zds/tutorialv2/views/display/config.py @@ -192,6 +192,9 @@ def show_categories_management(self) -> bool: def show_contributors_management(self) -> bool: return self.enabled and self.is_allowed + def show_shareable_link_management(self) -> bool: + return self.enabled and self.is_allowed + def show_ready_to_publish(self) -> bool: return self.enabled and self.is_allowed and self.requires_validation diff --git a/zds/tutorialv2/views/display/shared_content.py b/zds/tutorialv2/views/display/shared_content.py new file mode 100644 index 0000000000..2b388dc204 --- /dev/null +++ b/zds/tutorialv2/views/display/shared_content.py @@ -0,0 +1,92 @@ +from django.core.exceptions import PermissionDenied +from django.http import Http404 +from django.shortcuts import get_object_or_404 +from django.urls import reverse + +from zds.tutorialv2.models.database import PublishableContent +from zds.tutorialv2.models.shareable_links import ShareableLink +from zds.tutorialv2.models.versioned import VersionedContent +from zds.tutorialv2.views.display.config import ViewConfig +from zds.tutorialv2.views.display.container import ContainerBaseView +from zds.tutorialv2.views.display.content import ContentBaseView + + +class ConfigForSharedView(ViewConfig): + def __init__(self, user, content: PublishableContent, versioned_content: VersionedContent): + super().__init__(user, content, versioned_content) + self.beta_actions.enabled = False + self.draft_actions.enabled = False + self.online_config.enabled = False + self.info_config.enabled = False + self.public_actions.enabled = False + self.administration_actions.enabled = False + self.validation_actions.enabled = False + + +class ContentSharedView(ContentBaseView): + must_be_author = False + authorized_for_all = True + sha = None + + def get_object(self, queryset=None): + self.link = get_object_or_404(ShareableLink, id=self.kwargs["id"]) + + if not self.link.active or self.link.expired(): + raise PermissionDenied + + self.content = self.link.content + + sha = self._get_sha() + if sha is None: + raise Http404("This link type cannot be fulfilled by this content.") + + self.versioned_content = self.content.load_version_or_404(sha=sha) + + return self.content + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context["display_config"] = ConfigForSharedView(self.request.user, self.object, self.versioned_object) + context["link"] = self.link + context["content"] = self.versioned_content + return context + + def get_base_url(self): + route_parameters = {"id": self.link.id} + url = reverse("content:shareable-link-view", kwargs=route_parameters) + return url + + def _get_sha(self): + if self.link.type == "DRAFT": + return self.content.sha_draft + elif self.link.type == "BETA" and self.content.in_beta(): + return self.content.sha_beta + else: + return None + + +class ContainerSharedView(ContainerBaseView): + must_be_author = False + authorized_for_all = True + + def get_object(self, queryset=None): + self.link = get_object_or_404(ShareableLink, id=self.kwargs["id"]) + if not self.link.active: + raise PermissionDenied + + self.content = self.link.content + + # TODO manage DRAFT/BETA/etc. + self.versioned_content = self.content.load_version_or_404(sha=self.content.sha_draft) + + return self.content + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context["display_config"] = ConfigForSharedView(self.request.user, self.object, self.versioned_object) + return context + + def get_base_url(self): + route_parameters = {"id": self.link.id} + url = reverse("content:shareable-link-view", kwargs=route_parameters) + return url diff --git a/zds/tutorialv2/views/shareable_links.py b/zds/tutorialv2/views/shareable_links.py new file mode 100644 index 0000000000..c1bbd58c4a --- /dev/null +++ b/zds/tutorialv2/views/shareable_links.py @@ -0,0 +1,148 @@ +from django import forms +from django.contrib import messages +from django.contrib.auth.decorators import login_required +from django.core.exceptions import PermissionDenied +from django.shortcuts import get_object_or_404, redirect +from django.urls import reverse +from django.utils.decorators import method_decorator +from django.utils.translation import gettext_lazy as _ +from django.views import View +from django.views.generic import TemplateView + +from zds.member.decorator import LoginRequiredMixin +from zds.tutorialv2.mixins import SingleContentDetailViewMixin, ModalFormView +from zds.tutorialv2.models import SHAREABLE_LINK_TYPES +from zds.tutorialv2.models.database import PublishableContent +from zds.tutorialv2.models.shareable_links import ShareableLink + + +class ListShareableLinksView(LoginRequiredMixin, SingleContentDetailViewMixin, TemplateView): + template_name = "tutorialv2/view/list_shareable_links.html" + authorized_for_staff = False + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + content = self.get_object() + context["active_links_and_forms"] = self.get_active_links_and_forms(content) + context["expired_links_and_forms"] = self.get_expired_links_and_forms(content) + context["inactive_links_and_forms"] = self.get_inactive_links_and_forms(content) + context["create_form"] = ShareableLinkForm() + return context + + def get_active_links_and_forms(self, content): + return self.get_links_and_forms(ShareableLink.objects.active_and_for_content(content)) + + def get_expired_links_and_forms(self, content): + return self.get_links_and_forms(ShareableLink.objects.expired_and_for_content(content)) + + def get_inactive_links_and_forms(self, content): + return self.get_links_and_forms(ShareableLink.objects.inactive_and_for_content(content)) + + @staticmethod + def get_links_and_forms(links): + edit_forms = [ShareableLinkForm(initial=initial) for initial in links.values()] + return list(zip(links, edit_forms)) + + +class ShareableLinkForm(forms.Form): + description = forms.CharField(label=_("Description"), initial=_("Lien de partage")) + expiration = forms.DateTimeField( + label=_("Date d'expiration (laisser vide pour une durée illimitée)"), + widget=forms.DateInput(attrs={"type": "date"}), + required=False, + ) + type = forms.ChoiceField(choices=SHAREABLE_LINK_TYPES) + + +class PermissionMixin: + http_method_names = ["post"] + + @method_decorator(login_required) + def dispatch(self, *args, **kwargs): + if self.request.user not in self.content.authors.all(): + raise PermissionDenied + self.redirect_url = reverse("content:list-shareable-links", kwargs={"pk": self.content.pk}) + return super().dispatch(*args, *kwargs) + + +class ContentMixin(PermissionMixin): + def dispatch(self, *args, **kwargs): + self.content = get_object_or_404(PublishableContent, pk=self.kwargs["pk"]) + return super().dispatch(*args, *kwargs) + + +class LinkMixin(PermissionMixin): + def dispatch(self, *args, **kwargs): + self.link = get_object_or_404(ShareableLink, id=self.kwargs["id"]) + self.content = self.link.content + return super().dispatch(*args, *kwargs) + + +class CreateShareableLinkView(ContentMixin, ModalFormView): + http_method_names = ["post"] + form_class = ShareableLinkForm + modal_form = True + + def form_invalid(self, form): + form.previous_page_url = self.redirect_url + return super().form_invalid(form) + + def form_valid(self, form): + ShareableLink( + content=self.content, + description=form.cleaned_data["description"], + expiration=form.cleaned_data["expiration"], + type=form.cleaned_data["type"], + ).save() + self.success_url = self.redirect_url + messages.success(self.request, _("Le lien a été créé.")) + return super().form_valid(form) + + +class EditShareableLinkView(LinkMixin, ModalFormView): + form_class = ShareableLinkForm + modal_form = True + success_message = _("Le lien a été modifié.") + + def form_invalid(self, form): + form.previous_page_url = self.redirect_url + return super().form_invalid(form) + + def form_valid(self, form): + self.link.description = form.cleaned_data["description"] + self.link.expiration = form.cleaned_data["expiration"] + self.link.type = form.cleaned_data["type"] + self.link.save() + self.success_url = self.redirect_url + messages.success(self.request, self.success_message) + return super().form_valid(form) + + +class DeactivateShareableLinkView(LinkMixin, View): + http_method_names = ["post"] + success_message = _("Le lien a été désactivé.") + + def post(self, *args, **kwargs): + self.link.deactivate() + messages.success(self.request, self.success_message) + return redirect(self.redirect_url) + + +class ReactivateShareableLinkView(LinkMixin, View): + http_method_names = ["post"] + success_message = _("Le lien a été réactivé.") + + def post(self, *args, **kwargs): + self.link.reactivate() + messages.success(self.request, self.success_message) + return redirect(self.redirect_url) + + +class DeleteShareableLinkView(LinkMixin, View): + http_method_names = ["post"] + success_message = _("Le lien a été supprimé.") + + def post(self, *args, **kwargs): + self.link.delete() + messages.success(self.request, self.success_message) + return redirect(self.redirect_url)