[cloudstack] branch main updated: Change 2FA plugin related global setting names (#7275)

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/main by this push:
     new a3670496ad3 Change 2FA plugin related global setting names (#7275)
a3670496ad3 is described below

commit a3670496ad393b8df280c65917b5f5413cc767ed
Author: Harikrishna <harikrishna.patn...@gmail.com>
AuthorDate: Wed Feb 22 17:03:52 2023 +0530

    Change 2FA plugin related global setting names (#7275)
---
 .../META-INF/cloudstack/core/spring-core-registry-core-context.xml    | 4 ++--
 server/src/main/java/com/cloud/user/AccountManagerImpl.java           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/core/src/main/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
 
b/core/src/main/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
index 2522fefa2bd..cb559131a3d 100644
--- 
a/core/src/main/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
+++ 
b/core/src/main/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
@@ -38,8 +38,8 @@
 
     <bean id="userTwoFactorAuthenticatorsRegistry"
           
class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
-        <property name="orderConfigKey" value="user.2fa.authenticators.order" 
/>
-        <property name="excludeKey" value="user.2fa.authenticators.exclude" />
+        <property name="orderConfigKey" value="user.2fa.providers.order" />
+        <property name="excludeKey" value="user.2fa.providers.exclude" />
         <property name="orderConfigDefault" value="totp,staticpin" />
     </bean>
 
diff --git a/server/src/main/java/com/cloud/user/AccountManagerImpl.java 
b/server/src/main/java/com/cloud/user/AccountManagerImpl.java
index bc7dc08772b..62a84d0d9bf 100644
--- a/server/src/main/java/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/main/java/com/cloud/user/AccountManagerImpl.java
@@ -360,7 +360,7 @@ public class AccountManagerImpl extends ManagerBase 
implements AccountManager, M
     static final ConfigKey<String> userTwoFactorAuthenticationDefaultProvider 
= new ConfigKey<>("Advanced", String.class,
             "user.2fa.default.provider",
             "totp",
-            "The default user two factor authentication provider plugin. Eg. 
totp, staticpin", true, ConfigKey.Scope.Domain);
+            "The default user two factor authentication provider. Eg. totp, 
staticpin", true, ConfigKey.Scope.Domain);
 
     protected AccountManagerImpl() {
         super();