kallithea Changeset - 45725b774525

Changeset - 45725b774525

Parent rev.

Child rev.

[Not reviewed]

default

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 17 deletions:

kallithea/controllers/admin/users.py

kallithea/lib/auth.py

0 comments (0 inline, 0 general)

kallithea/controllers/admin/users.py

➞

Show inline comments

@@ @@ -40,7 +40,7 @@ from kallithea.lib.exceptions import Def @@
     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
@@ @@ -52,7 +52,7 @@ from kallithea.model.user import UserMod @@
 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__)

kallithea/lib/auth.py

➞

Show inline comments

@@ @@ -143,21 +143,6 @@ 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):

0 comments (0 inline, 0 general)