# HG changeset patch
# User Andrew Shadura <andrew@shadura.me>
# Date 1431706047 -7200
# Node ID 45725b77452591b10219a7d220ec1dad52923aa7
# Parent  08ad393e6866ee2a03e0dfadc853861f2ecf0ce2
auth: reduce code duplication by removing generate_api_key implemented in utils2

diff -r 08ad393e6866 -r 45725b774525 kallithea/controllers/admin/users.py
--- a/kallithea/controllers/admin/users.py	Thu May 14 21:05:47 2015 +0200
+++ b/kallithea/controllers/admin/users.py	Fri May 15 18:07:27 2015 +0200
@@ -40,7 +40,7 @@
     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.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__)
 
diff -r 08ad393e6866 -r 45725b774525 kallithea/lib/auth.py
--- a/kallithea/lib/auth.py	Thu May 14 21:05:47 2015 +0200
+++ b/kallithea/lib/auth.py	Fri May 15 18:07:27 2015 +0200
@@ -143,21 +143,6 @@
 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):