From 91c9ef3068df12583d650acb77049a197fc7133d Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Fri, 25 Oct 2024 01:07:44 +0200 Subject: [PATCH] fix: Pass app config parameters to be used for hooks --- packages/backend/src/models/app-auth-client.js | 2 ++ packages/backend/src/models/app-config.js | 12 +++--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/backend/src/models/app-auth-client.js b/packages/backend/src/models/app-auth-client.js index d94e6408..90a9bda3 100644 --- a/packages/backend/src/models/app-auth-client.js +++ b/packages/backend/src/models/app-auth-client.js @@ -66,6 +66,8 @@ class AppAuthClient extends Base { // This is a workaround to update connection allowed column for AppConfig await appConfig?.$query().patch({ key: appConfig.key, + shared: appConfig.shared, + disabled: appConfig.disabled, }); } diff --git a/packages/backend/src/models/app-config.js b/packages/backend/src/models/app-config.js index 2511f437..1a9176b9 100644 --- a/packages/backend/src/models/app-config.js +++ b/packages/backend/src/models/app-config.js @@ -47,21 +47,15 @@ class AppConfig extends Base { } async computeConnectionAllowedProperty() { - const refetchedRecord = await AppConfig.query().findOne({ key: this.key }); - - if (!refetchedRecord) return; - - const appAuthClients = await refetchedRecord.$relatedQuery( - 'appAuthClients' - ); + const appAuthClients = await this.$relatedQuery('appAuthClients'); const hasSomeActiveAppAuthClients = appAuthClients?.some((appAuthClient) => appAuthClient.active) || false; const conditions = [ hasSomeActiveAppAuthClients, - refetchedRecord.shared, - !refetchedRecord.disabled, + this.shared, + !this.disabled, ]; const connectionAllowed = conditions.every(Boolean);