Skip to content

Commit

Permalink
Many fixes
Browse files Browse the repository at this point in the history
	modified:   setup.py
	modified:   trustauthx/authlite.py
	modified:   trustauthx/scheme.py
  • Loading branch information
moonlightnexus committed Apr 3, 2024
1 parent cca2e79 commit 5af1d49
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 16 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

setup(
name='trustauthx',
version='0.7.0',
version='0.7.1',
description='Official connector SDK for TrustAuthx',
long_description=long_description,
long_description_content_type='text/markdown', # This is important!
Expand Down
8 changes: 4 additions & 4 deletions trustauthx/authlite.py
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ def add_role(self, name, **Permission_)->AddRoleResponse:
org_id=role_data.get("org_id"),
rol_id=role_data.get("rol_id"),
name=role_data.get("name"),
permissions=permissions
permissions=[p.__dict__ for p in permissions]
)

def delete_role(self, rol_id) -> DeleteRoleResponse:
Expand Down Expand Up @@ -372,7 +372,7 @@ def delete_role(self, rol_id) -> DeleteRoleResponse:
org_id=role_data.get("org_id"),
rol_id=role_data.get("rol_id"),
name=role_data.get("name"),
permissions=permissions
permissions=[p.__dict__ for p in permissions]
)

def add_permission(self, rol_id, foreground=False, **Permission_) -> AddPermissionResponse:
Expand Down Expand Up @@ -413,12 +413,12 @@ def add_permission(self, rol_id, foreground=False, **Permission_) -> AddPermissi
}
response = requests.post(url, headers=headers, params=params, data=json.dumps(data))
response_data = response.json()
permissions = [{k: v} for k, v in permissions.items()]
permissions = [Permission(**{k: v}) for k, v in permissions.items()]
self.reinitialize_all(foreground)
return AddPermissionResponse(
org_id=response_data.get("org_id"),
rol_id=response_data.get("rol_id"),
permissions=permissions
permissions=[p.__dict__ for p in permissions]
)

def delete_permission(self, rol_id, foreground=False, **Permission_) -> DeletePermissionResponse:
Expand Down
32 changes: 21 additions & 11 deletions trustauthx/scheme.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,10 @@
class Permission:
"""
A class representing a permission object.
Attributes:
name (str): The name of the permission.
value (str): The value of the permission.
"""
name: str
value: str
def __init__(self, **kwargs):
for key, value in kwargs.items():
setattr(self, key, value)

@dataclass
class Role:
Expand All @@ -29,10 +26,6 @@ class Role:
name: str
permissions: List[Permission]

@dataclass
class Permission:
name: str
value: str

@dataclass
class GetAllRolesResponse:
Expand Down Expand Up @@ -125,4 +118,21 @@ class DeletePermissionResponse:
Permission(name="maintainer", value="administration")
]
)
"""
"""

# class Permission:
# def __init__(self, **kwargs):
# for key, value in kwargs.items():
# setattr(self, key, value)

# role_data = {
# "permissions": [
# {"read": "true", "write": "false"},
# {"execute": "true"}
# ]
# }

# permissions = [Permission(**p) for p in role_data.get("permissions", [])]

# for permission in permissions:
# print(permission.__dict__)

0 comments on commit 5af1d49

Please sign in to comment.