hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 2 Activity

RBAC Diagram+PostgreSQL Generator #21

Merged
hsh-michaelhoennig merged 54 commits from experimental-rbacview-generator into master 2024-03-11 12:30:44 +01:00
Conversation 0 Commits 54 Files Changed 91 +21 -15
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 18ce4fd8e9 - Show all commits

7
src/main/resources/db/changelog/050-rbac-base.sql
View File

@ -609,6 +609,13 @@ begin
end; end;
$$; $$;
create or replace procedure grantPermissionToRole(roleDesc RbacRoleDescriptor, permissionUuid uuid)
language plpgsql as $$
begin
call grantPermissionToRole(findRoleId(roleDesc), permissionUuid);
end;
$$;
-- TODO: deprecated, remove and use grantPermissionToRole(...) -- TODO: deprecated, remove and use grantPermissionToRole(...)
create or replace procedure grantPermissionsToRole(roleUuid uuid, permissionIds uuid[]) create or replace procedure grantPermissionsToRole(roleUuid uuid, permissionIds uuid[])
language plpgsql as $$ language plpgsql as $$

12
src/test/java/net/hostsharing/hsadminng/test/cust/TestCustomerEntityTest.java
View File

@ -29,9 +29,9 @@ class TestCustomerEntityTest {
subgraph customer:permissions[ ] subgraph customer:permissions[ ]
style customer:permissions fill:#dd4901,stroke:white style customer:permissions fill:#dd4901,stroke:white
perm:customer:delete{{customer:delete}} perm:customer:DELETE{{customer:DELETE}}
perm:customer:update{{customer:update}} perm:customer:UPDATE{{customer:UPDATE}}
perm:customer:select{{customer:select}} perm:customer:SELECT{{customer:SELECT}}
end end
end end
@ -44,9 +44,9 @@ class TestCustomerEntityTest {
role:customer:admin ==> role:customer:tenant role:customer:admin ==> role:customer:tenant
%% granting permissions to roles %% granting permissions to roles
role:customer:owner ==> perm:customer:delete role:customer:owner ==> perm:customer:DELETE
role:customer:admin ==> perm:customer:add-package role:customer:admin ==> perm:customer:UPDATE
role:customer:tenant ==> perm:customer:select role:customer:tenant ==> perm:customer:SELECT
"""); """);
} }
} }

1
src/test/java/net/hostsharing/hsadminng/test/cust/TestCustomerRepositoryIntegrationTest.java
View File

@ -43,7 +43,6 @@ class TestCustomerRepositoryIntegrationTest extends ContextBasedTest {
final var count = testCustomerRepository.count(); final var count = testCustomerRepository.count();
// when // when
final var result = attempt(em, () -> { final var result = attempt(em, () -> {
final var newCustomer = new TestCustomerEntity( final var newCustomer = new TestCustomerEntity(
UUID.randomUUID(), "www", 90001, "customer-admin@www.example.com"); UUID.randomUUID(), "www", 90001, "customer-admin@www.example.com");

16
src/test/java/net/hostsharing/hsadminng/test/pac/TestPackageEntityTest.java
View File

@ -29,10 +29,10 @@ class TestPackageEntityTest {
subgraph package:permissions[ ] subgraph package:permissions[ ]
style package:permissions fill:#dd4901,stroke:white style package:permissions fill:#dd4901,stroke:white
perm:package:insert{{package:insert}} perm:package:INSERT{{package:INSERT}}
perm:package:delete{{package:delete}} perm:package:DELETE{{package:DELETE}}
perm:package:update{{package:update}} perm:package:UPDATE{{package:UPDATE}}
perm:package:select{{package:select}} perm:package:SELECT{{package:SELECT}}
end end
end end
@ -62,10 +62,10 @@ class TestPackageEntityTest {
role:package:tenant ==> role:customer:tenant role:package:tenant ==> role:customer:tenant
%% granting permissions to roles %% granting permissions to roles
role:customer:admin ==> perm:package:insert role:customer:admin ==> perm:package:INSERT
role:package:owner ==> perm:package:delete role:package:owner ==> perm:package:DELETE
role:package:owner ==> perm:package:update role:package:owner ==> perm:package:UPDATE
role:package:tenant ==> perm:package:select role:package:tenant ==> perm:package:SELECT
"""); """);
} }
} }