first page for accept terms and conditions

idhub/admin/forms.py

@@ -19,6 +19,33 @@ from idhub.models import (
 from idhub_auth.models import User
 
 
+class TermsConditionsForm(forms.Form):
+    accept = forms.BooleanField(
+        label=_("Accept terms and conditions of the service"),
+        required=False
+    )
+
+    def __init__(self, *args, **kwargs):
+        self.user = kwargs.pop('user', None)
+        super().__init__(*args, **kwargs)
+
+    def clean(self):
+        data = self.cleaned_data
+        if data.get("accept"):
+            self.user.accept_gdpr = True
+        else:
+            self.user.accept_gdpr = False        
+        return data
+        
+    def save(self, commit=True):
+
+        if commit:
+            self.user.save()
+            return self.user
+        
+        return 
+
+
 class ImportForm(forms.Form):
     did = forms.ChoiceField(label=_("Did"), choices=[])
     schema = forms.ChoiceField(label=_("Schema"), choices=[])

idhub/admin/views.py

@@ -29,6 +29,7 @@ from idhub.email.views import NotifyActivateUserByEmail
 from idhub.admin.forms import (
     ImportForm,
     MembershipForm,
+    TermsConditionsForm,
     SchemaForm,
     UserRolForm,
 )
@@ -48,6 +49,26 @@ from idhub.models import (
 )
 
 
+class TermsAndConditionsView(AdminView, FormView):
+    template_name = "idhub/admin/terms_conditions.html"
+    title = _("GDPR")
+    section = ""
+    subtitle = _('Accept Terms and Conditions')
+    icon = 'bi bi-file-earmark-medical'
+    form_class = TermsConditionsForm
+    success_url = reverse_lazy('idhub:admin_dashboard')
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs['user'] = self.request.user
+        kwargs['initial'] = {"accept": self.request.user.accept_gdpr}
+        return kwargs
+
+    def form_valid(self, form):
+        user = form.save()
+        return super().form_valid(form)
+
+
 class DobleFactorAuthView(AdminView, View):
     url = reverse_lazy('idhub:admin_dashboard')
 

idhub/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.5 on 2024-01-17 16:56
+# Generated by Django 4.2.5 on 2024-01-20 12:47
 
 from django.conf import settings
 from django.db import migrations, models

idhub/mixins.py

@@ -23,6 +23,27 @@ class Http403(PermissionDenied):
 class UserView(LoginRequiredMixin):
     login_url = "/login/"
     wallet = False
+    path_terms = [
+        'admin_terms_and_conditions',
+        'user_terms_and_conditions',
+        'user_gdpr',
+    ]
+
+    def get(self, request, *args, **kwargs):
+        response = super().get(request, *args, **kwargs)
+        url = self.check_gdpr()
+        if url:
+            return url
+
+        return response
+        
+    def post(self, request, *args, **kwargs):
+        response = super().post(request, *args, **kwargs)
+        url = self.check_gdpr()
+        if url:
+            return url
+
+        return response
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -37,6 +58,14 @@ class UserView(LoginRequiredMixin):
         })
         return context
 
+    def check_gdpr(self):
+        if not self.request.user.accept_gdpr:
+            url = reverse_lazy("idhub:user_terms_and_conditions")
+            if self.request.user.is_admin:
+                url = reverse_lazy("idhub:admin_terms_and_conditions")
+            if resolve(self.request.path).url_name not in self.path_terms:
+                return redirect(url)
+
 
 class AdminView(UserView):
 
@@ -50,8 +79,8 @@ class AdminView(UserView):
 
     def check_valid_user(self):
         if not self.request.user.is_admin:
-            raise Http403
+            raise Http403()
 
         if self.request.session.get("2fauth"):
-            raise Http403
+            raise Http403()
         

idhub/templates/idhub/admin/terms_conditions.html

@@ -0,0 +1,57 @@
+{% extends "idhub/base_admin.html" %}
+{% load i18n %}
+
+{% block content %}
+<h3>
+  <i class="{{ icon }}"></i>
+  {{ subtitle }}
+</h3>
+{% load django_bootstrap5 %}
+<form role="form" method="post">
+{% csrf_token %}
+{% if form.errors %}
+<div class="alert alert-danger alert-icon alert-icon-border alert-dismissible" role="alert">
+  <div class="icon"><span class="mdi mdi-close-circle-o"></span></div>
+  <div class="message">
+    {% for field, error in form.errors.items %}
+      {{ error }}<br />
+    {% endfor %}
+    <button class="btn-close" type="button" data-dismiss="alert" aria-label="Close"></button>
+  </div>
+</div>
+{% endif %}
+<div class="row">
+  <div class="col">
+    You must read the terms and conditions of this service and accept the
+    <a class="btn btn-green-admin" href="jacascript:void()" data-bs-toggle="modal" data-bs-target="#gdpr" title="{% trans 'GDPR' %}">Read GDPR</a>
+  </div>
+</div>
+<div class="row">
+  <div class="col-sm-4">
+    {% bootstrap_form form %}
+  </div>
+</div>
+<div class="form-actions-no-box">
+  <a class="btn btn-grey" href="{% url 'idhub:admin_dashboard' %}">{% translate "Cancel" %}</a>
+  <input class="btn btn-green-admin" type="submit" name="submit" value="{% translate 'Save' %}" />
+</div>
+
+</form>
+<!-- Modal -->
+<div class="modal" id="gdpr" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLabel">{% trans 'GDPR info' %}</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+       <p>Here we write the info about GDPR</p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans 'Close' %}</button>
+      </div>
+    </div>
+  </div>
+</div>
+{% endblock %}

idhub/templates/idhub/user/gdpr.html

@@ -6,4 +6,7 @@
   <i class="{{ icon }}"></i>
   {{ subtitle }}
 </h3>
+Gdpr info<br/>
+If you want accept or revoke the Gdpr go to: 
+    <a class="btn btn-green-user" href="{% url 'idhub:user_terms_and_conditions' %}">Terms and conditions</a>
 {% endblock %}

idhub/templates/idhub/user/terms_conditions.html

@@ -0,0 +1,57 @@
+{% extends "idhub/base.html" %}
+{% load i18n %}
+
+{% block content %}
+<h3>
+  <i class="{{ icon }}"></i>
+  {{ subtitle }}
+</h3>
+{% load django_bootstrap5 %}
+<form role="form" method="post">
+{% csrf_token %}
+{% if form.errors %}
+<div class="alert alert-danger alert-icon alert-icon-border alert-dismissible" role="alert">
+  <div class="icon"><span class="mdi mdi-close-circle-o"></span></div>
+  <div class="message">
+    {% for field, error in form.errors.items %}
+      {{ error }}<br />
+    {% endfor %}
+    <button class="btn-close" type="button" data-dismiss="alert" aria-label="Close"></button>
+  </div>
+</div>
+{% endif %}
+<div class="row">
+  <div class="col">
+    You must read the terms and conditions of this service and accept the
+    <a class="btn btn-green-user" href="jacascript:void()" data-bs-toggle="modal" data-bs-target="#gdpr" title="{% trans 'GDPR' %}">Read GDPR</a>
+  </div>
+</div>
+<div class="row">
+  <div class="col-sm-4">
+    {% bootstrap_form form %}
+  </div>
+</div>
+<div class="form-actions-no-box">
+  <a class="btn btn-grey" href="{% url 'idhub:user_dashboard' %}">{% translate "Cancel" %}</a>
+  <input class="btn btn-green-user" type="submit" name="submit" value="{% translate 'Save' %}" />
+</div>
+
+</form>
+<!-- Modal -->
+<div class="modal" id="gdpr" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLabel">{% trans 'GDPR info' %}</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+       <p>Here we write the info about GDPR</p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans 'Close' %}</button>
+      </div>
+    </div>
+  </div>
+</div>
+{% endblock %}

idhub/urls.py

@@ -17,7 +17,12 @@ Including another URLconf
 from django.contrib.auth import views as auth_views
 from django.views.generic import RedirectView
 from django.urls import path, reverse_lazy
-from .views import LoginView, PasswordResetConfirmView, serve_did, DobleFactorSendView
+from .views import (
+    LoginView,
+    PasswordResetConfirmView,
+    serve_did,
+    DobleFactorSendView,
+)
 from .admin import views as views_admin
 from .user import views as views_user
 # from .verification_portal import views as views_verification_portal
@@ -91,6 +96,8 @@ urlpatterns = [
     path('user/credentials_presentation/demand',
         views_user.DemandAuthorizationView.as_view(),
         name='user_demand_authorization'),
+    path('user/terms/', views_user.TermsAndConditionsView.as_view(),
+        name='user_terms_and_conditions'),
 
     # Admin
     path('admin/dashboard/', views_admin.DashboardView.as_view(),
@@ -173,6 +180,8 @@ urlpatterns = [
         name='admin_schemas_import_add'),
     path('admin/import', views_admin.ImportView.as_view(),
         name='admin_import'),
+    path('admin/terms/', views_admin.TermsAndConditionsView.as_view(),
+        name='admin_terms_and_conditions'),
     path('admin/import/new', views_admin.ImportAddView.as_view(),
         name='admin_import_add'),
     path('admin/auth/<uuid:admin2fauth>', views_admin.DobleFactorAuthView.as_view(),

idhub/user/forms.py

@@ -16,6 +16,33 @@ class ProfileForm(forms.ModelForm):
         fields = ('first_name', 'last_name', 'email')
 
 
+class TermsConditionsForm(forms.Form):
+    accept = forms.BooleanField(
+        label=_("Accept terms and conditions of the service"),
+        required=False
+    )
+
+    def __init__(self, *args, **kwargs):
+        self.user = kwargs.pop('user', None)
+        super().__init__(*args, **kwargs)
+
+    def clean(self):
+        data = self.cleaned_data
+        if data.get("accept"):
+            self.user.accept_gdpr = True
+        else:
+            self.user.accept_gdpr = False        
+        return data
+        
+    def save(self, commit=True):
+
+        if commit:
+            self.user.save()
+            return self.user
+        
+        return 
+
+
 class RequestCredentialForm(forms.Form):
     did = forms.ChoiceField(label=_("Did"), choices=[])
     credential = forms.ChoiceField(label=_("Credential"), choices=[])

idhub/user/views.py

@@ -15,7 +15,8 @@ from django.contrib import messages
 from idhub.user.forms import (
     ProfileForm,
     RequestCredentialForm,
-    DemandAuthorizationForm
+    DemandAuthorizationForm,
+    TermsConditionsForm
 )
 from idhub.mixins import UserView
 from idhub.models import DID, VerificableCredential, Event
@@ -89,6 +90,26 @@ class CredentialsView(MyWallet, TemplateView):
         return context
 
     
+class TermsAndConditionsView(UserView, FormView):
+    template_name = "idhub/user/terms_conditions.html"
+    title = _("GDPR")
+    section = ""
+    subtitle = _('Accept Terms and Conditions')
+    icon = 'bi bi-file-earmark-medical'
+    form_class = TermsConditionsForm
+    success_url = reverse_lazy('idhub:user_dashboard')
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs['user'] = self.request.user
+        kwargs['initial'] = {"accept": self.request.user.accept_gdpr}
+        return kwargs
+
+    def form_valid(self, form):
+        user = form.save()
+        return super().form_valid(form)
+
+
 class CredentialView(MyWallet, TemplateView):
     template_name = "idhub/user/credential.html"
     subtitle = _('Credential')

idhub_auth/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.5 on 2024-01-17 16:56
+# Generated by Django 4.2.5 on 2024-01-20 12:47
 
 from django.db import migrations, models
 
@@ -50,6 +50,7 @@ class Migration(migrations.Migration):
                 ),
                 ('encrypted_sensitive_data', models.CharField(max_length=255)),
                 ('salt', models.CharField(max_length=255)),
+                ('accept_gdpr', models.BooleanField(default=False)),
             ],
             options={
                 'abstract': False,

idhub_auth/models.py

@@ -51,6 +51,7 @@ class User(AbstractBaseUser):
     last_name = models.CharField(_("Last name"), max_length=255, blank=True, null=True)
     encrypted_sensitive_data = models.CharField(max_length=255)
     salt = models.CharField(max_length=255)
+    accept_gdpr = models.BooleanField(default=False)
 
     objects = UserManager()
 

oidc4vp/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.5 on 2024-01-17 16:56
+# Generated by Django 4.2.5 on 2024-01-20 12:47
 
 from django.conf import settings
 from django.db import migrations, models

promotion/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.5 on 2024-01-17 16:56
+# Generated by Django 4.2.5 on 2024-01-20 12:47
 
 from django.db import migrations, models
 import django.db.models.deletion