diff --git a/kallithea/controllers/api/__init__.py b/kallithea/controllers/api/__init__.py --- a/kallithea/controllers/api/__init__.py +++ b/kallithea/controllers/api/__init__.py @@ -158,7 +158,7 @@ class JSONRPCController(WSGIController): return jsonrpc_error(retid=self._req_id, message='Invalid API key') - auth_u = AuthUser(u.user_id, self._req_api_key) + auth_u = AuthUser(u.user_id) if not AuthUser.check_ip_allowed(auth_u, ip_addr): return jsonrpc_error(retid=self._req_id, message='request from IP:%s not allowed' % (ip_addr,)) diff --git a/kallithea/lib/auth.py b/kallithea/lib/auth.py --- a/kallithea/lib/auth.py +++ b/kallithea/lib/auth.py @@ -643,7 +643,6 @@ class AuthUser(object): au = AuthUser( user_id=cookie.get('user_id'), - username=cookie.get('username'), is_external_auth=cookie.get('is_external_auth', False), ) if not au.is_authenticated and au.user_id is not None: diff --git a/kallithea/model/db.py b/kallithea/model/db.py --- a/kallithea/model/db.py +++ b/kallithea/model/db.py @@ -511,8 +511,7 @@ class User(Base, BaseModel): Returns instance of AuthUser for this user """ from kallithea.lib.auth import AuthUser - return AuthUser(user_id=self.user_id, api_key=self.api_key, - username=self.username) + return AuthUser(user_id=self.user_id) @hybrid_property def user_data(self):