kallithea Changeset - 12ceeda33339

Changeset - 12ceeda33339

Parent rev.

Child rev.

[Not reviewed]

beta

0 5 0

Marcin Kuzminski - 14 years ago 2012-03-21 20:00:55
marcin@python-works.com

#404 API extensions for showing permission for users
- added permissions to get_user function
- added last_login to get_user and get_users function
- modified custom JSON encoder to handle non standard python types, like set, OrderedDict, datetime, date

5 files changed with 63 insertions and 12 deletions:

docs/api/api.rst

docs/changelog.rst

rhodecode/controllers/api/__init__.py

rhodecode/controllers/api/api.py

rhodecode/lib/compat.py

0 comments (0 inline, 0 general)

docs/api/api.rst

➞

Show inline comments

@@ @@ -113,7 +113,15 @@ OUTPUT:: @@
                 "email" :    "<email>",
                 "active" :   "<bool>",
                 "admin" :    "<bool>",
                 "ldap_dn" :  "<ldap_dn>"
                 "ldap_dn" :  "<ldap_dn>",
                 "last_login": "<last_login>",
                 "permissions": {
                     "global": ["hg.create.repository",
                                "repository.read",
                                "hg.register.manual_activate"],
                     "repositories": {"repo1": "repository.none"},
                     "repositories_groups": {"Group1": "group.read"}
                  },
+            }
     error:  null
@@ @@ -144,7 +152,8 @@ OUTPUT:: @@
                 "email" :    "<email>",
                 "active" :   "<bool>",
                 "admin" :    "<bool>",
                 "ldap_dn" :  "<ldap_dn>"
                 "ldap_dn" :  "<ldap_dn>",
                 "last_login": "<last_login>",
               },
     	      …
+            ]

docs/changelog.rst

➞

Show inline comments

@@ @@ -43,6 +43,8 @@ fixes @@
 - fixed #393 py2.5 fixes for routes url generator
 - fixed #397 Private repository groups shows up before login
 - fixed #396 fixed problems with revoking users in nested groups
 - fixed mysql unicode issues + specified InnoDB as default engine with
   utf8 charset
 .3.3 (**2012-03-02**)
 ----------------------

rhodecode/controllers/api/__init__.py

➞

Show inline comments

@@ @@ -233,10 +233,10 @@ class JSONRPCController(WSGIController): @@
         try:
             return json.dumps(response)
         except TypeError, e:
-            log.debug('Error encoding response: %s' % e)
+            log.error('API FAILED. Error encoding response: %s' % e)
             return json.dumps(
                 dict(
                     self._req_id,
+                    id=self._req_id,
                     result=None,
                     error="Error encoding response"
+                )

rhodecode/controllers/api/api.py

➞

Show inline comments

@@ @@ -30,18 +30,16 @@ import logging @@
 from rhodecode.controllers.api import JSONRPCController, JSONRPCError
 from rhodecode.lib.auth import HasPermissionAllDecorator, \
     HasPermissionAnyDecorator, PasswordGenerator
+    HasPermissionAnyDecorator, PasswordGenerator, AuthUser
 from rhodecode.model.meta import Session
 from rhodecode.model.scm import ScmModel
-from rhodecode.model.db import User, UsersGroup, RepoGroup, Repository
 from rhodecode.model.db import User, UsersGroup, Repository
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.user import UserModel
 from rhodecode.model.users_group import UsersGroupModel
 from rhodecode.model.repos_group import ReposGroupModel
 from rhodecode.lib.utils import map_groups
 log = logging.getLogger(__name__)
@@ @@ -101,7 +99,9 @@ class ApiController(JSONRPCController): @@
             email=user.email,
             active=user.active,
             admin=user.admin,
             ldap_dn=user.ldap_dn
             ldap_dn=user.ldap_dn,
             last_login=user.last_login,
             permissions=AuthUser(user_id=user.user_id).permissions
+        )
     @HasPermissionAllDecorator('hg.admin')
@@ @@ -123,7 +123,8 @@ class ApiController(JSONRPCController): @@
                     email=user.email,
                     active=user.active,
                     admin=user.admin,
                     ldap_dn=user.ldap_dn
                     ldap_dn=user.ldap_dn,
                     last_login=user.last_login,
+                )
+            )
         return result

rhodecode/lib/compat.py

➞

Show inline comments

@@ @@ -25,16 +25,55 @@ @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import os
 import datetime
 import functools
 from rhodecode import __platform__, PLATFORM_WIN
 #==============================================================================
 # json
 #==============================================================================
 def __obj_dump(obj):
     DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%S"
     DATE_FORMAT = "%Y-%m-%d"
     if isinstance(obj, complex):
         return [obj.real, obj.imag]
     elif isinstance(obj, datetime.datetime):
         return obj.strftime(DATETIME_FORMAT)
     elif isinstance(obj, datetime.date):
         return obj.strftime(DATE_FORMAT)
     elif isinstance(obj, set):
         return list(obj)
     elif isinstance(obj, OrderedDict):
         return obj.as_dict()
     else:
         raise NotImplementedError
 try:
     import json
     # extended JSON encoder for json
     class ExtendedEncoder(json.JSONEncoder):
         def default(self, obj):
             try:
                 return __obj_dump(obj)
             except NotImplementedError:
                 pass
             return json.JSONEncoder.default(self, obj)
     # monkey-patch JSON encoder to use extended version
     json.dumps = functools.partial(json.dumps, cls=ExtendedEncoder)
 except ImportError:
     import simplejson as json
     def extended_encode(obj):
         try:
             return __obj_dump(obj)
         except NotImplementedError:
             pass
         raise TypeError("%r is not JSON serializable" % (obj,))
     json.dumps = functools.partial(json.dumps, default=extended_encode)
 #==============================================================================
 # izip_longest
@@ @@ -44,11 +83,11 @@ try: @@
 except ImportError:
     import itertools
-    def izip_longest(*args, **kwds): # noqa
     def izip_longest(*args, **kwds):
         fillvalue = kwds.get("fillvalue")
         def sentinel(counter=([fillvalue] * (len(args) - 1)).pop):
             yield counter() # yields the fillvalue, or raises IndexError
+            yield counter()  # yields the fillvalue, or raises IndexError
         fillers = itertools.repeat(fillvalue)
         iters = [itertools.chain(it, sentinel(), fillers)

0 comments (0 inline, 0 general)