* Added a "minimal" parameter to user lists (users, applications, groups)

* Added an applications/application/:appid/groups call to display groups for the specified applicaiton
* updated setup to require >= falcon 1.2

Author: Jonathan Spalink

econtextauth/engine/routes/__init__.py

@@ -19,6 +19,7 @@
     applications.application.Application,
     applications.applications.Applications,
     applications.users.Users,
+    applications.groups.Groups,
     groups.group.Group,
     groups.groups.Groups,
     groups.users.Users,

econtextauth/engine/routes/applications/__init__.py

@@ -1,3 +1,4 @@
 from . import application
 from . import applications
 from . import users
+from . import groups

econtextauth/engine/routes/applications/groups.py

@@ -0,0 +1,37 @@
+import logging
+from econtextauth.models.application import application
+from econtextauth.models.group import group
+import falcon
+
+log = logging.getLogger('econtext')
+
+
+class Groups:
+    """
+    Groups
+
+    GET  - Retrieve all groups associated with a particular application
+    """
+    routes = ['applications/application/{appid}/groups']
+    
+    def __init__(self, econtext):
+        self.econtext = econtext
+    
+    @staticmethod
+    def get_route_constructor(*args, **kwargs):
+        return Groups(*args)
+    
+    def on_get(self, req, resp, appid):
+        """
+        Retrieve all groups belonging to an application
+
+        :param req:
+        :param resp:
+        :return:
+        """
+        app = application.Application.get(appid)
+        if not app:
+            raise falcon.HTTPInvalidParam("Application could not be found", 'appid')
+        groups = list(group.Group.filter(application_id=appid))
+        resp.body = {"groups": groups}
+        return True

econtextauth/engine/routes/applications/users.py

@@ -32,5 +32,7 @@ def on_get(self, req, resp, appid):
         if not app:
             raise falcon.HTTPInvalidParam("Application could not be found", 'appid')
         users = [a for a in app.fields.users.all()]
+        if req.get_param('minimal'):
+            users = [u.json_minimal for u in users]
         resp.body = {"users": users}
         return True

econtextauth/engine/routes/groups/users.py

@@ -33,8 +33,14 @@ def on_get(self, req, resp, groupid):
         grp = group.Group.get(groupid)
         if not grp:
             raise falcon.HTTPInvalidParam("Group could not be found", 'groupid')
+
+        status = req.get_param('status')
 
         query = r.table('_group_users').get_all(groupid, index='group_id').eq_join('user_id', r.table('users'), index='id').map(lambda x: x['right'])
         users = [user.User(**u) for u in query.run()]
+        if status:
+            users = [u for u in users if u['status'] == status]
+        if req.get_param('minimal'):
+            users = [u.json_minimal for u in users]
         resp.body = {"users": users}
         return True

econtextauth/engine/routes/users/users.py

@@ -29,5 +29,7 @@ def on_get(self, req, resp):
             :return:
         """
         users = list(user.User.all())
+        if req.get_param('minimal'):
+            users = [u.json_minimal for u in users]
         resp.body = {"users": users}
         return True

econtextauth/models/user/user.py

@@ -51,6 +51,20 @@ def json(self):
             'groups': list(self.fields.groups.all())
         }
 
+    @property
+    def json_minimal(self):
+        return {  # base user data
+            'id': self.get('id'),
+            'name': self.get('name'),
+            'email': self.get('email'),
+            'username': self.get('username'),
+            'custom_data': self.get('custom_data'),
+            'href': '{}/api/users/user/{}'.format(get_base_url(), self.get('id')),
+            'created_at': str(self.get('created_at') or ''),
+            'modified_at': str(self.get('modified_at') or ''),
+            'status': self.get('status', 'DISABLED')
+        }
+    
     @staticmethod
     def create_new(email, password, applications, name=None, custom_data=None, status='UNVERIFIED', id_=None, username=None, groups=None, *args, **kwargs):
         """

setup.py

@@ -16,7 +16,7 @@
     data_files=data_files,
     install_requires=[
         'requests',
-        'falcon >= 1.1',
+        'falcon >= 1.2',
         'gevent',
         'gunicorn',
         'rethinkdb',