Skip to content

Commit

Permalink
feat: one more fix?
Browse files Browse the repository at this point in the history
  • Loading branch information
m0nhawk committed Jul 1, 2024
1 parent 27f7b42 commit d638742
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions fence/resources/user/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def get_current_user_info():


def get_user_info(current_session, username):
user = get_user(current_session, username.lower())
user = get_user(current_session, username)
if user.is_admin:
role = "admin"
else:
Expand Down Expand Up @@ -106,15 +106,16 @@ def get_user_info(current_session, username):

# User SAs are stored in db with client_id = None
primary_service_account = (
get_service_account(client_id=None, user_id=user.id, username=user.username)
get_service_account(client_id=None, user_id=user.id, username=user.username.lower())
or {}
)
primary_service_account_email = getattr(primary_service_account, "email", None)
info["primary_google_service_account"] = primary_service_account_email

if hasattr(flask.current_app, "arborist"):
try:
auth_mapping = flask.current_app.arborist.auth_mapping(user.username)
normalized_username = user.username.lower()
auth_mapping = flask.current_app.arborist.auth_mapping(normalized_username)
resources = list(auth_mapping.keys())
except ArboristError as exc:
logger.error(
Expand Down

0 comments on commit d638742

Please sign in to comment.