From 33f51fcdbc8471d37b5d2d7c2aec9460bc61b799 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 27 Oct 2023 11:19:10 +0200 Subject: [PATCH] add user dids management --- idhub/admin/views.py | 6 +- idhub/models.py | 2 +- idhub/templates/idhub/admin/dids.html | 4 +- idhub/templates/idhub/base.html | 2 +- idhub/templates/idhub/user/did_register.html | 30 ++++++ idhub/templates/idhub/user/dids.html | 56 ++++++++++ idhub/templates/idhub/user/identities.html | 5 - idhub/templates/idhub/user/roles.html | 2 +- idhub/urls.py | 10 +- idhub/user/views.py | 104 +++++++++++++++++-- 10 files changed, 195 insertions(+), 26 deletions(-) create mode 100644 idhub/templates/idhub/user/did_register.html create mode 100644 idhub/templates/idhub/user/dids.html delete mode 100644 idhub/templates/idhub/user/identities.html diff --git a/idhub/admin/views.py b/idhub/admin/views.py index 35c7f9c..e1c0fef 100644 --- a/idhub/admin/views.py +++ b/idhub/admin/views.py @@ -460,7 +460,7 @@ class AdminDidRegisterView(Credentials, CreateView): return form def form_valid(self, form): - user = form.save() + form.save() messages.success(self.request, _('DID created successfully')) return super().form_valid(form) @@ -487,7 +487,7 @@ class AdminDidEditView(Credentials, UpdateView): def form_valid(self, form): user = form.save() - messages.success(self.request, _('DID created successfully')) + messages.success(self.request, _('DID updated successfully')) return super().form_valid(form) @@ -499,10 +499,10 @@ class AdminDidDeleteView(Credentials, DeleteView): success_url = reverse_lazy('idhub:admin_dids') def get(self, request, *args, **kwargs): - # import pdb; pdb.set_trace() self.pk = kwargs['pk'] self.object = get_object_or_404(self.model, pk=self.pk) self.object.delete() + messages.success(self.request, _('DID delete successfully')) return redirect(self.success_url) diff --git a/idhub/models.py b/idhub/models.py index 52f3010..f58f1a2 100644 --- a/idhub/models.py +++ b/idhub/models.py @@ -152,7 +152,7 @@ class Service(models.Model): return ", ".join([x.name for x in self.rol.all()]) def __str__(self): - return "{} -> {}".format(self.domain, self.rol.name) + return "{} -> {}".format(self.domain, self.get_roles()) class UserRol(models.Model): diff --git a/idhub/templates/idhub/admin/dids.html b/idhub/templates/idhub/admin/dids.html index b7156c0..00765af 100644 --- a/idhub/templates/idhub/admin/dids.html +++ b/idhub/templates/idhub/admin/dids.html @@ -43,11 +43,11 @@
- +
- {% trans 'Are you sure that you want delete this template?' %} + {% trans 'Are you sure that you want delete this DID?' %}
diff --git a/idhub/templates/idhub/base.html b/idhub/templates/idhub/base.html index 17627ad..eca65be 100644 --- a/idhub/templates/idhub/base.html +++ b/idhub/templates/idhub/base.html @@ -100,7 +100,7 @@
  • - + Identities (DID)
    • diff --git a/idhub/templates/idhub/user/did_register.html b/idhub/templates/idhub/user/did_register.html new file mode 100644 index 0000000..79f7c08 --- /dev/null +++ b/idhub/templates/idhub/user/did_register.html @@ -0,0 +1,30 @@ +{% extends "idhub/base.html" %} +{% load i18n %} + +{% block content %} +{% load django_bootstrap5 %} +
    +{% csrf_token %} +{% if form.errors %} + +{% endif %} +
    +
    + {% bootstrap_form form %} +
    +
    +
    + {% translate "Cancel" %} + +
    + +
    +{% endblock %} diff --git a/idhub/templates/idhub/user/dids.html b/idhub/templates/idhub/user/dids.html new file mode 100644 index 0000000..ea6b1ea --- /dev/null +++ b/idhub/templates/idhub/user/dids.html @@ -0,0 +1,56 @@ +{% extends "idhub/base.html" %} +{% load i18n %} + +{% block content %} +
    +
    +
    + + + + + + + + + + + + {% for d in dids.all %} + + + + + + + + {% endfor %} + +
    {{ d.created_at }}{{ d.label }}{{ d.did }}
    +
    + {% translate "Add Identity" %} +
    +
    +
    +
    + +{% for d in dids.all %} + +{% endfor %} +{% endblock %} diff --git a/idhub/templates/idhub/user/identities.html b/idhub/templates/idhub/user/identities.html deleted file mode 100644 index d6520a0..0000000 --- a/idhub/templates/idhub/user/identities.html +++ /dev/null @@ -1,5 +0,0 @@ -{% extends "idhub/base.html" %} -{% load i18n %} - -{% block content %} -{% endblock %} diff --git a/idhub/templates/idhub/user/roles.html b/idhub/templates/idhub/user/roles.html index e439a01..b1860f9 100644 --- a/idhub/templates/idhub/user/roles.html +++ b/idhub/templates/idhub/user/roles.html @@ -16,7 +16,7 @@ {% for rol in user.roles.all %} - {{ rol.service.rol.name }} + {{ rol.service.get_roles }} {{ rol.service.description }} {{ rol.service.domain }} diff --git a/idhub/urls.py b/idhub/urls.py index 64bf5ae..bf3b99a 100644 --- a/idhub/urls.py +++ b/idhub/urls.py @@ -67,8 +67,14 @@ urlpatterns = [ name='user_roles'), path('user/gdpr/', views_user.UserGDPRView.as_view(), name='user_gdpr'), - path('user/identities/', views_user.UserIdentitiesView.as_view(), - name='user_identities'), + path('user/identities/', views_user.UserDidsView.as_view(), + name='user_dids'), + path('user/dids/new/', views_user.UserDidRegisterView.as_view(), + name='user_dids_new'), + path('user/dids//', views_user.UserDidEditView.as_view(), + name='user_dids_edit'), + path('user/dids//del/', views_user.UserDidDeleteView.as_view(), + name='user_dids_del'), path('user/credentials/', views_user.UserCredentialsView.as_view(), name='user_credentials'), path('user/credentials_required/', diff --git a/idhub/user/views.py b/idhub/user/views.py index 95316ed..aa95270 100644 --- a/idhub/user/views.py +++ b/idhub/user/views.py @@ -1,12 +1,15 @@ import logging from django.utils.translation import gettext_lazy as _ -from django.views.generic.edit import UpdateView +from django.views.generic.edit import UpdateView, CreateView, DeleteView from django.views.generic.base import TemplateView +from django.shortcuts import get_object_or_404, redirect from django.urls import reverse_lazy from django.contrib import messages +from apiregiter import iota from idhub.user.forms import ProfileForm from idhub.mixins import UserView +from idhub.models import DID class MyProfile(UserView): @@ -14,7 +17,7 @@ class MyProfile(UserView): section = "MyProfile" -class MyWallet(UserView, TemplateView): +class MyWallet(UserView): title = _("My Wallet") section = "MyWallet" @@ -51,25 +54,104 @@ class UserGDPRView(MyProfile, TemplateView): icon = 'bi bi-file-earmark-medical' -class UserIdentitiesView(MyWallet): - template_name = "idhub/user/identities.html" - subtitle = _('Identities (DID)') - icon = 'bi bi-patch-check-fill' - - -class UserCredentialsView(MyWallet): +class UserCredentialsView(MyWallet, TemplateView): template_name = "idhub/user/credentials.html" subtitle = _('Credentials') icon = 'bi bi-patch-check-fill' -class UserCredentialsRequiredView(MyWallet): +class UserCredentialsRequiredView(MyWallet, TemplateView): template_name = "idhub/user/credentials_required.html" subtitle = _('Credentials required') icon = 'bi bi-patch-check-fill' -class UserCredentialsPresentationView(MyWallet): +class UserCredentialsPresentationView(MyWallet, TemplateView): template_name = "idhub/user/credentials_presentation.html" subtitle = _('Credentials Presentation') icon = 'bi bi-patch-check-fill' + + +class UserDidsView(MyWallet, TemplateView): + template_name = "idhub/user/dids.html" + subtitle = _('Identities (DID)') + icon = 'bi bi-patch-check-fill' + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context.update({ + 'dids': self.request.user.dids, + }) + return context + +class UserDidRegisterView(MyWallet, CreateView): + template_name = "idhub/user/did_register.html" + subtitle = _('Add a new Identities (DID)') + icon = 'bi bi-patch-check-fill' + wallet = True + model = DID + fields = ('did', 'label') + success_url = reverse_lazy('idhub:user_dids') + object = None + + def get_form_kwargs(self): + kwargs = super().get_form_kwargs() + kwargs['initial'] = { + 'did': iota.issue_did(), + 'user': self.request.user + } + return kwargs + + def get_form(self): + form = super().get_form() + form.fields['did'].required = False + form.fields['did'].disabled = True + return form + + def form_valid(self, form): + form.instance.user = self.request.user + form.save() + messages.success(self.request, _('DID created successfully')) + return super().form_valid(form) + + +class UserDidEditView(MyWallet, UpdateView): + template_name = "idhub/user/did_register.html" + subtitle = _('Identities (DID)') + icon = 'bi bi-patch-check-fill' + wallet = True + model = DID + fields = ('did', 'label') + success_url = reverse_lazy('idhub:user_dids') + + def get(self, request, *args, **kwargs): + self.pk = kwargs['pk'] + self.object = get_object_or_404(self.model, pk=self.pk) + return super().get(request, *args, **kwargs) + + def get_form(self): + form = super().get_form() + form.fields['did'].required = False + form.fields['did'].disabled = True + return form + + def form_valid(self, form): + user = form.save() + messages.success(self.request, _('DID updated successfully')) + return super().form_valid(form) + + +class UserDidDeleteView(MyWallet, DeleteView): + subtitle = _('Identities (DID)') + icon = 'bi bi-patch-check-fill' + wallet = True + model = DID + success_url = reverse_lazy('idhub:user_dids') + + def get(self, request, *args, **kwargs): + self.pk = kwargs['pk'] + self.object = get_object_or_404(self.model, pk=self.pk) + self.object.delete() + messages.success(self.request, _('DID delete successfully')) + + return redirect(self.success_url)