Merge pull request #49 from unipoll/front-end

Updates for Front End

pyproject.toml

@@ -11,11 +11,11 @@ build-backend = "setuptools.build_meta"
 
 
 [tool.semantic_release]
-version_source = "tag"
+version_source = "tag_only"
 branch = "main"
 major_on_zero = true
 upload_to_pypi = false
-upload_to_repository = true
+# upload_to_repository = true
 upload_to_release = true
 commit_version_number = true
 tag_commit = true

src/actions/workspace.py

@@ -138,7 +138,7 @@ async def remove_workspace_member(workspace: Workspace, account_id: ResourceID):
     if not account:
         raise AccountExceptions.AccountNotFound(account_id)
 
-    if account.id not in [ResourceID(member.ref.id) for member in workspace.members]:
+    if account.id not in [ResourceID(member.id) for member in workspace.members]:
         raise WorkspaceExceptions.UserNotMember(workspace, account)
     return await workspace.remove_member(account)
 

src/models/documents.py

@@ -70,13 +70,13 @@ async def remove_member(self, account, save: bool = True) -> bool:
         # Remove the account from the group
         # await self.fetch_link("members")
         for i, member in enumerate(self.members):
-            if account.id == member.ref.id:
+            if account.id == member.id:
                 self.members.remove(member)
-                Debug.info(f"Removed member {member.ref.id} from {self.resource_type} {self.id}")  # type: ignore
+                Debug.info(f"Removed member {member.id} from {self.resource_type} {self.id}")  # type: ignore
                 break
 
         # Remove the policy from the group
-        await self.fetch_link("policies")
+        # await self.fetch_link("policies")
         for policy in self.policies:
             # pc = await policy.policy_holder.fetch()  # type: ignore
             pc = policy.policy_holder  # type: ignore

src/routes/account.py

@@ -11,6 +11,16 @@
 router = APIRouter()
 
 
+@router.get("",
+            response_model=AccountSchemas.AccountList)
+async def get_all_accounts():
+    try:
+        accounts = [AccountSchemas.AccountShort(**account.dict()) for account in await Account.find_all().to_list()]
+        return AccountSchemas.AccountList(accounts=accounts)
+    except APIException as e:
+        raise HTTPException(status_code=e.code, detail=str(e))
+
+
 # Delete current user account
 @router.delete("/me",
                status_code=status.HTTP_204_NO_CONTENT)

src/schemas/account.py

@@ -35,6 +35,10 @@ class AccountShort(BaseModel):
     last_name: str
 
 
+class AccountList(BaseModel):
+    accounts: list[AccountShort]
+
+
 class CreateAccount(schemas.BaseUserCreate):
     email: EmailStr = Field(...)
     first_name: str = Field(

src/utils/permissions.py

@@ -31,7 +31,12 @@ def parse_action_file(resource_type: str) -> Permissions:
 
 
 WORKSPACE_ALL_PERMISSIONS = WorkspacePermissions(-1)  # type: ignore
-WORKSPACE_BASIC_PERMISSIONS = (WorkspacePermissions["get_workspace"])  # type: ignore
+# WORKSPACE_BASIC_PERMISSIONS = (WorkspacePermissions["get_workspace"])  # type: ignore
+WORKSPACE_BASIC_PERMISSIONS = (WorkspacePermissions["get_workspace"] +  # type: ignore
+                               WorkspacePermissions["get_workspace_members"] +  # type: ignore
+                               WorkspacePermissions["get_workspace_policy"] +  # type: ignore
+                               WorkspacePermissions["get_workspace_policies"] +  # type: ignore
+                               WorkspacePermissions["get_groups"])  # type: ignore
 # Example: (WorkspacePermissions["get_workspace"] + WorkspacePermissions["get_workspace_members"])
 
 GROUP_ALL_PERMISSIONS = GroupPermissions(-1)  # type: ignore