kallithea Changeset - 7eb5bbbfb8dd

Changeset - 7eb5bbbfb8dd

Parent rev.

Child rev.

[Not reviewed]

stable

0 2 0

Andrew Shadura - 11 years ago 2015-05-15 18:07:27
andrew@shadura.me

auth: reduce code duplication by removing generate_api_key implemented in utils2

2 files changed with 2 insertions and 16 deletions:

kallithea/controllers/admin/users.py

kallithea/lib/auth.py

0 comments (0 inline, 0 general)

kallithea/controllers/admin/users.py

➞

Show inline comments

@@ @@ -37,25 +37,25 @@ from sqlalchemy.sql.expression import fu @@
 import kallithea
 from kallithea.lib.exceptions import DefaultUserException, \
     UserOwnsReposException, UserCreationError
 from kallithea.lib import helpers as h
 from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator, \
-    AuthUser, generate_api_key
     AuthUser
 import kallithea.lib.auth_modules.auth_internal
 from kallithea.lib import auth_modules
 from kallithea.lib.base import BaseController, render
 from kallithea.model.api_key import ApiKeyModel
 from kallithea.model.db import User, UserEmailMap, UserIpMap, UserToPerm
 from kallithea.model.forms import UserForm, CustomDefaultPermissionsForm
 from kallithea.model.user import UserModel
 from kallithea.model.meta import Session
 from kallithea.lib.utils import action_logger
 from kallithea.lib.compat import json
 from kallithea.lib.utils2 import datetime_to_time, safe_int
+from kallithea.lib.utils2 import datetime_to_time, safe_int, generate_api_key
 log = logging.getLogger(__name__)
 class UsersController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""

kallithea/lib/auth.py

➞

Show inline comments

@@ @@ -141,26 +141,12 @@ def get_crypt_password(password): @@
 def check_password(password, hashed):
     return KallitheaCrypto.hash_check(password, hashed)
 def generate_api_key(str_, salt=None):
     """
     Generates API KEY from given string
     :param str_:
     :param salt:
     """
     if salt is None:
         salt = _RandomNameSequence().next()
     return hashlib.sha1(str_ + salt).hexdigest()
 class CookieStoreWrapper(object):
     def __init__(self, cookie_store):
         self.cookie_store = cookie_store
     def __repr__(self):

0 comments (0 inline, 0 general)