Revert "console: Fix RBAC users tab because rolcanlogin was null for frontegg users in the cloud" (#35936)

Reverts #35891 since the cloud migration is
complete

Author: leedqin

console/src/api/materialize/roles/roleDetails.ts

@@ -28,7 +28,7 @@ export function buildRoleDetailsQuery(params: RoleDetailsParameters) {
           .select(
             sql<
               string[] | null
-            >`list_agg(member_role.name ORDER BY member_role.name) FILTER (WHERE COALESCE(member_role.rolcanlogin, false) = true OR member_role.name LIKE '%@%')`.as(
+            >`list_agg(member_role.name ORDER BY member_role.name) FILTER (WHERE member_role.rolcanlogin)`.as(
               "users",
             ),
           )
@@ -44,7 +44,7 @@ export function buildRoleDetailsQuery(params: RoleDetailsParameters) {
           .select(
             sql<
               string[] | null
-            >`list_agg(member_role.name ORDER BY member_role.name) FILTER (WHERE NOT (COALESCE(member_role.rolcanlogin, false) = true OR member_role.name LIKE '%@%'))`.as(
+            >`list_agg(member_role.name ORDER BY member_role.name) FILTER (WHERE NOT member_role.rolcanlogin)`.as(
               "grantedToRoles",
             ),
           )

console/src/api/materialize/roles/roleMembers.ts

@@ -50,15 +50,11 @@ export function buildRoleMembershipQuery(filters: RoleMembershipFilters = {}) {
   }
 
   if (filters.memberType === "users") {
-    qb = qb.where(
-      sql<boolean>`(COALESCE(child.rolcanlogin, false) = true OR child.name LIKE '%@%')`,
-    );
+    qb = qb.where(sql<boolean>`child.rolcanlogin`);
   }
 
   if (filters.memberType === "roles") {
-    qb = qb.where(
-      sql<boolean>`NOT (COALESCE(child.rolcanlogin, false) = true OR child.name LIKE '%@%')`,
-    );
+    qb = qb.where(sql<boolean>`NOT child.rolcanlogin`);
   }
 
   return qb;

console/src/api/materialize/roles/rolesList.ts

@@ -23,9 +23,7 @@ export function buildRolesListQuery() {
           .innerJoin("mz_roles as member_role", "member_role.id", "rm.member")
           .select((sub) => sub.fn.count("rm.member").as("member_count"))
           .whereRef("rm.role_id", "=", "r.id")
-          .where(
-            sql<boolean>`(COALESCE(member_role.rolcanlogin, false) = true OR member_role.name LIKE '%@%')`,
-          )
+          .where(sql<boolean>`member_role.rolcanlogin`)
           .as("counts"),
       (join) => join.onTrue(),
     )
@@ -45,9 +43,7 @@ export function buildRolesListQuery() {
       sql<number>`COALESCE(owned.owned_count, 0)`.as("ownedObjectsCount"),
     ])
     .where("r.name", "not like", "mz_%")
-    .where(
-      sql<boolean>`NOT (COALESCE(r.rolcanlogin, false) = true OR r.name LIKE '%@%')`,
-    )
+    .where(sql<boolean>`NOT r.rolcanlogin`)
     .orderBy("roleName");
 }
 

console/src/api/materialize/roles/usersList.ts

@@ -44,9 +44,7 @@ export function buildUsersListQuery() {
     )
     .select(["u.id", "u.name as user_name", "roles.roles_granted"])
     .where("u.name", "not like", "mz_%")
-    .where(
-      sql<boolean>`(COALESCE(u.rolcanlogin, false) = true OR u.name LIKE '%@%')`,
-    )
+    .where(sql<boolean>`COALESCE(u.rolcanlogin, false) = true`)
     .orderBy("user_name");
 }