vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Change common_login to take in a user uuid, instead of a user DB object

Browse source
This commit is contained in:
Joseph Schorr 2017-07-20 15:40:14 -04:00
parent 7736de24fe
commit aecec02b6c
7 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

31
endpoints/common.py
View file

@ -23,11 +23,11 @@ from _init import __version__
logger = logging.getLogger(__name__)
def common_login(db_user, permanent_session=True):
def common_login(user_uuid, permanent_session=True):
""" Performs login of the given user, with optional non-permanence on the session. """
if login_user(LoginWrappedDBUser(db_user.uuid, db_user)):
logger.debug('Successfully signed in as: %s (%s)' % (db_user.username, db_user.uuid))
new_identity = QuayDeferredPermissionUser.for_user(db_user)
if login_user(LoginWrappedDBUser(user_uuid)):
logger.debug('Successfully signed in as user with uuid %s', user_uuid)
new_identity = QuayDeferredPermissionUser.for_id(user_uuid)
identity_changed.send(app, identity=new_identity)
session['login_time'] = datetime.datetime.now()
@ -37,19 +37,18 @@ def common_login(db_user, permanent_session=True):
session.permanent_session_lifetime = convert_to_timedelta(session_timeout_str)
# Inform our user analytics that we have a new "lead"
create_lead_future = user_analytics.create_lead(
db_user.email,
db_user.username,
db_user.given_name,
db_user.family_name,
db_user.company,
)
create_lead_future.add_done_callback(build_error_callback('Create lead failed'))
#create_lead_future = user_analytics.create_lead(
# db_user.email,
# db_user.username,
# db_user.given_name,
# db_user.family_name,
# db_user.company,
#)
#create_lead_future.add_done_callback(build_error_callback('Create lead failed'))
return True
else:
logger.debug('User could not be logged in, inactive?')
return False
logger.debug('User could not be logged in, inactive?')
return False
def _list_files(path, extension):