oldaplib 0.3.29__py3-none-any.whl → 0.4.0__py3-none-any.whl

oldaplib/test/test_user.py

@@ -6,6 +6,7 @@ from time import sleep
 
 from oldaplib.src.cachesingleton import CacheSingletonRedis
 from oldaplib.src.connection import Connection
+from oldaplib.src.enums.datapermissions import DataPermission
 from oldaplib.src.enums.userattr import UserAttr
 from oldaplib.src.helpers.context import Context
 from oldaplib.src.helpers.observable_set import ObservableSet
@@ -89,7 +90,7 @@ class TestUser(unittest.TestCase):
                     email="a.b@test.com",
                     credentials="Ein@geheimes&Passw0rt",
                     inProject={Iri('oldap:HyperHamlet'): {}},
-                    hasPermissions={})
+                    hasRole={})
 
 
         user = User(con=self._connection,
@@ -101,7 +102,7 @@ class TestUser(unittest.TestCase):
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
                                                          AdminPermission.ADMIN_RESOURCES,
                                                          AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Xsd_QName('oldap:GenericView')})
+                    hasRole={Xsd_QName('oldap:Unknown'): None})
 
         self.assertEqual(user.userId, Xsd_NCName("testuser"))
         self.assertEqual(user.familyName, "Test")
@@ -112,7 +113,20 @@ class TestUser(unittest.TestCase):
             AdminPermission.ADMIN_RESOURCES,
             AdminPermission.ADMIN_CREATE
         }}))
-        self.assertEqual(user.hasPermissions, {Xsd_QName('oldap:GenericView')})
+        self.assertEqual(user.hasRole, {Xsd_QName('oldap:Unknown'): None})
+
+        user = User(con=self._connection,
+                    userId=Xsd_NCName("testuser2"),
+                    familyName="Test2",
+                    givenName="Test2",
+                    email="a.b2@test.com",
+                    credentials="Ein@geheimes&Passw0rt2",
+                    inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
+                                                         AdminPermission.ADMIN_RESOURCES,
+                                                         AdminPermission.ADMIN_CREATE}},
+                    hasRole={Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_UPDATE})
+        self.assertEqual(user.hasRole, {Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_UPDATE})
+
 
     def test_user_deepcopy(self):
         user = User(con=self._connection,
@@ -124,7 +138,7 @@ class TestUser(unittest.TestCase):
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
                                                          AdminPermission.ADMIN_RESOURCES,
                                                          AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Xsd_QName('oldap:GenericView')})
+                    hasRole={Xsd_QName('oldap:Unknown'): DataPermission.DATA_VIEW})
         user2 = deepcopy(user)
         self.assertFalse(user is user2)
         self.assertEqual(user.userId, user2.userId)
@@ -134,10 +148,10 @@ class TestUser(unittest.TestCase):
         self.assertEqual(user.email, user2.email)
         self.assertEqual(user.credentials, user2.credentials)
         self.assertEqual(user.inProject[Iri('oldap:HyperHamlet')], user2.inProject[Iri('oldap:HyperHamlet')])
-        self.assertEqual(user.hasPermissions, user2.hasPermissions)
+        self.assertEqual(user.hasRole, user2.hasRole)
 
     # @unittest.skip('Work in progress')
-    def test_read_user_from_id(self):
+    def test_read_user_from_id_A(self):
         user = User.read(con=self._connection, userId="rosenth", ignore_cache=True)
         self.assertEqual(user.userId, Xsd_NCName("rosenth"))
         self.assertEqual(user.userIri, Iri("https://orcid.org/0000-0003-1681-4036"))
@@ -146,14 +160,30 @@ class TestUser(unittest.TestCase):
         self.assertEqual(user.email, Xsd_string("lukas.rosenthaler@unibas.ch"))
         self.assertEqual(user.inProject, InProjectClass({
             Iri("oldap:SystemProject"): {AdminPermission.ADMIN_OLDAP},
-            Iri("oldap:SharedProject"): {AdminPermission.ADMIN_RESOURCES, AdminPermission.ADMIN_MODEL, AdminPermission.ADMIN_LISTS},
+            Iri("oldap:SharedProject"): {AdminPermission.ADMIN_OLDAP},
             Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_RESOURCES},
             Iri('http://www.salsah.org/version/2.0/SwissBritNet'): {
                 AdminPermission.ADMIN_CREATE, AdminPermission.ADMIN_LISTS, AdminPermission.ADMIN_MODEL,
-                AdminPermission.ADMIN_PERMISSION_SETS, AdminPermission.ADMIN_RESOURCES,
+                AdminPermission.ADMIN_ROLES, AdminPermission.ADMIN_RESOURCES,
                 AdminPermission.ADMIN_USERS}
         }))
-        self.assertEqual(user.hasPermissions, {Iri("oldap:GenericRestricted"), Iri('oldap:GenericView')})
+        self.assertEqual(user.hasRole, {Xsd_QName("oldap:Unknown"): DataPermission.DATA_PERMISSIONS,
+                                        Xsd_QName("hyha:HyperHamletMember"): DataPermission.DATA_PERMISSIONS,
+                                        Xsd_QName("britnet:BritnetEditor"): DataPermission.DATA_DELETE})
+
+    def test_read_user_from_id_B(self):
+        user = User.read(con=self._connection, userId="habermann", ignore_cache=True)
+        self.assertEqual(user.userId, Xsd_NCName("habermann"))
+        self.assertEqual(user.userIri, Iri("https://orcid.org/0000-0002-7403-9595"))
+        self.assertEqual(user.familyName, Xsd_string("Habermann"))
+        self.assertEqual(user.givenName, Xsd_string("Ina"))
+        self.assertEqual(user.email, Xsd_string("ina.habermann@unibas.ch"))
+        self.assertEqual(user.inProject, InProjectClass({
+            Iri('http://www.salsah.org/version/2.0/SwissBritNet'): {AdminPermission.ADMIN_RESOURCES}
+        }))
+        self.assertEqual(user.hasRole, {Xsd_QName("oldap:Unknown"): DataPermission.DATA_VIEW,
+                                        Xsd_QName("hyha:HyperHamletMember"): DataPermission.DATA_UPDATE,
+                                        Xsd_QName("britnet:BritnetEditor"): DataPermission.DATA_UPDATE})
 
     def test_read_user_from_iri(self):
         user = User.read(con=self._connection, userId=Iri("https://orcid.org/0000-0003-1681-4036"), ignore_cache=True)
@@ -164,14 +194,16 @@ class TestUser(unittest.TestCase):
         self.assertEqual(user.email, Xsd_string("lukas.rosenthaler@unibas.ch"))
         self.assertEqual(user.inProject, InProjectClass({
             Iri("oldap:SystemProject"): {AdminPermission.ADMIN_OLDAP},
+            Iri("oldap:SharedProject"): {AdminPermission.ADMIN_OLDAP},
             Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_RESOURCES},
-            Iri('oldap:SharedProject'): {AdminPermission.ADMIN_RESOURCES, AdminPermission.ADMIN_MODEL, AdminPermission.ADMIN_LISTS},
             Iri('http://www.salsah.org/version/2.0/SwissBritNet'): {
                 AdminPermission.ADMIN_CREATE, AdminPermission.ADMIN_LISTS, AdminPermission.ADMIN_MODEL,
-                AdminPermission.ADMIN_PERMISSION_SETS, AdminPermission.ADMIN_RESOURCES,
+                AdminPermission.ADMIN_ROLES, AdminPermission.ADMIN_RESOURCES,
                 AdminPermission.ADMIN_USERS}
         }))
-        self.assertEqual(user.hasPermissions, {Iri("oldap:GenericRestricted"), Iri('oldap:GenericView')})
+        self.assertEqual(user.hasRole, {Xsd_QName("oldap:Unknown"): DataPermission.DATA_PERMISSIONS,
+                                        Xsd_QName("hyha:HyperHamletMember"): DataPermission.DATA_PERMISSIONS,
+                                        Xsd_QName("britnet:BritnetEditor"): DataPermission.DATA_DELETE})
 
     #  #unittest.skip('Work in progress')
     def test_read_unknown_user(self):
@@ -206,19 +238,21 @@ class TestUser(unittest.TestCase):
 
         self.assertEqual(user2.inProject, InProjectClass({
             Iri("oldap:SystemProject"): {AdminPermission.ADMIN_OLDAP},
-            Iri('oldap:SharedProject'): {AdminPermission.ADMIN_RESOURCES, AdminPermission.ADMIN_MODEL, AdminPermission.ADMIN_LISTS},
+            Iri("oldap:SharedProject"): {AdminPermission.ADMIN_OLDAP},
             Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_RESOURCES},
             Iri('http://www.salsah.org/version/2.0/SwissBritNet'): {
                 AdminPermission.ADMIN_CREATE, AdminPermission.ADMIN_LISTS, AdminPermission.ADMIN_MODEL,
-                AdminPermission.ADMIN_PERMISSION_SETS, AdminPermission.ADMIN_RESOURCES,
+                AdminPermission.ADMIN_ROLES, AdminPermission.ADMIN_RESOURCES,
                 AdminPermission.ADMIN_USERS}
         }))
         self.assertEqual(user.inProject, user2.inProject)
         self.assertFalse(user.inProject is user2.inProject)
 
-        self.assertEqual(user2.hasPermissions, {Iri("oldap:GenericRestricted"), Iri('oldap:GenericView')})
-        self.assertEqual(user.hasPermissions, user2.hasPermissions)
-        self.assertFalse(user.hasPermissions is user2.hasPermissions)
+        self.assertEqual(user2.hasRole, {Xsd_QName("oldap:Unknown"): DataPermission.DATA_PERMISSIONS,
+                                        Xsd_QName("hyha:HyperHamletMember"): DataPermission.DATA_PERMISSIONS,
+                                        Xsd_QName("britnet:BritnetEditor"): DataPermission.DATA_DELETE})
+        self.assertEqual(user.hasRole, user2.hasRole)
+        self.assertFalse(user.hasRole is user2.hasRole)
 
         user3 = User.read(con=self._connection, userId=Iri("https://orcid.org/0000-0003-1681-4036"))
         self.assertFalse(user3 is user)
@@ -245,19 +279,21 @@ class TestUser(unittest.TestCase):
 
         self.assertEqual(user3.inProject, InProjectClass({
             Iri("oldap:SystemProject"): {AdminPermission.ADMIN_OLDAP},
-            Iri('oldap:SharedProject'): {AdminPermission.ADMIN_RESOURCES, AdminPermission.ADMIN_MODEL, AdminPermission.ADMIN_LISTS},
+            Iri("oldap:SharedProject"): {AdminPermission.ADMIN_OLDAP},
             Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_RESOURCES},
             Iri('http://www.salsah.org/version/2.0/SwissBritNet'): {
                 AdminPermission.ADMIN_CREATE, AdminPermission.ADMIN_LISTS, AdminPermission.ADMIN_MODEL,
-                AdminPermission.ADMIN_PERMISSION_SETS, AdminPermission.ADMIN_RESOURCES,
+                AdminPermission.ADMIN_ROLES, AdminPermission.ADMIN_RESOURCES,
                 AdminPermission.ADMIN_USERS}
         }))
         self.assertEqual(user.inProject, user3.inProject)
         self.assertFalse(user.inProject is user3.inProject)
 
-        self.assertEqual(user3.hasPermissions, {Iri("oldap:GenericRestricted"), Iri('oldap:GenericView')})
-        self.assertEqual(user.hasPermissions, user3.hasPermissions)
-        self.assertFalse(user.hasPermissions is user3.hasPermissions)
+        self.assertEqual(user3.hasRole, {Xsd_QName("oldap:Unknown"): DataPermission.DATA_PERMISSIONS,
+                                        Xsd_QName("hyha:HyperHamletMember"): DataPermission.DATA_PERMISSIONS,
+                                        Xsd_QName("britnet:BritnetEditor"): DataPermission.DATA_DELETE})
+        self.assertEqual(user.hasRole, user3.hasRole)
+        self.assertFalse(user.hasRole is user3.hasRole)
 
 
     #  #unittest.skip('Work in progress')
@@ -321,7 +357,7 @@ class TestUser(unittest.TestCase):
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
                                                                AdminPermission.ADMIN_RESOURCES,
                                                                AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView')},
+                    hasRole={Iri('oldap:Unknown'): DataPermission.DATA_VIEW,},
                     isActive=True)
         user.create()
         self.assertIsNotNone(user.created)
@@ -335,7 +371,7 @@ class TestUser(unittest.TestCase):
         self.assertEqual(user2.givenName, user.givenName)
         self.assertEqual(user2.email, user.email)
         self.assertEqual(user2.inProject, user.inProject)
-        self.assertEqual(user2.hasPermissions, user.hasPermissions)
+        self.assertEqual(user2.hasRole, user.hasRole)
         self.assertTrue(user2.isActive)
 
     #  #unittest.skip('Work in progress')
@@ -348,12 +384,13 @@ class TestUser(unittest.TestCase):
                     email="tweety.birdy@looneytunes.com",
                     credentials="Sylvester",
                     inProject={Iri('oldap:HyperHamlet'): set()},
-                    hasPermissions={Iri('oldap:GenericView')},
+                    hasRole={Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_VIEW},
                     isActive=True)
         user.create()
         del user
         user = User.read(con=self._connection, userId=Xsd_NCName("birdy"), ignore_cache=True)
         self.assertEqual(user.familyName, "Birdy")
+        self.assertEqual(user.hasRole, {Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_VIEW})
 
     #  #unittest.skip('Work in progress')
     def test_create_user_no_in_project(self):
@@ -364,7 +401,7 @@ class TestUser(unittest.TestCase):
                     givenName="Yogi",
                     email="yogi.baer@yellowstone.gov",
                     credentials="BuBu",
-                    hasPermissions={Iri('oldap:GenericView')},
+                    hasRole={Iri('oldap:Unknown'): DataPermission.DATA_VIEW},
                     isActive=True)
         user.create()
         del user
@@ -403,7 +440,7 @@ class TestUser(unittest.TestCase):
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
                                                                AdminPermission.ADMIN_RESOURCES,
                                                                AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView')},
+                    hasRole={Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_VIEW},
                     isActive=False)
         user.create()
         del user
@@ -421,10 +458,9 @@ class TestUser(unittest.TestCase):
                     givenName="Petri",
                     email="petri.difornaro@italia.it",
                     credentials="Genius",
-                    inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
-                                                               AdminPermission.ADMIN_RESOURCES,
+                    inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_RESOURCES,
                                                                AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('oldap:Role'): DataPermission.DATA_VIEW})
         with self.assertRaises(OldapErrorAlreadyExists) as ex:
             user.create()
         self.assertEqual(str(ex.exception), 'A user with a user ID "fornaro" already exists')
@@ -442,7 +478,7 @@ class TestUser(unittest.TestCase):
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
                                                                AdminPermission.ADMIN_RESOURCES,
                                                                AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('hyha:HyperHamletMember'): DataPermission.DATA_VIEW})
         with self.assertRaises(OldapErrorAlreadyExists) as ex:
             user.create()
         self.assertEqual(str(ex.exception), 'A user with a user IRI "https://orcid.org/0000-0003-1681-4036" already exists')
@@ -459,13 +495,13 @@ class TestUser(unittest.TestCase):
                     inProject={Iri('oldap:NotExistingproject'): {AdminPermission.ADMIN_USERS,
                                                                 AdminPermission.ADMIN_RESOURCES,
                                                                 AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('oldap:Unknown'): DataPermission.DATA_VIEW})
         with self.assertRaises(OldapErrorValue) as ex:
             user.create()
         self.assertEqual(str(ex.exception), 'One of the projects is not existing!')
 
     #  #unittest.skip('Work in progress')
-    def test_create_user_invalid_permset(self):
+    def test_create_user_invalid_role(self):
         """Test that user creation will fail if we give an invalid permission set"""
         user = User(con=self._connection,
                     userId=Xsd_NCName("donald"),
@@ -476,10 +512,10 @@ class TestUser(unittest.TestCase):
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
                                                          AdminPermission.ADMIN_RESOURCES,
                                                          AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView'), Xsd_QName('oldap:Gaga')})
+                    hasRole={Xsd_QName('oldap:Unknown'): DataPermission.DATA_VIEW,
+                             Xsd_QName('oldap:Gaga'): DataPermission.DATA_DELETE})
         with self.assertRaises(OldapErrorValue) as ex:
             user.create()
-        self.assertEqual(str(ex.exception), 'One of the permission sets is not existing!')
 
     #  #unittest.skip('Work in progress')
     def test_create_user_no_privilege(self):
@@ -491,7 +527,7 @@ class TestUser(unittest.TestCase):
                     email="donald.duck@duckville.com",
                     credentials="Entenhausen@for&Ever",
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('hyha:HyperHamletMember'): DataPermission.DATA_VIEW})
         with self.assertRaises(OldapErrorNoPermission) as ex:
             user.create()
         self.assertEqual('Actor has no ADMIN_USERS permission for project oldap:HyperHamlet', str(ex.exception), )
@@ -509,7 +545,7 @@ class TestUser(unittest.TestCase):
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
                                                          AdminPermission.ADMIN_RESOURCES,
                                                          AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('hyha:HyperHamletMember'): DataPermission.DATA_VIEW})
         user.create()
         user2 = User.read(con=self._connection, userId="edison", ignore_cache=True)
         self.assertEqual(user2.userIri, user.userIri)
@@ -539,10 +575,12 @@ class TestUser(unittest.TestCase):
                                                          AdminPermission.ADMIN_CREATE}})
         user.create()
         user = User.read(con=self._connection, userId="ampere", ignore_cache=True)
-        user.hasPermissions = {Iri('oldap:GenericRestricted'), Iri('oldap:GenericView')}
+        user.hasRole = {Xsd_QName('oldap:Unknown'): DataPermission.DATA_VIEW,
+                        Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_RESTRICTED}
         user.update()
         user = User.read(con=self._connection, userId="ampere", ignore_cache=True)
-        self.assertEqual(user.hasPermissions, {Iri('oldap:GenericRestricted'), Iri('oldap:GenericView')})
+        self.assertEqual(user.hasRole, {Xsd_QName('oldap:Unknown'): DataPermission.DATA_VIEW,
+                                        Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_RESTRICTED})
 
     def test_update_user_permission_delete(self):
         user = User(con=self._connection,
@@ -555,13 +593,19 @@ class TestUser(unittest.TestCase):
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
                                                          AdminPermission.ADMIN_RESOURCES,
                                                          AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_PERMISSIONS})
         user.create()
         user = User.read(con=self._connection, userId="ampere", ignore_cache=True)
-        del user.hasPermissions
+        del user.hasRole
         user.update()
         user = User.read(con=self._connection, userId="ampere", ignore_cache=True)
-        self.assertIsNone(user.hasPermissions)
+        self.assertIsNone(user.hasRole)
+
+    def test_update_user_role_of_existing(self):
+        user = User.read(self._connection, "rosenth")
+        user.hasRole[Xsd_QName('oldap:Unknown')] = DataPermission.DATA_UPDATE
+        user.update()
+
 
     def test_update_user_permission_set_empty(self):
         user = User(con=self._connection,
@@ -574,13 +618,13 @@ class TestUser(unittest.TestCase):
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
                                                          AdminPermission.ADMIN_RESOURCES,
                                                          AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_VIEW})
         user.create()
         user = User.read(con=self._connection, userId="ampere", ignore_cache=True)
-        user.hasPermissions = []
+        user.hasRole = []
         user.update()
         user = User.read(con=self._connection, userId="ampere", ignore_cache=True)
-        self.assertIsNone(user.hasPermissions)
+        self.assertIsNone(user.hasRole)
 
     def test_update_user_permission_set_None(self):
         user = User(con=self._connection,
@@ -593,13 +637,13 @@ class TestUser(unittest.TestCase):
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
                                                          AdminPermission.ADMIN_RESOURCES,
                                                          AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_VIEW})
         user.create()
         user = User.read(con=self._connection, userId="ampere", ignore_cache=True)
-        user.hasPermissions = None
+        user.hasRole = None
         user.update()
         user = User.read(con=self._connection, userId="ampere", ignore_cache=True)
-        self.assertIsNone(user.hasPermissions)
+        self.assertIsNone(user.hasRole)
 
     def test_update_user_permissions_update_A(self):
         user = User(con=self._connection,
@@ -612,13 +656,14 @@ class TestUser(unittest.TestCase):
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
                                                          AdminPermission.ADMIN_RESOURCES,
                                                          AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_VIEW})
         user.create()
         user = User.read(con=self._connection, userId="faraday", ignore_cache=True)
-        user.hasPermissions.add(Iri('oldap:GenericRestricted'))
+        user.hasRole[Xsd_QName('oldap:Unknown')] = DataPermission.DATA_RESTRICTED
         user.update()
         user = User.read(con=self._connection, userId="faraday", ignore_cache=True)
-        self.assertEqual(user.hasPermissions, {Iri('oldap:GenericRestricted'), Iri('oldap:GenericView')})
+        self.assertEqual(user.hasRole, {Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_VIEW,
+                                        Xsd_QName('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
 
     def test_update_user_permissions_update_B(self):
         user = User(con=self._connection,
@@ -631,13 +676,14 @@ class TestUser(unittest.TestCase):
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
                                                          AdminPermission.ADMIN_RESOURCES,
                                                          AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericRestricted'), Iri('oldap:GenericView')})
+                    hasRole={Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_UPDATE,
+                             Xsd_QName('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
         user.create()
         user = User.read(con=self._connection, userId="fourier", ignore_cache=True)
-        user.hasPermissions.remove(Xsd_QName('oldap:GenericRestricted'))
+        del user.hasRole[Xsd_QName('hyha:HyperHamletMember')]
         user.update()
         user = User.read(con=self._connection, userId="fourier", ignore_cache=True)
-        self.assertEqual(user.hasPermissions, {Xsd_QName('oldap:GenericView')})
+        self.assertEqual(user.hasRole, {Xsd_QName('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
 
     #  #unittest.skip('Work in progress')
     def test_update_user(self):
@@ -651,7 +697,7 @@ class TestUser(unittest.TestCase):
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
                                                          AdminPermission.ADMIN_RESOURCES,
                                                          AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
         user.create()
         user2 = User.read(con=self._connection, userId="edison", ignore_cache=True)
         user2.userId = "aedison"
@@ -659,9 +705,9 @@ class TestUser(unittest.TestCase):
         user2.givenName = "Thomas"
         user2.email = "th.edison@audiorec.com"
 
-        user2.hasPermissions.add(Xsd_QName('oldap:GenericRestricted'))
-        user2.hasPermissions.add(Xsd_QName('hyha:HyperHamletMember'))
-        user2.hasPermissions.remove(Xsd_QName('oldap:GenericView'))
+        user2.hasRole[Xsd_QName('britnet:BritnetEditor')] = DataPermission.DATA_UPDATE
+        user2.hasRole[Xsd_QName('hyha:HyperHamletMember')] = DataPermission.DATA_DELETE
+        del user2.hasRole[Xsd_QName('oldap:Unknown')]
         user2.inProject[Iri('oldap:SystemProject')] = {AdminPermission.ADMIN_USERS, AdminPermission.ADMIN_RESOURCES}
         user2.inProject[Iri('oldap:HyperHamlet')].remove(AdminPermission.ADMIN_USERS)
         user2.inProject[Iri('oldap:HyperHamlet')].add(AdminPermission.ADMIN_LISTS)
@@ -670,11 +716,12 @@ class TestUser(unittest.TestCase):
         self.assertEqual(user3.familyName, "Edison et al.")
         self.assertEqual(user3.givenName, "Thomas")
         self.assertEqual(user3.email, "th.edison@audiorec.com")
-        self.assertEqual({Iri('oldap:GenericRestricted'), Iri('hyha:HyperHamletMember')}, user3.hasPermissions)
-        user3.hasPermissions.add(Iri('oldap:DoesNotExist'))
+        self.assertEqual({Xsd_QName('britnet:BritnetEditor'): DataPermission.DATA_UPDATE,
+                          Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_DELETE}, user3.hasRole)
+        user3.hasRole[Xsd_QName('oldap:DoesNotExist')] = DataPermission.DATA_VIEW
         with self.assertRaises(OldapErrorValue) as ex:
             user3.update()
-            self.assertEqual(str(ex.exception), 'One of the permission sets is not existing!')
+        self.assertEqual(str(ex.exception), 'One of the permission sets is not existing!')
 
         self.assertEqual(user3.inProject[Iri('oldap:HyperHamlet')], {AdminPermission.ADMIN_RESOURCES,
                                                                      AdminPermission.ADMIN_CREATE,
@@ -700,7 +747,7 @@ class TestUser(unittest.TestCase):
                     givenName="Nikolai",
                     email="nikolai.tesla@tesla.com",
                     credentials="Alternative current",
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Xsd_QName('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
         user.create()
         user = User.read(con=self._connection, userId="tesla", ignore_cache=True)
         user.inProject = InProjectClass({Iri('http://www.salsah.org/version/2.0/SwissBritNet'): ObservableSet({AdminPermission.ADMIN_RESOURCES, AdminPermission.ADMIN_CREATE})})
@@ -718,7 +765,7 @@ class TestUser(unittest.TestCase):
                     credentials="Alternative current",
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
                                                           AdminPermission.ADMIN_RESOURCES}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
         user.create()
         user = User.read(con=self._connection, userId="tesla", ignore_cache=True)
         del user.inProject
@@ -736,7 +783,7 @@ class TestUser(unittest.TestCase):
                     credentials="Alternative current",
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
                                                           AdminPermission.ADMIN_RESOURCES}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
         user.create()
         user = User.read(con=self._connection, userId="tesla", ignore_cache=True)
         user.inProject[Iri('http://www.salsah.org/version/2.0/SwissBritNet')] = {AdminPermission.ADMIN_RESOURCES}
@@ -756,7 +803,7 @@ class TestUser(unittest.TestCase):
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
                                                           AdminPermission.ADMIN_RESOURCES},
                                Iri('http://www.salsah.org/version/2.0/SwissBritNet'): {AdminPermission.ADMIN_MODEL}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('britnet:BritnetEditor'): DataPermission.DATA_UPDATE,})
         user.create()
         user = User.read(con=self._connection, userId="volta", ignore_cache=True)
         user.inProject[Iri('http://www.salsah.org/version/2.0/SwissBritNet')].add(AdminPermission.ADMIN_LISTS)
@@ -776,7 +823,7 @@ class TestUser(unittest.TestCase):
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
                                                           AdminPermission.ADMIN_RESOURCES},
                                Iri('http://www.salsah.org/version/2.0/SwissBritNet'): {AdminPermission.ADMIN_MODEL}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('britnet:BritnetEditor'): DataPermission.DATA_UPDATE})
         user.create()
         user = User.read(con=self._connection, userId="voltaB", ignore_cache=True)
         user.inProject[Iri('http://www.salsah.org/version/2.0/SwissBritNet')] = {AdminPermission.ADMIN_LISTS}
@@ -796,7 +843,7 @@ class TestUser(unittest.TestCase):
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
                                                           AdminPermission.ADMIN_RESOURCES},
                                Iri('http://www.salsah.org/version/2.0/SwissBritNet'): {AdminPermission.ADMIN_MODEL}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('hyha:HyperHamletMember'): DataPermission.DATA_UPDATE})
         user.create()
         user = User.read(con=self._connection, userId="curie", ignore_cache=True)
         user.inProject[Iri('oldap:HyperHamlet')].discard(AdminPermission.ADMIN_RESOURCES)
@@ -815,7 +862,7 @@ class TestUser(unittest.TestCase):
                     credentials="Alternative current",
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
                                                           AdminPermission.ADMIN_RESOURCES}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
         user.create()
         user = User.read(con=self._connection, userId="tesla", ignore_cache=True)
         user.inProject[Iri('oldap:HyperHamlet')].add(AdminPermission.ADMIN_CREATE)
@@ -834,7 +881,7 @@ class TestUser(unittest.TestCase):
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
                                                           AdminPermission.ADMIN_RESOURCES},
                                Iri('http://www.salsah.org/version/2.0/SwissBritNet'): {AdminPermission.ADMIN_MODEL}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
         user.create()
         user = User.read(con=self._connection, userId="tesla", ignore_cache=True)
         del user.inProject[Iri('http://www.salsah.org/version/2.0/SwissBritNet')]
@@ -852,7 +899,7 @@ class TestUser(unittest.TestCase):
                     credentials="Alternative current",
                     inProject={Iri('oldap:HyperHamlet'): {AdminPermission.ADMIN_USERS,
                                                           AdminPermission.ADMIN_RESOURCES}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
         user.create()
         user = User.read(con=self._connection, userId="tesla", ignore_cache=True)
         user.inProject[Iri('http://www.salsah.org/version/2.0/SwissBritNet')] = set()
@@ -883,7 +930,7 @@ class TestUser(unittest.TestCase):
                         AdminPermission.ADMIN_USERS,
                         AdminPermission.ADMIN_RESOURCES,
                         AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
         user.create()
         del user
         user = User.read(con=self._connection, userId="chiquet", ignore_cache=True)
@@ -902,7 +949,7 @@ class TestUser(unittest.TestCase):
                     givenName="Bart",
                     email="bart.simpson@springfield.com",
                     credentials="AtomicPower",
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
         user.create()
         del user
         user = User.read(con=self._connection, userId="bsimpson", ignore_cache=True)
@@ -929,7 +976,7 @@ class TestUser(unittest.TestCase):
                         AdminPermission.ADMIN_USERS,
                         AdminPermission.ADMIN_RESOURCES,
                         AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
         user.create()
         del user
         user = User.read(con=self._connection, userId="chiquet", ignore_cache=True)
@@ -952,7 +999,7 @@ class TestUser(unittest.TestCase):
                         AdminPermission.ADMIN_USERS,
                         AdminPermission.ADMIN_RESOURCES,
                         AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
         user.create()
         del user
         user = User.read(con=self._connection, userId="chiquet", ignore_cache=True)
@@ -975,7 +1022,7 @@ class TestUser(unittest.TestCase):
                         AdminPermission.ADMIN_USERS,
                         AdminPermission.ADMIN_RESOURCES,
                         AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
         user.create()
         del user
         user = User.read(con=self._connection, userId="bsimpson", ignore_cache=True)
@@ -1007,7 +1054,7 @@ class TestUser(unittest.TestCase):
                         AdminPermission.ADMIN_USERS,
                         AdminPermission.ADMIN_RESOURCES,
                         AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
         user.create()
         del user
         user = User.read(con=self._connection, userId="bsimpson", ignore_cache=True)
@@ -1034,7 +1081,7 @@ class TestUser(unittest.TestCase):
                             AdminPermission.ADMIN_RESOURCES, AdminPermission.ADMIN_CREATE
                         }
                     },
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
         user.create()
         user = User.read(con=self._connection, userId="fred", ignore_cache=True)
         del user.inProject[Iri('oldap:HyperHamlet')]
@@ -1065,7 +1112,7 @@ class TestUser(unittest.TestCase):
                             AdminPermission.ADMIN_RESOURCES, AdminPermission.ADMIN_CREATE
                         }
                     },
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
         user.create()
         user = User.read(con=self._connection, userId="bsimpson", ignore_cache=True)
         user.inProject[Iri('oldap:HyperHamlet')] = None
@@ -1095,7 +1142,7 @@ class TestUser(unittest.TestCase):
                             AdminPermission.ADMIN_RESOURCES, AdminPermission.ADMIN_CREATE
                         }
                     },
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
         user.create()
         del user
         user = User.read(con=self._connection, userId="bsimpson", ignore_cache=True)
@@ -1124,15 +1171,15 @@ class TestUser(unittest.TestCase):
                         AdminPermission.ADMIN_USERS,
                         AdminPermission.ADMIN_RESOURCES,
                         AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Iri('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
         user.create()
         del user
         user = User.read(con=self._connection, userId="chiquet", ignore_cache=True)
-        del user.hasPermissions
+        del user.hasRole
         user.update()
         del user
         user = User.read(con=self._connection, userId="chiquet", ignore_cache=True)
-        self.assertFalse(user.hasPermissions)
+        self.assertFalse(user.hasRole)
 
     #  #unittest.skip('Work in progress')
     def test_update_user_add_has_permissions(self):
@@ -1147,18 +1194,20 @@ class TestUser(unittest.TestCase):
                         AdminPermission.ADMIN_USERS,
                         AdminPermission.ADMIN_RESOURCES,
                         AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView')})
+                    hasRole={Xsd_QName('oldap:Unknown'): DataPermission.DATA_UPDATE})
         user.create()
         del user
         user = User.read(con=self._connection, userId="chiquet", ignore_cache=True)
-        user.hasPermissions.add(Iri('hyha:HyperHamletMember'))
+        user.hasRole[Xsd_QName('hyha:HyperHamletMember')] = DataPermission.DATA_UPDATE
         user.update()
         del user
         user = User.read(con=self._connection, userId="chiquet", ignore_cache=True)
-        self.assertEqual(user.hasPermissions, {Iri('oldap:GenericView'), Iri('hyha:HyperHamletMember')})
+        self.assertEqual(user.hasRole, {
+            Xsd_QName('oldap:Unknown'): DataPermission.DATA_UPDATE,
+            Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_UPDATE})
 
     #  #unittest.skip('Work in progress')
-    def test_update_user_add_has_permissions(self):
+    def test_update_user_add_has_permissions_X(self):
         user = User(con=self._connection,
                     userIri=Iri("https://orcid.org/0000-0001-5925-2956"),
                     userId=Xsd_NCName("chiquet"),
@@ -1173,11 +1222,15 @@ class TestUser(unittest.TestCase):
         user.create()
         del user
         user = User.read(con=self._connection, userId="chiquet", ignore_cache=True)
-        user.hasPermissions = {Iri('oldap:GenericView'), Iri('hyha:HyperHamletMember')}
+        user.hasRole = {Xsd_QName('oldap:Unknown'): DataPermission.DATA_RESTRICTED,
+                        Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_UPDATE}
         user.update()
         del user
         user = User.read(con=self._connection, userId="chiquet", ignore_cache=True)
-        self.assertEqual(user.hasPermissions, {Iri('oldap:GenericView'), Iri('hyha:HyperHamletMember')})
+        self.assertEqual(user.hasRole, {
+            Xsd_QName('oldap:Unknown'): DataPermission.DATA_RESTRICTED,
+            Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_UPDATE
+        })
 
     #  #unittest.skip('Work in progress')
     def test_update_user_add_bad_has_permissions(self):
@@ -1195,7 +1248,8 @@ class TestUser(unittest.TestCase):
         user.create()
         del user
         user = User.read(con=self._connection, userId="chiquet", ignore_cache=True)
-        user.hasPermissions = {Iri('oldap:GAGA'), Iri('hyha:HyperHamletMember')}
+        user.hasRole = {Xsd_QName('oldap:GAGA'): DataPermission.DATA_RESTRICTED,
+                        Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_UPDATE}
         with self.assertRaises(OldapErrorValue) as err:
             user.update()
 
@@ -1212,15 +1266,16 @@ class TestUser(unittest.TestCase):
                         AdminPermission.ADMIN_USERS,
                         AdminPermission.ADMIN_RESOURCES,
                         AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView'), Iri('hyha:HyperHamletMember')})
+                    hasRole={Xsd_QName('oldap:Unknown'): DataPermission.DATA_RESTRICTED,
+                             Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_UPDATE})
         user.create()
         del user
         user = User.read(con=self._connection, userId="chiquet", ignore_cache=True)
-        user.hasPermissions.discard(Xsd_QName('hyha:HyperHamletMember'))
+        del user.hasRole[Xsd_QName('hyha:HyperHamletMember')]
         user.update()
         del user
         user = User.read(con=self._connection, userId="chiquet", ignore_cache=True)
-        self.assertEqual(user.hasPermissions, {Xsd_QName('oldap:GenericView')})
+        self.assertEqual(user.hasRole, {Xsd_QName('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
 
     #  unittest.skip('Work in progress')
     def test_update_user_unexisting_has_permissions(self):
@@ -1235,15 +1290,17 @@ class TestUser(unittest.TestCase):
                         AdminPermission.ADMIN_USERS,
                         AdminPermission.ADMIN_RESOURCES,
                         AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Xsd_QName('oldap:GenericView'), Xsd_QName('hyha:HyperHamletMember')})
+                    hasRole={Xsd_QName('oldap:Unknown'): DataPermission.DATA_RESTRICTED,
+                             Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_RESTRICTED})
         user.create()
         del user
         user = User.read(con=self._connection, userId="chiquet", ignore_cache=True)
-        user.hasPermissions.discard(Iri('oldap:GenericRestricted'))
+        del user.hasRole[Xsd_QName('oldap:Unknown')]
         user.update()
         del user
         user = User.read(con=self._connection, userId="chiquet", ignore_cache=True)
-        self.assertEqual(user.hasPermissions, {Iri('oldap:GenericView'), Iri('hyha:HyperHamletMember')})
+        self.assertEqual(user.hasRole, {
+            Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_RESTRICTED})
 
     def test_user_update_active(self):
         user = User(con=self._connection,
@@ -1258,7 +1315,8 @@ class TestUser(unittest.TestCase):
                         AdminPermission.ADMIN_RESOURCES,
                         AdminPermission.ADMIN_CREATE}},
                     isActive=False,
-                    hasPermissions={Iri('oldap:GenericView'), Iri('hyha:HyperHamletMember')})
+                    hasRole={Xsd_QName('oldap:Unknown'): DataPermission.DATA_RESTRICTED,
+                             Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_RESTRICTED})
         user.create()
         self.assertFalse(user.isActive)
         del user
@@ -1319,7 +1377,8 @@ class TestUser(unittest.TestCase):
                         AdminPermission.ADMIN_USERS,
                         AdminPermission.ADMIN_RESOURCES,
                         AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView'), Iri('hyha:HyperHamletMember')})
+                    hasRole={Xsd_QName('oldap:Unknown'): DataPermission.DATA_RESTRICTED,
+                             Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_RESTRICTED})
         with self.assertRaises(OldapErrorNoPermission) as ex:
             user.create()
 
@@ -1334,7 +1393,8 @@ class TestUser(unittest.TestCase):
                         AdminPermission.ADMIN_USERS,
                         AdminPermission.ADMIN_RESOURCES,
                         AdminPermission.ADMIN_CREATE}},
-                    hasPermissions={Iri('oldap:GenericView'), Iri('hyha:HyperHamletMember')})
+                    hasRole={Xsd_QName('oldap:Unknown'): DataPermission.DATA_RESTRICTED,
+                             Xsd_QName('hyha:HyperHamletMember'): DataPermission.DATA_RESTRICTED})
         user.create()
         user = User.read(con=self._unpriv, userId="niederer", ignore_cache=True)
         user.familyName = "Niederer"