kallithea Changeset - 647fb653048e

Changeset - 647fb653048e

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 13 years ago 2013-05-06 23:35:29
marcin@python-works.com

make the password optional in API calls

4 files changed with 24 insertions and 3 deletions:

docs/api/api.rst

rhodecode/controllers/api/api.py

rhodecode/model/user.py

rhodecode/tests/api/api_base.py

0 comments (0 inline, 0 general)

docs/api/api.rst

➞

Show inline comments

@@ @@ -354,7 +354,7 @@ INPUT:: @@
     args :    {
                 "username" :  "<username>",
                 "email" :     "<useremail>",
                 "password" :  "<password>",
+                "password" :  "<password = Optional(None)>",
                 "firstname" : "<firstname> = Optional(None)",
                 "lastname" :  "<lastname> = Optional(None)",
                 "active" :    "<bool> = Optional(True)",

rhodecode/controllers/api/api.py

➞

Show inline comments

@@ @@ -407,7 +407,7 @@ class ApiController(JSONRPCController): @@
         return result
     @HasPermissionAllDecorator('hg.admin')
     def create_user(self, apiuser, username, email, password,
+    def create_user(self, apiuser, username, email, password=Optional(None),
                     firstname=Optional(None), lastname=Optional(None),
                     active=Optional(True), admin=Optional(False),
                     ldap_dn=Optional(None)):

rhodecode/model/user.py

➞

Show inline comments

@@ @@ -133,7 +133,7 @@ class UserModel(BaseModel): @@
             new_user.admin = admin
             # set password only if creating an user or password is changed
             if not edit or user.password != password:
                 new_user.password = get_crypt_password(password)
+                new_user.password = get_crypt_password(password) if password else None
                 new_user.api_key = generate_api_key(username)
             new_user.email = email
             new_user.active = active

rhodecode/tests/api/api_base.py

➞

Show inline comments

@@ @@ -477,6 +477,27 @@ class BaseTestApi(object): @@
         UserModel().delete(usr.user_id)
         Session().commit()
     def test_api_create_user_without_password(self):
         username = 'test_new_api_user_passwordless'
         email = username + "@foo.com"
         id_, params = _build_data(self.apikey, 'create_user',
                                   username=username,
                                   email=email)
         response = api_call(self, params)
         usr = UserModel().get_by_username(username)
         ret = dict(
             msg='created new user `%s`' % username,
             user=jsonify(usr.get_api_data())
+        )
         expected = ret
         self._compare_ok(id_, expected, given=response.body)
         UserModel().delete(usr.user_id)
         Session().commit()
     @mock.patch.object(UserModel, 'create_or_update', crash)
     def test_api_create_user_when_exception_happened(self):

0 comments (0 inline, 0 general)