From d53e8308c06329017399a52397850d815988c506 Mon Sep 17 00:00:00 2001 From: Kyle Burton Date: Fri, 24 Jan 2025 16:14:11 -0600 Subject: [PATCH] Skip grant_from_storage on passport login --- fence/sync/sync_users.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/fence/sync/sync_users.py b/fence/sync/sync_users.py index 69273acf5..2e571a231 100644 --- a/fence/sync/sync_users.py +++ b/fence/sync/sync_users.py @@ -1000,19 +1000,19 @@ def sync_to_storage_backend( # when updating users we want to maintain case sensitivity in the username so # pass the original, non-lowered user_info dict self._upsert_userinfo(sess, {user_info["username"].lower(): user_info}) + if not skip_google_updates: + self._grant_from_storage( + to_add, + user_project_lowercase, + sess, + google_bulk_mapping=google_group_user_mapping, + expires=expires, + ) - self._grant_from_storage( - to_add, - user_project_lowercase, - sess, - google_bulk_mapping=google_group_user_mapping, - expires=expires, - ) - - if config["GOOGLE_BULK_UPDATES"] and not skip_google_updates: - self.logger.info("Updating user's google groups ...") - update_google_groups_for_users(google_group_user_mapping) - self.logger.info("Google groups update done!!") + if config["GOOGLE_BULK_UPDATES"]: + self.logger.info("Updating user's google groups ...") + update_google_groups_for_users(google_group_user_mapping) + self.logger.info("Google groups update done!!") sess.commit()