From f00285624f6d4f219597380cf2d71475935b2c0f Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@usody.com>
Date: Fri, 3 Nov 2023 16:27:40 +0100
Subject: [PATCH] remove did of Did forms

---
 idhub/admin/views.py                         | 25 +++-------------
 idhub/templates/idhub/admin/dids.html        |  2 +-
 idhub/templates/idhub/user/did_register.html |  2 +-
 idhub/templates/idhub/user/dids.html         |  2 +-
 idhub/user/views.py                          | 30 ++++++--------------
 5 files changed, 16 insertions(+), 45 deletions(-)

diff --git a/idhub/admin/views.py b/idhub/admin/views.py
index 9e5b4e7..dc4c016 100644
--- a/idhub/admin/views.py
+++ b/idhub/admin/views.py
@@ -456,24 +456,13 @@ class AdminDidRegisterView(Credentials, CreateView):
     icon = 'bi bi-patch-check-fill'
     wallet = True
     model = DID
-    fields = ('did', 'label')
+    fields = ('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):
+        form.instance.user = self.request.user
+        form.instance.did = iota.issue_did()
         form.save()
         messages.success(self.request, _('DID created successfully'))
         return super().form_valid(form)
@@ -485,7 +474,7 @@ class AdminDidEditView(Credentials, UpdateView):
     icon = 'bi bi-patch-check-fill'
     wallet = True
     model = DID
-    fields = ('did', 'label')
+    fields = ('label',)
     success_url = reverse_lazy('idhub:admin_dids')
 
     def get(self, request, *args, **kwargs):
@@ -493,12 +482,6 @@ class AdminDidEditView(Credentials, UpdateView):
         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'))
diff --git a/idhub/templates/idhub/admin/dids.html b/idhub/templates/idhub/admin/dids.html
index 00765af..0bac4c5 100644
--- a/idhub/templates/idhub/admin/dids.html
+++ b/idhub/templates/idhub/admin/dids.html
@@ -43,7 +43,7 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel">{% trans 'Delete DID' %} {{ d.did }}</h5>
+        <h5 class="modal-title" id="exampleModalLabel">{% trans 'Delete DID' %} "{{ d.label }}"</h5>
         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
       </div>
       <div class="modal-body">
diff --git a/idhub/templates/idhub/user/did_register.html b/idhub/templates/idhub/user/did_register.html
index b2e1111..6e8debb 100644
--- a/idhub/templates/idhub/user/did_register.html
+++ b/idhub/templates/idhub/user/did_register.html
@@ -27,7 +27,7 @@
 </div>
 <div class="form-actions-no-box">
   <a class="btn btn-grey" href="{% url 'idhub:user_dids' %}">{% trans "Cancel" %}</a>
-  <input class="btn btn-green-admin" type="submit" name="submit" value="{% trans 'Save' %}" />
+  <input class="btn btn-green-user" type="submit" name="submit" value="{% trans 'Save' %}" />
 </div>
 
 </form>
diff --git a/idhub/templates/idhub/user/dids.html b/idhub/templates/idhub/user/dids.html
index eae3db6..092aedd 100644
--- a/idhub/templates/idhub/user/dids.html
+++ b/idhub/templates/idhub/user/dids.html
@@ -43,7 +43,7 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel">{% trans 'Delete DID' %} {{ d.did }}</h5>
+        <h5 class="modal-title" id="exampleModalLabel">{% trans 'Delete DID' %} "{{ d.label }}"</h5>
         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
       </div>
       <div class="modal-body">
diff --git a/idhub/user/views.py b/idhub/user/views.py
index 5071968..9f9ece7 100644
--- a/idhub/user/views.py
+++ b/idhub/user/views.py
@@ -170,26 +170,20 @@ class UserDidRegisterView(MyWallet, CreateView):
     icon = 'bi bi-patch-check-fill'
     wallet = True
     model = DID
-    fields = ('did', 'label')
+    fields = ('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 get_form_kwargs(self):
+    #     kwargs = super().get_form_kwargs()
+    #     kwargs['initial'] = {
+    #         'user': self.request.user
+    #     }
+    #     return kwargs
 
     def form_valid(self, form):
         form.instance.user = self.request.user
+        form.instance.did = iota.issue_did()
         form.save()
         messages.success(self.request, _('DID created successfully'))
         return super().form_valid(form)
@@ -201,7 +195,7 @@ class UserDidEditView(MyWallet, UpdateView):
     icon = 'bi bi-patch-check-fill'
     wallet = True
     model = DID
-    fields = ('did', 'label')
+    fields = ('label',)
     success_url = reverse_lazy('idhub:user_dids')
 
     def get(self, request, *args, **kwargs):
@@ -209,12 +203,6 @@ class UserDidEditView(MyWallet, UpdateView):
         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'))