This is an automated email from the ASF dual-hosted git repository. harikrishna pushed a commit to branch 2FA in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 8681050b31cc9d88b719ec1973547c725becdf14 Author: Harikrishna Patnala <[email protected]> AuthorDate: Tue Nov 8 13:15:14 2022 +0530 Added user context while setting 2fa --- server/src/main/java/com/cloud/user/AccountManagerImpl.java | 3 ++- ui/src/config/router.js | 2 +- ui/src/views/dashboard/TwoFa.vue | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/com/cloud/user/AccountManagerImpl.java b/server/src/main/java/com/cloud/user/AccountManagerImpl.java index 40cd5a8d7fb..980d77628e4 100644 --- a/server/src/main/java/com/cloud/user/AccountManagerImpl.java +++ b/server/src/main/java/com/cloud/user/AccountManagerImpl.java @@ -3233,7 +3233,8 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M } owner = _accountService.getActiveAccountById(userId); } else { - userVO = _userDao.findById(caller.getId()); + userId = CallContext.current().getCallingUserId(); + userVO = _userDao.findById(userId); } checkAccess(caller, null, true, owner); diff --git a/ui/src/config/router.js b/ui/src/config/router.js index e720d9ccbe1..349e5da7d71 100644 --- a/ui/src/config/router.js +++ b/ui/src/config/router.js @@ -311,7 +311,7 @@ export const constantRouterMap = [ path: '/2FA', name: 'TwoFa', meta: { - title: 'label.2fa', + title: 'label.two.factor.authentication', hidden: true }, component: () => import('@/views/dashboard/TwoFa') diff --git a/ui/src/views/dashboard/TwoFa.vue b/ui/src/views/dashboard/TwoFa.vue index 8d9eb5cb6e1..9487ffc33da 100644 --- a/ui/src/views/dashboard/TwoFa.vue +++ b/ui/src/views/dashboard/TwoFa.vue @@ -16,7 +16,6 @@ // under the License. <template> - <!-- <a-card class="center-align" style="width: 600px; height: 720px"> --> <a-form> <img v-if="$config.banner"
