Unverified Commit ea3025dd authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #17854 from mvdbeek/fix_role_query

[23.2] Fix user login when duplicate UserRoleAssociation exists
parents a8727a32 50d9d1f4
Loading
Loading
Loading
Loading
+9 −5
Original line number Diff line number Diff line
@@ -746,13 +746,17 @@ class GalaxyRBACAgent(RBACAgent):
        return self.get_private_user_role(user)

    def get_private_user_role(self, user, auto_create=False):
        stmt = select(Role).where(
        stmt = (
            select(Role)
            .where(
                and_(
                    UserRoleAssociation.user_id == user.id,
                    Role.id == UserRoleAssociation.role_id,
                    Role.type == Role.types.PRIVATE,
                )
            )
            .distinct()
        )
        role = self.sa_session.execute(stmt).scalar_one_or_none()
        if not role:
            if auto_create: