fix(email): remove redundancy and correctly get email for RAS

fence/auth.py

@@ -114,8 +114,6 @@ def set_flask_session_values(user):
     if not idp:
         idp = IdentityProvider(name=provider)
 
-    _update_users_email(user, email)
-
     user.identity_provider = idp
     current_session.add(user)
     current_session.commit()
@@ -264,11 +262,12 @@ def admin_login_required(function):
 def _update_users_email(user, email):
     """
     Update email if provided and doesn't match db entry.
-
-    NOTE: This does NOT commit to the db, do so outside this function
     """
     if email and user.email != email:
         logger.info(
             f"Updating username {user.username}'s email from {user.email} to {email}"
         )
         user.email = email
+
+        current_session.add(user)
+        current_session.commit()

fence/resources/openid/ras_oauth2.py

@@ -113,7 +113,7 @@ def get_user_id(self, code):
             self.logger.exception("{}: {}".format(err_msg, e))
             return {"error": err_msg}
 
-        return {"username": username}
+        return {"username": username, "email": userinfo.get("email")}
 
     @backoff.on_exception(backoff.expo, Exception, **DEFAULT_BACKOFF_SETTINGS)
     def update_user_visas(self, user, db_session=current_session):