management of organization dids

apiregiter.py

@@ -0,0 +1,17 @@
+import uuid
+import hashlib
+
+
+class Iota:
+    """
+    Framework for simulate the comunication with IOTA DLT  
+    """
+
+    def issue_did(self):
+        u = str(uuid.uuid4()).encode()
+        d = hashlib.sha3_256(u).hexdigest()
+        did = "did:iota:{}".format(d)
+        return did
+
+
+iota = Iota()

idhub/admin/forms.py

@@ -1,34 +0,0 @@
-from django import forms
-from idhub_auth.models import User
-from idhub.models import Rol
-
-
-class ProfileForm(forms.ModelForm):
-    MANDATORY_FIELDS = ['first_name', 'last_name', 'email']
-
-    class Meta:
-        model = User
-        fields = ('first_name', 'last_name', 'email')
-
-
-class MembershipForm(forms.ModelForm):
-    MANDATORY_FIELDS = ['type']
-
-
-class RolForm(forms.ModelForm):
-    MANDATORY_FIELDS = ['name']
-
-
-class ServiceForm(forms.ModelForm):
-    MANDATORY_FIELDS = ['domain', 'rol']
-
-
-class UserRolForm(forms.ModelForm):
-    MANDATORY_FIELDS = ['service']
-
-
-class SchemaForm(forms.Form):
-    file_template = forms.FileField()
-
-class ImportForm(forms.Form):
-    file_import = forms.FileField()

idhub/admin/views.py

@@ -11,11 +11,12 @@ from smtplib import SMTPException
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 from django.views.generic.base import TemplateView
-from django.views.generic.edit import UpdateView, CreateView
+from django.views.generic.edit import UpdateView, CreateView, DeleteView
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse_lazy
 from django.http import HttpResponse
 from django.contrib import messages
+from apiregiter import iota
 from idhub_auth.models import User
 from idhub.mixins import AdminView
 from idhub.email.views import NotifyActivateUserByEmail
@@ -29,15 +30,6 @@ from idhub.models import (
     UserRol,
     VerifiableCredential,
 )
-from idhub.admin.forms import (
-    ProfileForm,
-    MembershipForm,
-    RolForm,
-    ServiceForm,
-    UserRolForm,
-    SchemaForm,
-    ImportForm,
-)
 
 
 class AdminDashboardView(AdminView, TemplateView):
@@ -138,7 +130,6 @@ class AdminPeopleDeleteView(AdminPeopleView):
             
 class AdminPeopleEditView(AdminPeopleView, UpdateView):
     template_name = "idhub/admin/user_edit.html"
-    from_class = ProfileForm
     fields = ('first_name', 'last_name', 'email')
     success_url = reverse_lazy('idhub:admin_people_list')
 
@@ -148,7 +139,6 @@ class AdminPeopleRegisterView(NotifyActivateUserByEmail, People, CreateView):
     subtitle = _('People Register')
     icon = 'bi bi-person'
     model = User
-    from_class = ProfileForm
     fields = ('first_name', 'last_name', 'email')
     success_url = reverse_lazy('idhub:admin_people_list')
 
@@ -175,7 +165,6 @@ class AdminPeopleMembershipRegisterView(People, CreateView):
     subtitle = _('People add membership')
     icon = 'bi bi-person'
     model = Membership
-    from_class = MembershipForm
     fields = ('type', 'start_date', 'end_date')
     success_url = reverse_lazy('idhub:admin_people_list')
 
@@ -213,7 +202,6 @@ class AdminPeopleMembershipEditView(People, CreateView):
     subtitle = _('People add membership')
     icon = 'bi bi-person'
     model = Membership
-    from_class = MembershipForm
     fields = ('type', 'start_date', 'end_date')
     success_url = reverse_lazy('idhub:admin_people_list')
 
@@ -252,7 +240,6 @@ class AdminPeopleRolRegisterView(People, CreateView):
     subtitle = _('Add Rol to User')
     icon = 'bi bi-person'
     model = UserRol
-    from_class = UserRolForm
     fields = ('service',)
 
     def get(self, request, *args, **kwargs):
@@ -283,7 +270,6 @@ class AdminPeopleRolEditView(People, CreateView):
     subtitle = _('Edit Rol to User')
     icon = 'bi bi-person'
     model = UserRol
-    from_class = UserRolForm
     fields = ('service',)
 
     def get_form_kwargs(self):
@@ -331,7 +317,6 @@ class AdminRolRegisterView(AccessControl, CreateView):
     subtitle = _('Add Rol')
     icon = ''
     model = Rol
-    from_class = RolForm
     fields = ('name',)
     success_url = reverse_lazy('idhub:admin_roles')
     object = None
@@ -342,7 +327,6 @@ class AdminRolEditView(AccessControl, CreateView):
     subtitle = _('Edit Rol')
     icon = ''
     model = Rol
-    from_class = RolForm
     fields = ('name',)
     success_url = reverse_lazy('idhub:admin_roles')
 
@@ -382,7 +366,6 @@ class AdminServiceRegisterView(AccessControl, CreateView):
     subtitle = _('Add Service')
     icon = ''
     model = Service
-    from_class = ServiceForm
     fields = ('domain', 'description', 'rol')
     success_url = reverse_lazy('idhub:admin_services')
     object = None
@@ -393,7 +376,6 @@ class AdminServiceEditView(AccessControl, CreateView):
     subtitle = _('Edit Service')
     icon = ''
     model = Service
-    from_class = ServiceForm
     fields = ('domain', 'description', 'rol')
     success_url = reverse_lazy('idhub:admin_services')
 
@@ -441,8 +423,8 @@ class AdminRevokeCredentialsView(Credentials):
     icon = ''
 
 
-class AdminWalletIdentitiesView(Credentials):
-    template_name = "idhub/admin/wallet_identities.html"
+class AdminDidsView(Credentials):
+    template_name = "idhub/admin/dids.html"
     subtitle = _('Organization Identities (DID)')
     icon = 'bi bi-patch-check-fill'
     wallet = True
@@ -454,6 +436,76 @@ class AdminWalletIdentitiesView(Credentials):
         })
         return context
 
+class AdminDidRegisterView(Credentials, CreateView):
+    template_name = "idhub/admin/did_register.html"
+    subtitle = _('Add a new Organization Identities (DID)')
+    icon = 'bi bi-patch-check-fill'
+    wallet = True
+    model = DID
+    fields = ('did', 'label')
+    success_url = reverse_lazy('idhub:admin_dids')
+    object = None
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs['initial'] = {
+            'did': iota.issue_did()
+        }
+        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):
+        user = form.save()
+        messages.success(self.request, _('DID created successfully'))
+        return super().form_valid(form)
+
+
+class AdminDidEditView(Credentials, UpdateView):
+    template_name = "idhub/admin/did_register.html"
+    subtitle = _('Organization Identities (DID)')
+    icon = 'bi bi-patch-check-fill'
+    wallet = True
+    model = DID
+    fields = ('did', 'label')
+    success_url = reverse_lazy('idhub:admin_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 created successfully'))
+        return super().form_valid(form)
+
+
+class AdminDidDeleteView(Credentials, DeleteView):
+    subtitle = _('Organization Identities (DID)')
+    icon = 'bi bi-patch-check-fill'
+    wallet = True
+    model = DID
+    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()
+
+        return redirect(self.success_url)
+
 
 class AdminWalletCredentialsView(Credentials):
     template_name = "idhub/admin/wallet_credentials.html"

idhub/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.5 on 2023-10-26 11:29
+# Generated by Django 4.2.5 on 2023-10-26 13:46
 
 from django.conf import settings
 from django.db import migrations, models
@@ -225,7 +225,8 @@ class Migration(migrations.Migration):
                         verbose_name='ID',
                     ),
                 ),
-                ('did_string', models.CharField(max_length=250)),
+                ('created_at', models.DateTimeField(auto_now=True)),
+                ('did', models.CharField(max_length=250, unique=True)),
                 ('label', models.CharField(max_length=50)),
                 (
                     'user',

idhub/models.py

@@ -4,15 +4,6 @@ from django.utils.translation import gettext_lazy as _
 from idhub_auth.models import User
 
 
-# class AppUser(models.Model):
-    # Ya incluye "first_name", "last_name", "email", y "date_joined" heredando de la clase User de django.
-    # Falta ver que más información hay que añadir a nuestros usuarios, como los roles etc.
-    # django_user = models.OneToOneField(DjangoUser, on_delete=models.CASCADE)
-
-    # Extra data, segun entidad/organizacion
-    # pass
-
-
 # class Event(models.Model):
     # Para los "audit logs" que se requieren en las pantallas.
     # timestamp = models.DateTimeField()
@@ -21,7 +12,8 @@ from idhub_auth.models import User
 
 
 class DID(models.Model):
-    did_string = models.CharField(max_length=250)
+    created_at = models.DateTimeField(auto_now=True)
+    did = models.CharField(max_length=250, unique=True)
     label = models.CharField(max_length=50)
     user = models.ForeignKey(
         User,

idhub/templates/idhub/admin/did_register.html

@@ -0,0 +1,34 @@
+{% 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-sm-4">
+    {% bootstrap_form form %}
+  </div>
+</div>
+<div class="form-actions-no-box">
+  <a class="btn btn-grey" href="{% url 'idhub:admin_dids' %}">{% translate "Cancel" %}</a>
+  <input class="btn btn-green-admin" type="submit" name="submit" value="{% translate 'Save' %}" />
+</div>
+
+</form>
+{% endblock %}

idhub/templates/idhub/admin/dids.html

@@ -24,15 +24,15 @@
           <tr style="font-size:15px;">
             <td>{{ d.created_at }}</td>
             <td>{{ d.label }}</td>
-            <td>{{ d.id }}</td>
-            <td><button type="button" class="btn btn-green-admin">{% trans 'Modify' %}</button></td>
+            <td>{{ d.did }}</td>
+            <td><a class="text-primary" href="{% url 'idhub:admin_dids_edit' d.id %}" title="{% trans 'Edit' %}"><i class="bi bi-pencil-square"></i></a></td>
             <td><a class="text-danger" href="jacascript:void()" data-bs-toggle="modal" data-bs-target="#confirm-delete-{{ d.id }}" title="{% trans 'Remove' %}"><i class="bi bi-x-circle"></i></a></td>
           </tr>
           {% endfor %}
         </tbody>
       </table>
       <div class="form-actions-no-box">
-        <a class="btn btn-green-admin" href="{# url 'idhub:admin_dids_add' #}">{% translate "Add Identity" %} <i class="bi bi-plus"></i></a>
+        <a class="btn btn-green-admin" href="{% url 'idhub:admin_dids_new' %}">{% translate "Add Identity" %} <i class="bi bi-plus"></i></a>
       </div>
     </div>
   </div>
@@ -51,7 +51,7 @@
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Clancel</button>
-        <a href="{# url 'idhub:admin_dids_del' d.id #}" type="button" class="btn btn-danger">{% trans 'Delete' %}</a>
+        <a href="{% url 'idhub:admin_dids_del' d.id %}" type="button" class="btn btn-danger">{% trans 'Delete' %}</a>
       </div>
     </div>
   </div>

idhub/templates/idhub/base_admin.html

@@ -123,7 +123,7 @@
                     </a>
                     <ul class="flex-column mb-2 accordion-collapse {% if wallet %}expanded{% else %}collapse{% endif %}" id="lwallet" data-bs-parent="#wallet">
                       <li class="nav-item">
-                        <a class="nav-link{% if path == 'admin_wallet_identities' %} active2{% endif %}" href="{% url 'idhub:admin_wallet_identities' %}">
+                        <a class="nav-link{% if path == 'admin_dids' %} active2{% endif %}" href="{% url 'idhub:admin_dids' %}">
                           Identities (DID)
                         </a>
                       </li>

idhub/urls.py

@@ -127,8 +127,14 @@ urlpatterns = [
         name='admin_credentials_new'),
     path('admin/credentials/revoke/', views_admin.AdminRevokeCredentialsView.as_view(),
         name='admin_credentials_revoke'),
-    path('admin/wallet/identities/', views_admin.AdminWalletIdentitiesView.as_view(),
-        name='admin_wallet_identities'),
+    path('admin/wallet/identities/', views_admin.AdminDidsView.as_view(),
+        name='admin_dids'),
+    path('admin/dids/new/', views_admin.AdminDidRegisterView.as_view(),
+        name='admin_dids_new'),
+    path('admin/dids/<int:pk>/', views_admin.AdminDidEditView.as_view(),
+        name='admin_dids_edit'),
+    path('admin/dids/<int:pk>/del/', views_admin.AdminDidDeleteView.as_view(),
+        name='admin_dids_del'),
     path('admin/wallet/credentials/', views_admin.AdminWalletCredentialsView.as_view(),
         name='admin_wallet_credentials'),
     path('admin/wallet/config/issue/', views_admin.AdminWalletConfigIssuesView.as_view(),

idhub_auth/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.5 on 2023-10-26 11:29
+# Generated by Django 4.2.5 on 2023-10-26 13:46
 
 from django.db import migrations, models