From 39f0300a28d43e06e8319e9ef9f3faf6bc37558f Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 22 Feb 2024 11:57:05 +0100 Subject: [PATCH] fix register_user_dlt when there are more than one user --- .../modules/dpp/commands/register_user_dlt.py | 35 ++++++++++++------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/ereuse_devicehub/modules/dpp/commands/register_user_dlt.py b/ereuse_devicehub/modules/dpp/commands/register_user_dlt.py index 8a40f3b4..17d62cc6 100644 --- a/ereuse_devicehub/modules/dpp/commands/register_user_dlt.py +++ b/ereuse_devicehub/modules/dpp/commands/register_user_dlt.py @@ -1,4 +1,5 @@ import json +import requests import click @@ -11,7 +12,7 @@ from ereuse_devicehub.modules.dpp.utils import encrypt class RegisterUserDlt: - # "Operator", "Verifier" or "Witness" + # "operator", "verifier" or "witness" def __init__(self, app) -> None: super().__init__() @@ -27,7 +28,7 @@ class RegisterUserDlt: for d in dataset: self.add_user(d) - db.session.commit() + db.session.commit() def add_user(self, data): email = data.get("email") @@ -59,18 +60,28 @@ class RegisterUserDlt: roles = [] try: - # TODO Not works - with app.app_context(): - ses = g.get('session', None) - ses["eth_pub_key"] = eth_pub_key - attributes = user.get_abac_attributes() - for c in attributes: - if 'role' in c.get('attributeURI'): - roles.append(c.get('attributeValue')) + abac_tk = app.config.get('ABAC_TOKEN') + domain = app.config.get('ABAC_URL') + eth_pub_key = eth_pub_key + + header = { + 'Authorization': f'Bearer {abac_tk}', + } + url = f'{domain}{eth_pub_key}/attributes' + r = requests.get(url, headers=header) + attributes = {} + for j in r.json(): + k = j.get('attributeURI', '').split('/')[-1].split("#")[-1] + v = j.get('attributeValue', '').strip() + if not (k and v): + continue + attributes[k] = v + + if attributes.get('role'): + roles.append(attributes.get('role')) except Exception: - roles = ["Operator"] + roles = ["operator"] user.rols_dlt = json.dumps(roles) - # if not user.id: db.session.add(user)