From 0e0b60ab726d1aa476e655b1c0a75116f937bfb1 Mon Sep 17 00:00:00 2001 From: yu-i-i Date: Mon, 16 Jun 2025 13:39:16 +0200 Subject: [PATCH] Avoid DEP0174 by removing async from callback-based getGroupPolicyForUser --- .../ldap/app/src/LDAPModuleManager.mjs | 20 +++++++++---------- .../oidc/app/src/OIDCModuleManager.mjs | 20 +++++++++---------- .../saml/app/src/SAMLModuleManager.mjs | 19 +++++++++--------- 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs b/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs index 846ca9b158..64afd02b0c 100644 --- a/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs +++ b/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs @@ -94,18 +94,18 @@ const LDAPModuleManager = { logger.info({}, error.message) } }, - async getGroupPolicyForUser(user, callback) { - try { - const userValidationMap = await PermissionsManager.promises.getUserValidationStatus({ - user, - groupPolicy : { 'ldapPolicy' : true }, - subscription : null - }) + + getGroupPolicyForUser(user, callback) { + PermissionsManager.promises.getUserValidationStatus({ + user, + groupPolicy : { 'ldapPolicy' : true }, + subscription : null + }).then(userValidationMap => { let groupPolicy = Object.fromEntries(userValidationMap) - callback(null, {'groupPolicy' : groupPolicy }) - } catch (error) { + callback(null, { groupPolicy }) + }).catch(error => { callback(error) - } + }) }, } diff --git a/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs b/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs index 3a2e6e2780..ec734ced19 100644 --- a/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs +++ b/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs @@ -64,18 +64,18 @@ const OIDCModuleManager = { logger.info({}, error.message) } }, - async getGroupPolicyForUser(user, callback) { - try { - const userValidationMap = await PermissionsManager.promises.getUserValidationStatus({ - user, - groupPolicy : { 'oidcPolicy' : true }, - subscription : null - }) + + getGroupPolicyForUser(user, callback) { + PermissionsManager.promises.getUserValidationStatus({ + user, + groupPolicy : { 'oidcPolicy' : true }, + subscription : null + }).then(userValidationMap => { let groupPolicy = Object.fromEntries(userValidationMap) - callback(null, {'groupPolicy' : groupPolicy }) - } catch (error) { + callback(null, { groupPolicy }) + }).catch(error => { callback(error) - } + }) }, } diff --git a/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs b/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs index 29e9ae52cd..67545f7fc9 100644 --- a/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs +++ b/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs @@ -84,18 +84,17 @@ const SAMLModuleManager = { logger.info({}, error.message) } }, - async getGroupPolicyForUser(user, callback) { - try { - const userValidationMap = await PermissionsManager.promises.getUserValidationStatus({ - user, - groupPolicy : { 'samlPolicy' : true }, - subscription : null - }) + getGroupPolicyForUser(user, callback) { + PermissionsManager.promises.getUserValidationStatus({ + user, + groupPolicy : { 'samlPolicy' : true }, + subscription : null + }).then(userValidationMap => { let groupPolicy = Object.fromEntries(userValidationMap) - callback(null, {'groupPolicy' : groupPolicy }) - } catch (error) { + callback(null, { groupPolicy }) + }).catch(error => { callback(error) - } + }) }, }