Mercurial > kallithea

comparison rhodecode/model/user.py @ 1628:de71a4bde097 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some code cleanups and fixes
author Marcin Kuzminski <marcin@python-works.com>
date Mon, 31 Oct 2011 21:42:41 +0200
parents 69cd66071f02
children 2c0d35e336b5
comparison
equal deleted inserted replaced
1627:c622e3a85499 1628:de71a4bde097
104 new_user = User() 104 new_user = User()
105 new_user.username = username 105 new_user.username = username
106 new_user.password = None 106 new_user.password = None
107 new_user.api_key = generate_api_key(username) 107 new_user.api_key = generate_api_key(username)
108 new_user.email = attrs['email'] 108 new_user.email = attrs['email']
109 new_user.active = True 109 new_user.active = attrs.get('active', True)
110 new_user.name = attrs['name'] 110 new_user.name = attrs['name']
111 new_user.lastname = attrs['lastname'] 111 new_user.lastname = attrs['lastname']
112 112
113 self.sa.add(new_user) 113 self.sa.add(new_user)
114 self.sa.commit() 114 self.sa.commit()
115 return True 115 return new_user
116 except (DatabaseError,): 116 except (DatabaseError,):
117 log.error(traceback.format_exc()) 117 log.error(traceback.format_exc())
118 self.sa.rollback() 118 self.sa.rollback()
119 raise 119 raise
120 log.debug('User %s already exists. Skipping creation of account for container auth.', 120 log.debug('User %s already exists. Skipping creation of account'
121 username) 121 ' for container auth.', username)
122 return False 122 return None
123 123
124 def create_ldap(self, username, password, user_dn, attrs): 124 def create_ldap(self, username, password, user_dn, attrs):
125 """ 125 """
126 Checks if user is in database, if not creates this user marked 126 Checks if user is in database, if not creates this user marked
127 as ldap user 127 as ldap user
139 # add ldap account always lowercase 139 # add ldap account always lowercase
140 new_user.username = username.lower() 140 new_user.username = username.lower()
141 new_user.password = get_crypt_password(password) 141 new_user.password = get_crypt_password(password)
142 new_user.api_key = generate_api_key(username) 142 new_user.api_key = generate_api_key(username)
143 new_user.email = attrs['email'] 143 new_user.email = attrs['email']
144 new_user.active = attrs.get('active',True) 144 new_user.active = attrs.get('active', True)
145 new_user.ldap_dn = safe_unicode(user_dn) 145 new_user.ldap_dn = safe_unicode(user_dn)
146 new_user.name = attrs['name'] 146 new_user.name = attrs['name']
147 new_user.lastname = attrs['lastname'] 147 new_user.lastname = attrs['lastname']
148 148
149 self.sa.add(new_user) 149 self.sa.add(new_user)
150 self.sa.commit() 150 self.sa.commit()
151 return True 151 return new_user
152 except (DatabaseError,): 152 except (DatabaseError,):
153 log.error(traceback.format_exc()) 153 log.error(traceback.format_exc())
154 self.sa.rollback() 154 self.sa.rollback()
155 raise 155 raise
156 log.debug('this %s user exists skipping creation of ldap account', 156 log.debug('this %s user exists skipping creation of ldap account',
157 username) 157 username)
158 return False 158 return None
159 159
160 def create_registration(self, form_data): 160 def create_registration(self, form_data):
161 from rhodecode.lib.celerylib import tasks, run_task 161 from rhodecode.lib.celerylib import tasks, run_task
162 try: 162 try:
163 new_user = User() 163 new_user = User()