From 09c65d95a48728b180fae8e8a158a9d2ffc8106b Mon Sep 17 00:00:00 2001
From: Harikrishna Patnala <harikrishna.patnala@gmail.com>
Date: Wed, 22 Feb 2023 11:21:18 +0530
Subject: [PATCH] Change 2FA plugin related global setting names

---
 .../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 2522fefa2bd1..cb559131a3d2 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 bc7dc08772be..62a84d0d9bfe 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();