From e3b937cce49dd59aa7a1cffc485e2c02d42910f7 Mon Sep 17 00:00:00 2001 From: Samuele Salvatico Date: Fri, 30 Aug 2024 08:18:35 +0200 Subject: [PATCH] fix(cli): fixed delete query --- .../cli/src/commands/database/ogcio/resources-rbac.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/cli/src/commands/database/ogcio/resources-rbac.ts b/packages/cli/src/commands/database/ogcio/resources-rbac.ts index 8a4a7bdaf51..c2848b33d27 100644 --- a/packages/cli/src/commands/database/ogcio/resources-rbac.ts +++ b/packages/cli/src/commands/database/ogcio/resources-rbac.ts @@ -207,7 +207,10 @@ const createRelations = async (params: { export const cleanScopes = async (transaction: DatabaseTransactionConnection, tenantId: string) => { await cleanScopeRelations(transaction, tenantId); - const deleteQueryString = deleteQuery([sql`tenant_id = ${tenantId}`], Scopes.table); + const deleteQueryString = deleteQuery( + [sql`tenant_id = ${tenantId}`, sql`resource_id <> 'management-api'`], + Scopes.table + ); return transaction.query(deleteQueryString); }; @@ -215,7 +218,10 @@ export const cleanScopeRelations = async ( transaction: DatabaseTransactionConnection, tenantId: string ) => { - const deleteQueryString = deleteQuery([sql`tenant_id = ${tenantId}`], RolesScopes.table); + const deleteQueryString = deleteQuery( + [sql`tenant_id = ${tenantId}`, sql`scope_id <> 'management-api-all'`], + RolesScopes.table + ); return transaction.query(deleteQueryString); };