diff options
author | Marcin Kuzminski <marcin@python-works.com> | 2011-03-06 00:06:28 +0100 |
---|---|---|
committer | Marcin Kuzminski <marcin@python-works.com> | 2011-03-06 00:06:28 +0100 |
commit | a9f0345255f2b9fd6a2db501e75503e3397ef654 (patch) | |
tree | dc78992c614a771a06541135046660d55eeeb959 /rhodecode/model/user.py | |
parent | 9652af799b8ddb450983170a765d690c5b538d11 (diff) |
Added api_key into user, api key get's generated again after password change
updated ini files
--HG--
branch : beta
Diffstat (limited to 'rhodecode/model/user.py')
-rw-r--r-- | rhodecode/model/user.py | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py index 4f297626..cd03e8b1 100644 --- a/rhodecode/model/user.py +++ b/rhodecode/model/user.py @@ -37,6 +37,7 @@ from rhodecode.model.db import User from rhodecode.lib.exceptions import DefaultUserException, UserOwnsReposException from sqlalchemy.exc import DatabaseError +from rhodecode.lib import generate_api_key log = logging.getLogger(__name__) @@ -68,6 +69,7 @@ class UserModel(BaseModel): for k, v in form_data.items(): setattr(new_user, k, v) + new_user.api_key = generate_api_key(form_data['username']) self.sa.add(new_user) self.sa.commit() except: @@ -91,6 +93,7 @@ class UserModel(BaseModel): new_user = User() new_user.username = username.lower() # add ldap account always lowercase new_user.password = get_crypt_password(password) + new_user.api_key = generate_api_key(username) new_user.email = attrs['email'] new_user.active = True new_user.ldap_dn = user_dn @@ -134,19 +137,20 @@ class UserModel(BaseModel): def update(self, user_id, form_data): try: - new_user = self.get(user_id, cache=False) - if new_user.username == 'default': + user = self.get(user_id, cache=False) + if user.username == 'default': raise DefaultUserException( _("You can't Edit this user since it's" " crucial for entire application")) for k, v in form_data.items(): if k == 'new_password' and v != '': - new_user.password = v + user.password = v + user.api_key = generate_api_key(user.username) else: - setattr(new_user, k, v) + setattr(user, k, v) - self.sa.add(new_user) + self.sa.add(user) self.sa.commit() except: log.error(traceback.format_exc()) @@ -155,19 +159,20 @@ class UserModel(BaseModel): def update_my_account(self, user_id, form_data): try: - new_user = self.get(user_id, cache=False) - if new_user.username == 'default': + user = self.get(user_id, cache=False) + if user.username == 'default': raise DefaultUserException( _("You can't Edit this user since it's" " crucial for entire application")) for k, v in form_data.items(): if k == 'new_password' and v != '': - new_user.password = v + user.password = v + user.api_key = generate_api_key(user.username) else: if k not in ['admin', 'active']: - setattr(new_user, k, v) + setattr(user, k, v) - self.sa.add(new_user) + self.sa.add(user) self.sa.commit() except: log.error(traceback.format_exc()) |