From 38409c0776ccc82dbffdf43880973a3954eb267b Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 13 Feb 2024 20:49:50 +0100 Subject: [PATCH] did web instead of did key --- idhub/management/commands/initial_datas.py | 2 +- idhub/models.py | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/idhub/management/commands/initial_datas.py b/idhub/management/commands/initial_datas.py index 00224d9..e8abf19 100644 --- a/idhub/management/commands/initial_datas.py +++ b/idhub/management/commands/initial_datas.py @@ -73,7 +73,7 @@ class Command(BaseCommand): org1.save() org2.save() def create_defaults_dids(self, u, password): - did = DID(label="Default", user=u, type=DID.Types.KEY) + did = DID(label="Default", user=u, type=DID.Types.WEB) did.set_did(password) did.save() diff --git a/idhub/models.py b/idhub/models.py index c1feadd..8f074bb 100644 --- a/idhub/models.py +++ b/idhub/models.py @@ -590,10 +590,17 @@ class VerificableCredential(models.Model): related_name='vcredentials', ) + @property + def is_didweb(self): + if self.issuer_did.type == DID.Types.WEB.value: + return True + return False + def get_data(self, password): if not self.data: return "" - if self.eidas1_did: + + if self.eidas1_did or self.is_didweb: return self.data return self.user.decrypt_data(self.data, password) @@ -639,7 +646,7 @@ class VerificableCredential(models.Model): self.render(domain), self.issuer_did.get_key_material(issuer_pass) ) - if self.eidas1_did: + if self.eidas1_did or self.is_didweb: self.data = data else: self.data = self.user.encrypt_data(data, password) @@ -653,7 +660,7 @@ class VerificableCredential(models.Model): cred_path = 'credentials' sid = self.id - if self.eidas1_did: + if self.eidas1_did or self.is_didweb: cred_path = 'public/credentials' sid = self.hash