kallithea Changeset - b902baeaa494

Changeset - b902baeaa494

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-05-31 18:42:49
marcin@python-works.com

API, added delete_user method.
- create_user now also returns new user object data as get_user
- updated docs

2 files changed with 82 insertions and 10 deletions:

docs/api/api.rst

rhodecode/controllers/api/api.py

0 comments (0 inline, 0 general)

docs/api/api.rst

➞

Show inline comments

@@ @@ -187,7 +187,18 @@ OUTPUT:: @@
     result: {
               "id" : "<new_user_id>",
               "msg" : "created new user <username>"
               "msg" : "created new user <username>",
               "user": {
                 "id" :       "<id>",
                 "username" : "<username>",
                 "firstname": "<firstname>",
                 "lastname" : "<lastname>",
                 "email" :    "<email>",
                 "active" :   "<bool>",
                 "admin" :    "<bool>",
                 "ldap_dn" :  "<ldap_dn>",
                 "last_login": "<last_login>",
               },
+            }
     error:  null
@@ @@ -195,7 +206,7 @@ OUTPUT:: @@
 update_user
 -----------
-updates current one if such user exists. This command can
+updates given user if such user exists. This command can
 be executed only using api_key belonging to user with admin rights.
@@ @@ -220,7 +231,33 @@ OUTPUT:: @@
     result: {
               "id" : "<edited_user_id>",
               "msg" : "updated user <username>"
               "msg" : "updated user ID:<userid> <username>"
+            }
     error:  null
 delete_user
 -----------
 deletes givenuser if such user exists. This command can
 be executed only using api_key belonging to user with admin rights.
 INPUT::
     id : <id_for_response>
     api_key : "<api_key>"
     method :  "delete_user"
     args :    {
                 "userid" : "<user_id or username>",
+              }
 OUTPUT::
     result: {
               "id" : "<edited_user_id>",
               "msg" : "deleted user ID:<userid> <username>"
+            }
     error:  null

rhodecode/controllers/api/api.py

➞

Show inline comments

@@ @@ -156,14 +156,25 @@ class ApiController(JSONRPCController): @@
             password = PasswordGenerator().gen_password(length=8)
         try:
-            usr = UserModel().create_or_update(
+            user = UserModel().create_or_update(
                 username, password, email, firstname,
                 lastname, active, admin, ldap_dn
+            )
             Session.commit()
             return dict(
                 id=usr.user_id,
                 msg='created new user %s' % username
                 id=user.user_id,
                 msg='created new user %s' % username,
                 user=dict(
                     id=user.user_id,
                     username=user.username,
                     firstname=user.name,
                     lastname=user.lastname,
                     email=user.email,
                     active=user.active,
                     admin=user.admin,
                     ldap_dn=user.ldap_dn,
                     last_login=user.last_login,
+                )
+            )
         except Exception:
             log.error(traceback.format_exc())
@@ @@ -185,8 +196,9 @@ class ApiController(JSONRPCController): @@
         :param admin:
         :param ldap_dn:
         """
         if not UserModel().get_user(userid):
             raise JSONRPCError("user %s does not exist" % username)
         usr = UserModel().get_user(userid)
         if not usr:
             raise JSONRPCError("user ID:%s does not exist" % userid)
         try:
             usr = UserModel().create_or_update(
@@ @@ -196,11 +208,34 @@ class ApiController(JSONRPCController): @@
             Session.commit()
             return dict(
                 id=usr.user_id,
                 msg='updated user %s' % username
+                msg='updated user ID:%s %s' % (usr.user_id, usr.username)
+            )
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError('failed to update user %s' % username)
             raise JSONRPCError('failed to update user %s' % userid)
     @HasPermissionAllDecorator('hg.admin')
     def delete_user(self, apiuser, userid):
         """"
         Deletes an user
         :param apiuser:
         """
         usr = UserModel().get_user(userid)
         if not usr:
             raise JSONRPCError("user ID:%s does not exist" % userid)
         try:
             UserModel().delete(userid)
             Session.commit()
             return dict(
                 id=usr.user_id,
                 msg='deleted user ID:%s %s' % (usr.user_id, usr.username)
+            )
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError('failed to delete ID:%s %s' % (usr.user_id,
                                                               usr.username))
     @HasPermissionAllDecorator('hg.admin')
     def get_users_group(self, apiuser, group_name):

0 comments (0 inline, 0 general)