Minor stuff

Author: lipis

main/auth.py

@@ -354,7 +354,7 @@ def decorator_order_guard(f, decorator_name):
       )
 
 
-def create_user_db(auth_id, name, username, email='', verified=False, **params):
+def create_user_db(auth_id, name, username, email='', verified=False, **props):
   email = email.lower()
   if verified and email:
     user_dbs, _ = model.User.get_dbs(email=email, verified=True, limit=2)
@@ -382,7 +382,7 @@ def create_user_db(auth_id, name, username, email='', verified=False, **params):
       auth_ids=[auth_id],
       verified=verified,
       token=util.uuid(),
-      **params
+      **props
     )
   user_db.put()
   task.new_user_notification(user_db)
@@ -405,6 +405,7 @@ def signin_user_db(user_db):
       'next': flask.url_for('welcome'),
       'remember': False,
     })
+  flask.session.pop('auth-params', None)
   if login.login_user(flask_user_db, remember=auth_params['remember']):
     user_db.put_async()
     flask.flash('Hello %s, welcome to %s.' % (

main/user.py

@@ -209,7 +209,7 @@ def user_merge():
     merged_user_db.auth_ids = auth_ids
     merged_user_db.put()
 
-    deprecated_keys = [key for key in user_db_keys if key != merged_user_db.key]
+    deprecated_keys = [k for k in user_db_keys if k != merged_user_db.key]
     merge_user_dbs(merged_user_db, deprecated_keys)
     return flask.redirect(
         flask.url_for('user_update', user_id=merged_user_db.key.id()),