replace method call

apps/app/src/server/routes/apiv3/app-settings.js

@@ -473,11 +473,11 @@ module.exports = (crowi) => {
       envGcsUploadNamespace: configManager.getConfig('gcs:uploadNamespace', ConfigSource.env),
 
       azureUseOnlyEnvVars: configManager.getConfig('crowi', 'azure:useOnlyEnvVarsForSomeOptions'),
-      azureTenantId: configManager.getConfigFromDB('crowi', 'azure:tenantId'),
-      azureClientId: configManager.getConfigFromDB('crowi', 'azure:clientId'),
-      azureClientSecret: configManager.getConfigFromDB('crowi', 'azure:clientSecret'),
-      azureStorageAccountName: configManager.getConfigFromDB('crowi', 'azure:storageAccountName'),
-      azureStorageContainerName: configManager.getConfigFromDB('crowi', 'azure:storageContainerName'),
+      azureTenantId: configManager.getConfig('azure:tenantId', ConfigSource.db),
+      azureClientId: configManager.getConfig('azure:clientId', ConfigSource.db),
+      azureClientSecret: configManager.getConfig('azure:clientSecret', ConfigSource.db),
+      azureStorageAccountName: configManager.getConfig('azure:storageAccountName', ConfigSource.db),
+      azureStorageContainerName: configManager.getConfig('azure:storageContainerName', ConfigSource.db),
       azureReferenceFileWithRelayMode: configManager.getConfig('crowi', 'azure:referenceFileWithRelayMode'),
 
       envAzureTenantId: configManager.getConfig('azure:tenantId', ConfigSource.env),

apps/app/src/server/routes/apiv3/security-settings/index.js

@@ -399,25 +399,25 @@ module.exports = (crowi) => {
       samlAuth: {
         missingMandatoryConfigKeys: await crowi.passportService.getSamlMissingMandatoryConfigKeys(),
         useOnlyEnvVarsForSomeOptions: await configManager.getConfig('security:passport-saml:useOnlyEnvVarsForSomeOptions', ConfigSource.env),
-        samlEntryPoint: await configManager.getConfigFromDB('crowi', 'security:passport-saml:entryPoint'),
+        samlEntryPoint: await configManager.getConfig('security:passport-saml:entryPoint', ConfigSource.db),
         samlEnvVarEntryPoint: await configManager.getConfig('security:passport-saml:entryPoint', ConfigSource.env),
-        samlIssuer: await configManager.getConfigFromDB('crowi', 'security:passport-saml:issuer'),
+        samlIssuer: await configManager.getConfig('security:passport-saml:issuer', ConfigSource.db),
         samlEnvVarIssuer: await configManager.getConfig('security:passport-saml:issuer', ConfigSource.env),
-        samlCert: await configManager.getConfigFromDB('crowi', 'security:passport-saml:cert'),
+        samlCert: await configManager.getConfig('security:passport-saml:cert', ConfigSource.db),
         samlEnvVarCert: await configManager.getConfig('security:passport-saml:cert', ConfigSource.env),
-        samlAttrMapId: await configManager.getConfigFromDB('crowi', 'security:passport-saml:attrMapId'),
+        samlAttrMapId: await configManager.getConfig('security:passport-saml:attrMapId', ConfigSource.db),
         samlEnvVarAttrMapId: await configManager.getConfig('security:passport-saml:attrMapId', ConfigSource.env),
-        samlAttrMapUsername: await configManager.getConfigFromDB('crowi', 'security:passport-saml:attrMapUsername'),
+        samlAttrMapUsername: await configManager.getConfig('security:passport-saml:attrMapUsername', ConfigSource.db),
         samlEnvVarAttrMapUsername: await configManager.getConfig('security:passport-saml:attrMapUsername', ConfigSource.env),
-        samlAttrMapMail: await configManager.getConfigFromDB('crowi', 'security:passport-saml:attrMapMail'),
+        samlAttrMapMail: await configManager.getConfig('security:passport-saml:attrMapMail', ConfigSource.db),
         samlEnvVarAttrMapMail: await configManager.getConfig('security:passport-saml:attrMapMail', ConfigSource.env),
-        samlAttrMapFirstName: await configManager.getConfigFromDB('crowi', 'security:passport-saml:attrMapFirstName'),
+        samlAttrMapFirstName: await configManager.getConfig('security:passport-saml:attrMapFirstName', ConfigSource.db),
         samlEnvVarAttrMapFirstName: await configManager.getConfig('security:passport-saml:attrMapFirstName', ConfigSource.env),
-        samlAttrMapLastName: await configManager.getConfigFromDB('crowi', 'security:passport-saml:attrMapLastName'),
+        samlAttrMapLastName: await configManager.getConfig('security:passport-saml:attrMapLastName', ConfigSource.db),
         samlEnvVarAttrMapLastName: await configManager.getConfig('security:passport-saml:attrMapLastName', ConfigSource.env),
         isSameUsernameTreatedAsIdenticalUser: await configManager.getConfig('crowi', 'security:passport-saml:isSameUsernameTreatedAsIdenticalUser'),
         isSameEmailTreatedAsIdenticalUser: await configManager.getConfig('crowi', 'security:passport-saml:isSameEmailTreatedAsIdenticalUser'),
-        samlABLCRule: await configManager.getConfigFromDB('crowi', 'security:passport-saml:ABLCRule'),
+        samlABLCRule: await configManager.getConfig('security:passport-saml:ABLCRule', ConfigSource.db),
         samlEnvVarABLCRule: await configManager.getConfig('security:passport-saml:ABLCRule', ConfigSource.env),
       },
       oidcAuth: {
@@ -982,14 +982,14 @@ module.exports = (crowi) => {
 
       const securitySettingParams = {
         missingMandatoryConfigKeys: await crowi.passportService.getSamlMissingMandatoryConfigKeys(),
-        samlEntryPoint: await configManager.getConfigFromDB('crowi', 'security:passport-saml:entryPoint'),
-        samlIssuer: await configManager.getConfigFromDB('crowi', 'security:passport-saml:issuer'),
-        samlCert: await configManager.getConfigFromDB('crowi', 'security:passport-saml:cert'),
-        samlAttrMapId: await configManager.getConfigFromDB('crowi', 'security:passport-saml:attrMapId'),
-        samlAttrMapUsername: await configManager.getConfigFromDB('crowi', 'security:passport-saml:attrMapUsername'),
-        samlAttrMapMail: await configManager.getConfigFromDB('crowi', 'security:passport-saml:attrMapMail'),
-        samlAttrMapFirstName: await configManager.getConfigFromDB('crowi', 'security:passport-saml:attrMapFirstName'),
-        samlAttrMapLastName: await configManager.getConfigFromDB('crowi', 'security:passport-saml:attrMapLastName'),
+        samlEntryPoint: await configManager.getConfig('security:passport-saml:entryPoint', ConfigSource.db),
+        samlIssuer: await configManager.getConfig('security:passport-saml:issuer', ConfigSource.db),
+        samlCert: await configManager.getConfig('security:passport-saml:cert', ConfigSource.db),
+        samlAttrMapId: await configManager.getConfig('security:passport-saml:attrMapId', ConfigSource.db),
+        samlAttrMapUsername: await configManager.getConfig('security:passport-saml:attrMapUsername', ConfigSource.db),
+        samlAttrMapMail: await configManager.getConfig('security:passport-saml:attrMapMail', ConfigSource.db),
+        samlAttrMapFirstName: await configManager.getConfig('security:passport-saml:attrMapFirstName', ConfigSource.db),
+        samlAttrMapLastName: await configManager.getConfig('security:passport-saml:attrMapLastName', ConfigSource.db),
         isSameUsernameTreatedAsIdenticalUser: await configManager.getConfig('crowi', 'security:passport-saml:isSameUsernameTreatedAsIdenticalUser'),
         isSameEmailTreatedAsIdenticalUser: await configManager.getConfig('crowi', 'security:passport-saml:isSameEmailTreatedAsIdenticalUser'),
         samlABLCRule: await configManager.getConfig('crowi', 'security:passport-saml:ABLCRule'),