Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-02-17 22:04:19 -05:00
Code Issues Activity

feat(core): hide admin console role (#2872)

Browse source
This commit is contained in:
wangsijie 2023-01-10 11:46:41 +08:00 • committed by GitHub
parent d67de1b181
commit 14680cc556
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packages/core/src/queries/roles.ts
View file

@ -1,5 +1,5 @@
import type { CreateRole, Role } from '@logto/schemas';
import { SearchJointMode, Roles } from '@logto/schemas';
import { adminConsoleAdminRoleId, SearchJointMode, Roles } from '@logto/schemas';
import type { OmitAutoSetFields } from '@logto/shared';
import { conditionalSql, convertToIdentifiers } from '@logto/shared';
import type { CommonQueryMethods } from 'slonik';
@ -21,7 +21,7 @@ const buildRoleConditions = (search: Search) => {
return conditionalSql(
hasSearch,
() => sql`where ${buildConditionsFromSearch(search, searchFields)}`
() => sql`and ${buildConditionsFromSearch(search, searchFields)}`
);
};
@ -32,17 +32,16 @@ export const createRolesQueries = (pool: CommonQueryMethods) => {
pool.one<{ count: number }>(sql`
select count(*)
from ${table}
where ${fields.id}<>${adminConsoleAdminRoleId}
${buildRoleConditions(search)}
`);
const findRoles = async (search: Search, limit?: number, offset?: number) =>
pool.any<Role>(
sql`
select ${sql.join(
Object.values(fields).map((field) => sql`${table}.${field}`),
sql`,`
)}
select ${sql.join(Object.values(fields), sql`, `)}
from ${table}
where ${fields.id}<>${adminConsoleAdminRoleId}
${buildRoleConditions(search)}
${conditionalSql(limit, (value) => sql`limit ${value}`)}
${conditionalSql(offset, (value) => sql`offset ${value}`)}