src/main/java/net/hostsharing/hsadminng/test/cust/TestCustomerEntity.java

@@ -14,7 +14,6 @@ import java.util.UUID;
 
 import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.GLOBAL;
 import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.*;
-import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacUserReference.UserRole.CREATOR;
 import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.*;
 import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
 
@@ -43,7 +42,7 @@ public class TestCustomerEntity implements HasUuid {
                 .withUpdatableColumns("reference", "prefix", "adminUserName")
 
                 .createRole(OWNER, (with) -> {
-                    with.owningUser(CREATOR);
+                    // with.owningUser(CREATOR); FIXME: needs assumed role, was: getRbacUserId(NEW.adminUserName, 'create')
                     with.incomingSuperRole(GLOBAL, ADMIN);
                     with.permission(DELETE);
                 })

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

@@ -366,17 +366,17 @@ create trigger deleteRbacRolesOfRbacObject_Trigger
 
  */
 create domain RbacOp as varchar(67) -- TODO: shorten to 8, once the deprecated values are gone
--- FIXME:
+-- FIXME: uncomment check
 --     check (
---                VALUE = 'DELETE'
---             or VALUE = 'UPDATE'
---             or VALUE = 'SELECT'
---             or VALUE = 'INSERT'
---             or VALUE = 'ASSUME'
+--             VALUE = 'INSERT' or
+--             VALUE = 'DELETE' or
+--             VALUE = 'UPDATE' or
+--             VALUE = 'SELECT' or
+--             VALUE = 'ASSUME' or
 --             -- TODO: all values below are deprecated, use insert with table
---             or VALUE ~ '^add-[a-z]+$'
---             or VALUE ~ '^new-[a-z-]+$'
---         )
+--             VALUE ~ '^add-[a-z]+$' or
+--             VALUE ~ '^new-[a-z-]+$'
+--         );
 ;
 
 create table RbacPermission
@@ -408,20 +408,18 @@ begin
 
     permissionUuid = (select uuid from RbacPermission where objectUuid = forObjectUuid and op = forOp and opTableName = forOpTableName);
     if (permissionUuid is null) then
-        insert into RbacReference ("type")
+        insert
+            into RbacReference ("type")
             values ('RbacPermission')
             returning uuid into permissionUuid;
-        begin
-            insert into RbacPermission (uuid, objectUuid, op, opTableName)
+        raise warning 'for values (%, %, %, %)', permissionUuid, forObjectUuid, forOp, forOpTableName; -- TODO: remove
+        insert
+            into RbacPermission (uuid, objectUuid, op, opTableName)
             values (permissionUuid, forObjectUuid, forOp, forOpTableName);
-        exception
-            when others then
-                raise exception 'insert into RbacPermission (uuid, objectUuid, op, opTableName)
-                values (%, %, %, %);', permissionUuid, forObjectUuid, forOp, forOpTableName;
-        end;
     end if;
     return permissionUuid;
-end; $$;
+end;
+$$;
 
 -- TODO: deprecated, remove and amend all usages to createPermission
 create or replace function createPermissions(forObjectUuid uuid, permitOps RbacOp[])

src/main/resources/db/changelog/113-test-customer-rbac.sql

@@ -1,5 +1,5 @@
 --liquibase formatted sql
--- This code generated was by RbacViewPostgresGenerator at 2024-03-07T15:57:25.487712422.
+-- This code generated was by RbacViewPostgresGenerator at 2024-03-07T14:39:25.446629076.
 
 
 -- ============================================================================
@@ -38,7 +38,6 @@ begin
     perform createRoleWithGrants(
         testCustomerOwner(NEW),
             permissions => array['DELETE'],
-            userUuids => array[currentUserUuid()],
             incomingSuperRoles => array[globalAdmin()]
     );
 

src/main/resources/db/changelog/123-test-package-rbac.sql

@@ -1,5 +1,5 @@
 --liquibase formatted sql
--- This code generated was by RbacViewPostgresGenerator at 2024-03-07T15:57:25.536171618.
+-- This code generated was by RbacViewPostgresGenerator at 2024-03-07T14:39:25.488573238.
 
 
 -- ============================================================================