Mercurial > kallithea
comparison rhodecode/model/user.py @ 1618:9353189b7675 beta
Added automatic logout of deactivated/deleted users
| author | Liad Shani <liadff@gmail.com> |
|---|---|
| date | Thu, 27 Oct 2011 20:40:49 +0200 |
| parents | 9dae92a65e40 |
| children | cbc2b1913cdf |
comparison
equal
deleted
inserted
replaced
| 1617:cf128ced8c85 | 1618:9353189b7675 |
|---|---|
| 241 if api_key: | 241 if api_key: |
| 242 dbuser = self.get_by_api_key(api_key) | 242 dbuser = self.get_by_api_key(api_key) |
| 243 else: | 243 else: |
| 244 dbuser = self.get(user_id) | 244 dbuser = self.get(user_id) |
| 245 | 245 |
| 246 if dbuser is not None: | 246 if dbuser is not None and dbuser.active: |
| 247 log.debug('filling %s data', dbuser) | 247 log.debug('filling %s data', dbuser) |
| 248 for k, v in dbuser.get_dict().items(): | 248 for k, v in dbuser.get_dict().items(): |
| 249 setattr(auth_user, k, v) | 249 setattr(auth_user, k, v) |
| 250 else: | |
| 251 return False | |
| 250 | 252 |
| 251 except: | 253 except: |
| 252 log.error(traceback.format_exc()) | 254 log.error(traceback.format_exc()) |
| 253 auth_user.is_authenticated = False | 255 auth_user.is_authenticated = False |
| 254 | 256 return False |
| 255 return auth_user | 257 |
| 258 return True | |
| 256 | 259 |
| 257 def fill_perms(self, user): | 260 def fill_perms(self, user): |
| 258 """ | 261 """ |
| 259 Fills user permission attribute with permissions taken from database | 262 Fills user permission attribute with permissions taken from database |
| 260 works for permissions given for repositories, and for permissions that | 263 works for permissions given for repositories, and for permissions that |