From ccaa8834dcc157a615695792289deb2d2580c35d Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@puigdefabregas.eu>
Date: Tue, 11 Feb 2025 17:25:30 +0100
Subject: [PATCH 01/12] fix bug

---
 did/views.py            | 6 +++---
 evidence/mixin_parse.py | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/did/views.py b/did/views.py
index e0a59e6..c53d47f 100644
--- a/did/views.py
+++ b/did/views.py
@@ -106,10 +106,10 @@ class PublicDeviceWebView(TemplateView):
             'device': {},
         }
         dev = Build(self.object.last_evidence.doc, None, check=True)
-        doc = dev.get_phid()
+        doc = dev.get_doc()
         data['document'] = json.dumps(doc)
-        data['device'] = dev.device
-        data['components'] = dev.components
+        data['device'] = doc.device
+        data['components'] = doc.components
 
         self.object.get_evidences()
         last_dpp = Proof.objects.filter(
diff --git a/evidence/mixin_parse.py b/evidence/mixin_parse.py
index 58351fb..8e99747 100644
--- a/evidence/mixin_parse.py
+++ b/evidence/mixin_parse.py
@@ -52,6 +52,8 @@ class BuildMix:
         for c in components:
             doc.append((c.get("type"), self.get_id_hw_dpp(c)))
 
+        return doc
+
     def get_id_hw_dpp(self, d):
         algorithm = ALGOS.get("ereuse22", [])
         hid = ""
-- 
2.30.2


From 0903f53f8b612592e682bf08083d312d7e45e036 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@puigdefabregas.eu>
Date: Wed, 12 Feb 2025 09:20:14 +0100
Subject: [PATCH 02/12] fix get_doc with build.get_doc

---
 did/views.py | 2 +-
 dpp/views.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/did/views.py b/did/views.py
index c53d47f..9294e0b 100644
--- a/did/views.py
+++ b/did/views.py
@@ -106,7 +106,7 @@ class PublicDeviceWebView(TemplateView):
             'device': {},
         }
         dev = Build(self.object.last_evidence.doc, None, check=True)
-        doc = dev.get_doc()
+        doc = dev.build.get_doc()
         data['document'] = json.dumps(doc)
         data['device'] = doc.device
         data['components'] = doc.components
diff --git a/dpp/views.py b/dpp/views.py
index 13753c2..27ca1e6 100644
--- a/dpp/views.py
+++ b/dpp/views.py
@@ -12,7 +12,7 @@ from dpp.models import Proof
 
 
 class ProofView(View):
-    
+
     def get(self, request, *args, **kwargs):
         timestamp = kwargs.get("proof_id")
         proof = Proof.objects.filter(timestamp=timestamp).first()
@@ -22,9 +22,9 @@ class ProofView(View):
         ev = Evidence(proof.uuid)
         if not ev.doc:
             return JsonResponse({}, status=404)
-        
+
         dev = Build(ev.doc, None, check=True)
-        doc = dev.get_phid()
+        doc = dev.build.get_doc()
 
         data = {
             "algorithm": ALGORITHM,
-- 
2.30.2


From 8d37932aa0b44e44ef90855b4026d8dd9639ea5c Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@puigdefabregas.eu>
Date: Wed, 12 Feb 2025 10:18:43 +0100
Subject: [PATCH 03/12] fix document

---
 did/views.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/did/views.py b/did/views.py
index 9294e0b..b5c6365 100644
--- a/did/views.py
+++ b/did/views.py
@@ -107,9 +107,16 @@ class PublicDeviceWebView(TemplateView):
         }
         dev = Build(self.object.last_evidence.doc, None, check=True)
         doc = dev.build.get_doc()
+        components = [x for x in doc if x[0] != "computer"]
+        device = ''
+
+        for d in doc:
+            if d[0] == "computer":
+                device = d[1]
+
         data['document'] = json.dumps(doc)
-        data['device'] = doc.device
-        data['components'] = doc.components
+        data['device'] = device
+        data['components'] = components
 
         self.object.get_evidences()
         last_dpp = Proof.objects.filter(
-- 
2.30.2


From f91818e515997574c7407edcf86d957755e76337 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@puigdefabregas.eu>
Date: Wed, 12 Feb 2025 12:18:30 +0100
Subject: [PATCH 04/12] fix de correct device in document

---
 did/views.py             | 13 +++----------
 evidence/legacy_parse.py |  5 +++++
 evidence/mixin_parse.py  |  2 --
 evidence/normal_parse.py |  5 +++++
 evidence/old_parse.py    | 12 ++++++------
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/did/views.py b/did/views.py
index b5c6365..08df519 100644
--- a/did/views.py
+++ b/did/views.py
@@ -107,16 +107,9 @@ class PublicDeviceWebView(TemplateView):
         }
         dev = Build(self.object.last_evidence.doc, None, check=True)
         doc = dev.build.get_doc()
-        components = [x for x in doc if x[0] != "computer"]
-        device = ''
-
-        for d in doc:
-            if d[0] == "computer":
-                device = d[1]
-
         data['document'] = json.dumps(doc)
-        data['device'] = device
-        data['components'] = components
+        data['device'] = dev.device
+        data['components'] = dev.components
 
         self.object.get_evidences()
         last_dpp = Proof.objects.filter(
@@ -142,7 +135,7 @@ class PublicDeviceWebView(TemplateView):
         for d in self.object.evidences:
             d.get_doc()
             dev = Build(d.doc, None, check=True)
-            doc = dev.get_phid()
+            doc = dev.build.get_doc()
             ev = json.dumps(doc)
             phid = dev.get_signature(doc)
             dpp = "{}:{}".format(self.pk, phid)
diff --git a/evidence/legacy_parse.py b/evidence/legacy_parse.py
index 1d9f6a0..6d65786 100644
--- a/evidence/legacy_parse.py
+++ b/evidence/legacy_parse.py
@@ -66,4 +66,9 @@ class Build(BuildMix):
 
     def _get_components(self):
         data = ParseSnapshot(self.json)
+        self.device = data.device
         self.components = data.components
+
+        self.device.pop("actions", None)
+        for c in self.components:
+            c.pop("actions", None)
diff --git a/evidence/mixin_parse.py b/evidence/mixin_parse.py
index 8e99747..5c10022 100644
--- a/evidence/mixin_parse.py
+++ b/evidence/mixin_parse.py
@@ -41,8 +41,6 @@ class BuildMix:
 
     def get_doc(self):
         self._get_components()
-        for c in self.components:
-            c.pop("actions", None)
 
         components = sorted(self.components, key=lambda x: x.get("type"))
         device = self.algorithms.get('ereuse22')
diff --git a/evidence/normal_parse.py b/evidence/normal_parse.py
index f0a8600..bcf85c8 100644
--- a/evidence/normal_parse.py
+++ b/evidence/normal_parse.py
@@ -61,4 +61,9 @@ class Build(BuildMix):
 
     def _get_components(self):
         data = ParseSnapshot(self.json)
+        self.device = data.device
         self.components = data.components
+
+        self.device.pop("actions", None)
+        for c in self.components:
+            c.pop("actions", None)
diff --git a/evidence/old_parse.py b/evidence/old_parse.py
index 8a3ac29..7af0c5d 100644
--- a/evidence/old_parse.py
+++ b/evidence/old_parse.py
@@ -11,12 +11,12 @@ class Build(BuildMix):
     # normaly is worbench 11
 
     def get_details(self):
-        device = self.json.get('device', {})
-        self.manufacturer = device.get("manufacturer", '')
-        self.model = device.get("model", '')
-        self.chassis = device.get("chassis", '')
-        self.serial_number = device.get("serialNumber", '')
-        self.sku = device.get("sku", '')
+        self.device = self.json.get('device', {})
+        self.manufacturer = self.device.get("manufacturer", '')
+        self.model = self.device.get("model", '')
+        self.chassis = self.device.get("chassis", '')
+        self.serial_number = self.device.get("serialNumber", '')
+        self.sku = self.device.get("sku", '')
 
     def _get_components(self):
         self.components = self.json.get("components", [])
-- 
2.30.2


From 74d48c173bd83bde0a71a36ada7bc33fa34bdb20 Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@puigdefabregas.eu>
Date: Wed, 12 Feb 2025 17:00:34 +0100
Subject: [PATCH 05/12] fix dev.build

---
 did/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/did/views.py b/did/views.py
index 08df519..df31104 100644
--- a/did/views.py
+++ b/did/views.py
@@ -108,8 +108,8 @@ class PublicDeviceWebView(TemplateView):
         dev = Build(self.object.last_evidence.doc, None, check=True)
         doc = dev.build.get_doc()
         data['document'] = json.dumps(doc)
-        data['device'] = dev.device
-        data['components'] = dev.components
+        data['device'] = dev.build.device
+        data['components'] = dev.build.components
 
         self.object.get_evidences()
         last_dpp = Proof.objects.filter(
-- 
2.30.2


From 8edfaa1bc581473abf80b6ba6c65d53707b38a2b Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@puigdefabregas.eu>
Date: Thu, 13 Feb 2025 11:43:46 +0100
Subject: [PATCH 06/12] fix get did from chir and add dpp template for details
 of device

---
 device/templates/details.html   |  2 ++
 device/templates/tabs/dpps.html | 18 ++++++++++++++++++
 did/views.py                    |  6 +++---
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 device/templates/tabs/dpps.html

diff --git a/device/templates/details.html b/device/templates/details.html
index dd64d6f..23ff323 100644
--- a/device/templates/details.html
+++ b/device/templates/details.html
@@ -103,6 +103,8 @@
 
   {% include 'tabs/evidences.html' %}
 
+  {% include 'tabs/dpps.html' %}
+
   <!-- Add a note popup -->
   <div class="modal fade" id="addNoteModal" tabindex="-1" aria-labelledby="addNoteModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/device/templates/tabs/dpps.html b/device/templates/tabs/dpps.html
new file mode 100644
index 0000000..cd45a19
--- /dev/null
+++ b/device/templates/tabs/dpps.html
@@ -0,0 +1,18 @@
+{% load i18n %}
+
+<div class="tab-pane fade" id="dpps">
+  <h5 class="card-title">{% trans 'List of dpps' %}</h5>
+  <div class="list-group col">
+    {% for d in dpps %}
+      <div class="list-group-item">
+        <div class="d-flex w-100 justify-content-between">
+          <small class="text-muted">{{ d.timestamp }}</small>
+          <span>{{ d.type }}</span>
+        </div>
+        <p class="mb-1">
+          <a href="{% url 'did:device_web' d.signature %}">{{ d.signature }}</a>
+        </p>
+      </div>
+    {% endfor %}
+  </div>
+</div>
diff --git a/did/views.py b/did/views.py
index df31104..3548ff4 100644
--- a/did/views.py
+++ b/did/views.py
@@ -137,15 +137,15 @@ class PublicDeviceWebView(TemplateView):
             dev = Build(d.doc, None, check=True)
             doc = dev.build.get_doc()
             ev = json.dumps(doc)
-            phid = dev.get_signature(doc)
+            phid = dev.sign(ev)
             dpp = "{}:{}".format(self.pk, phid)
             rr = {
                 'dpp': dpp,
                 'document': ev,
                 'algorithm': ALGORITHM,
                 'manufacturer DPP': '',
-                'device': dev.device,
-                'components': dev.components
+                'device': dev.build.device,
+                'components': dev.build.components
             }
 
             tmpl = dpp_tmpl.copy()
-- 
2.30.2


From f54dce09798c68e05579a59d06b7a9993b17d92a Mon Sep 17 00:00:00 2001
From: pedro <git2021@cas.cat>
Date: Thu, 13 Feb 2025 18:29:30 +0100
Subject: [PATCH 07/12] devicehub docker entrypoint: cleanup old code

---
 docker/devicehub-django.entrypoint.sh | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/docker/devicehub-django.entrypoint.sh b/docker/devicehub-django.entrypoint.sh
index a027b63..8f196ed 100644
--- a/docker/devicehub-django.entrypoint.sh
+++ b/docker/devicehub-django.entrypoint.sh
@@ -42,19 +42,6 @@ gen_env_vars() {
                 export API_RESOLVER='http://id_index_api:3012'
                 # TODO hardcoded
                 export ID_FEDERATED='DH1'
-                # propagate to .env
-                dpp_env_vars="$(cat <<END
-API_DLT=${API_DLT}
-API_DLT_TOKEN=${API_DLT_TOKEN}
-API_RESOLVER=${API_RESOLVER}
-ID_FEDERATED=${ID_FEDERATED}
-END
-)"
-        # generate config using env vars from docker
-        # TODO rethink if this is needed because now this is django, not flask
-        cat > .env <<END
-${dpp_env_vars:-}
-END
         fi
 }
 
-- 
2.30.2


From e23fed5c13dd36573dd9cf757a7801907a453a1c Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@puigdefabregas.eu>
Date: Fri, 14 Feb 2025 10:30:15 +0100
Subject: [PATCH 08/12] fix last_dpp

---
 did/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/did/views.py b/did/views.py
index 3548ff4..91e1196 100644
--- a/did/views.py
+++ b/did/views.py
@@ -118,7 +118,7 @@ class PublicDeviceWebView(TemplateView):
 
         key = self.pk
         if last_dpp:
-            key = last_dpp.signature
+            key += ":"+last_dpp.signature
 
         url = "https://{}/did/{}".format(
             self.request.get_host(),
-- 
2.30.2


From 49cce3daa93368b49fc748475935760372c1cd5f Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@puigdefabregas.eu>
Date: Fri, 14 Feb 2025 11:42:28 +0100
Subject: [PATCH 09/12] fix same chid for diferent algos

---
 evidence/mixin_parse.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evidence/mixin_parse.py b/evidence/mixin_parse.py
index 5c10022..d045e08 100644
--- a/evidence/mixin_parse.py
+++ b/evidence/mixin_parse.py
@@ -17,7 +17,7 @@ class BuildMix:
         self.chassis = ""
         self.sku = ""
         self.mac = ""
-        self.tpy = ""
+        self.type = ""
         self.version = ""
         self.get_details()
         self.generate_chids()
-- 
2.30.2


From 0983af929ac06ef9530ba53e443063613d5a470a Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@puigdefabregas.eu>
Date: Fri, 14 Feb 2025 11:42:49 +0100
Subject: [PATCH 10/12] fix same chid for diferent algos 2

---
 evidence/normal_parse.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/evidence/normal_parse.py b/evidence/normal_parse.py
index bcf85c8..ce896c9 100644
--- a/evidence/normal_parse.py
+++ b/evidence/normal_parse.py
@@ -36,7 +36,9 @@ class Build(BuildMix):
                 self.manufacturer = system
                 self.model = get_inxi(m, "product")
                 self.serial_number = get_inxi(m, "serial")
-                self.chassis = get_inxi(m, "Type")
+                self.type = get_inxi(m, "Type")
+                self.chassis = self.type
+                self.version = get_inxi(m, "v")
             else:
                 self.sku = get_inxi(m, "part-nu")
 
-- 
2.30.2


From 28479fb871398c4cf4c6ad0f68c52e935442cc5d Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@puigdefabregas.eu>
Date: Fri, 14 Feb 2025 12:06:36 +0100
Subject: [PATCH 11/12] fix linkg in details -> dpp

---
 device/templates/tabs/dpps.html | 6 +++---
 device/views.py                 | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/device/templates/tabs/dpps.html b/device/templates/tabs/dpps.html
index cd45a19..c8ab813 100644
--- a/device/templates/tabs/dpps.html
+++ b/device/templates/tabs/dpps.html
@@ -6,11 +6,11 @@
     {% for d in dpps %}
       <div class="list-group-item">
         <div class="d-flex w-100 justify-content-between">
-          <small class="text-muted">{{ d.timestamp }}</small>
-          <span>{{ d.type }}</span>
+          <small class="text-muted">{{ d.2.timestamp }}</small>
+          <span>{{ d.2.type }}</span>
         </div>
         <p class="mb-1">
-          <a href="{% url 'did:device_web' d.signature %}">{{ d.signature }}</a>
+          <a href="{% url 'did:device_web' d.0 %}">{{ d.1 }}...</a>
         </p>
       </div>
     {% endfor %}
diff --git a/device/views.py b/device/views.py
index e418c7b..7ae34f3 100644
--- a/device/views.py
+++ b/device/views.py
@@ -94,10 +94,14 @@ class DetailsView(DashboardView, TemplateView):
         lot_tags = LotTag.objects.filter(owner=self.request.user.institution)
         dpps = []
         if settings.DPP:
-            dpps = Proof.objects.filter(
+            _dpps = Proof.objects.filter(
                 uuid__in=self.object.uuids,
                 type=PROOF_TYPE["IssueDPP"]
             )
+            for x in _dpps:
+                dpp = "{}:{}".format(self.pk, x.signature)
+                dpps.append((dpp, x.signature[:10], x))
+
         last_evidence = self.object.get_last_evidence()
         uuids = self.object.uuids
         state_definitions = StateDefinition.objects.filter(
-- 
2.30.2


From 73a582aeb3553906895e01a5c4846f0d8b00d08c Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@puigdefabregas.eu>
Date: Fri, 14 Feb 2025 14:25:54 +0100
Subject: [PATCH 12/12] fix drop actions

---
 evidence/old_parse.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/evidence/old_parse.py b/evidence/old_parse.py
index 7af0c5d..fec7ff0 100644
--- a/evidence/old_parse.py
+++ b/evidence/old_parse.py
@@ -20,3 +20,7 @@ class Build(BuildMix):
 
     def _get_components(self):
         self.components = self.json.get("components", [])
+
+        self.device.pop("actions", None)
+        for c in self.components:
+            c.pop("actions", None)
-- 
2.30.2