archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

No '…'.format(…) in logging

Browse Source
This commit is contained in:
Sybren A. Stüvel
2017-12-08 14:52:38 +01:00
parent 199c6b1f77
commit b77527e9a2
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pillar/api/utils/authentication.py
View File

@@ -69,9 +69,10 @@ def find_user_in_db(user_info: dict, provider='blender-id'):
users = current_app.data.driver.db['users'] users = current_app.data.driver.db['users']
user_id = user_info['id']
query = {'$or': [ query = {'$or': [
{'auth': {'$elemMatch': { {'auth': {'$elemMatch': {
'user_id': str(user_info['id']), 'user_id': str(user_id),
'provider': provider}}}, 'provider': provider}}},
{'email': user_info['email']}, {'email': user_info['email']},
]} ]}
@@ -79,9 +80,8 @@ def find_user_in_db(user_info: dict, provider='blender-id'):
db_user = users.find_one(query) db_user = users.find_one(query)
if db_user: if db_user:
log.debug('User with {provider} id {user_id} already in our database, ' log.debug('User with %s id %s already in our database, updating with info from %s',
'updating with info from {provider}.'.format( provider, user_id, provider)
provider=provider, user_id=user_info['id']))
db_user['email'] = user_info['email'] db_user['email'] = user_info['email']
# Find out if an auth entry for the current provider already exists # Find out if an auth entry for the current provider already exists
@@ -89,13 +89,13 @@ def find_user_in_db(user_info: dict, provider='blender-id'):
if not provider_entry: if not provider_entry:
db_user['auth'].append({ db_user['auth'].append({
'provider': provider, 'provider': provider,
'user_id': str(user_info['id']), 'user_id': str(user_id),
'token': ''}) 'token': ''})
else: else:
log.debug('User %r not yet in our database, create a new one.', user_info['id']) log.debug('User %r not yet in our database, create a new one.', user_id)
db_user = create_new_user_document( db_user = create_new_user_document(
email=user_info['email'], email=user_info['email'],
user_id=user_info['id'], user_id=user_id,
username=user_info['full_name'], username=user_info['full_name'],
provider=provider) provider=provider)
db_user['username'] = make_unique_username(user_info['email']) db_user['username'] = make_unique_username(user_info['email'])
@@ -184,7 +184,6 @@ def validate_this_token(token, oauth_subclient=None):
def remove_token(token: str): def remove_token(token: str):
"""Removes the token from the database.""" """Removes the token from the database."""
tokens_coll = current_app.db('tokens') tokens_coll = current_app.db('tokens')
token_hashed = hash_auth_token(token) token_hashed = hash_auth_token(token)