Merge remote-tracking branch 'origin/master' into master2

biosustain · Jun 22, 2016 · af3f521 · af3f521
2 parents 4d69134 + bdbabb3
commit af3f521
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/flask_potion/contrib/principals/__init__.py b/flask_potion/contrib/principals/__init__.py
@@ -83,6 +83,9 @@ def convert(method, needs, map, path=()):
                                 if isinstance(imported_need, HybridItemNeed):
                                     imported_need = imported_need.extend(field)
                                 options.add(imported_need)
+
+                    elif role == 'user' and value in ["$id", "$uri"]:
+                        options.add(HybridItemNeed('id', self.resource))
                 else:
                     options.add(RoleNeed(need))
 

diff --git a/flask_potion/contrib/principals/needs.py b/flask_potion/contrib/principals/needs.py
@@ -41,7 +41,7 @@ def extend(self, field):
 
     def __call__(self, item):
         if self.method == 'id':
-            return UserNeed(self.resource.item_get_id(item))
+            return UserNeed(get_value(item, self.resource.manager.id_attribute, None))
         return ItemNeed(self.method, get_value(item, self.resource.manager.id_attribute, None), self.type)
 
     def __eq__(self, other):

diff --git a/tests/contrib/principals/test_manager_principals.py b/tests/contrib/principals/test_manager_principals.py
@@ -237,7 +237,8 @@ class UserResource(PrincipalResource):
             class Meta:
                 model = self.USER
                 permissions = {
-                    'create': 'admin'
+                    'create': 'admin',
+                    'update': 'user:$uri'
                 }
 
         self.api.add_resource(BookStoreResource)
@@ -246,6 +247,7 @@ class Meta:
         self.mock_user = {'id': 1, 'roles': ['admin']}
 
         self.assert200(self.client.post('/user', data={'name': 'Admin'}))
+        self.assert200(self.client.patch('/user/1', data={'name': 'Other'}))
 
         for i, store in enumerate([
             {