refactor: resolve conflict and match MFA codes with vue query by seungyeoneeee · Pull Request #6132 · cloudforet-io/console

seungyeoneeee · 2025-08-14T00:44:25Z

Skip Review (optional)

Minor changes that don't affect the functionality (e.g. style, chore, ci, test, docs)
Previously reviewed in feature branch, further review is not mandatory
Self-merge allowed for solo developers or urgent changes

Description (optional)

Things to Talk About (optional)

Signed-off-by: 이승연 <sylee1274@mz.co.kr>

vercel · 2025-08-14T00:44:30Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

3 Skipped Deployments

Project	Deployment	Preview	Updated (UTC)
console	⬜️ Ignored	Preview	Aug 14, 2025 1:08am
mfa-saas-qa	⬜️ Ignored		Aug 14, 2025 1:08am
web-storybook	⬜️ Ignored		Aug 14, 2025 1:08am

github-actions · 2025-08-14T00:44:37Z

🎉 @yuda110 has been randomly selected as the reviewer! Please review. 🙏

Copilot

Pull Request Overview

This PR refactors the multi-factor authentication (MFA) system to use Vue Query and resolves conflicts around MFA code matching. The main changes include replacing traditional API calls with Vue Query patterns, updating MFA modal components, and adding new functionality for MFA enforcement in user management.

Replaced manual API calls with Vue Query mutations and queries for MFA operations
Refactored MFA modal components to use a more modular approach with separate enable/disable modals
Added MFA enforcement functionality in user management with bulk operations support

Reviewed Changes

Copilot reviewed 72 out of 73 changed files in this pull request and generated 7 comments.

Show a summary per file

File	Description
packages/mirinae/src/controls/select-card/PSelectCard.vue	Added readonly prop and styling to support disabled selection cards
packages/language-pack/*.json	Added new translation keys for MFA enforcement and user management features
packages/core-lib/src/space-connector/	Removed service configuration features and added token removal methods
apps/web/src/store/user/	Updated user store types to support required actions and MFA enforcement
apps/web/src/services/my-page/	Refactored MFA components to use Vue Query and modular modal approach
apps/web/src/services/iam/	Added bulk MFA setting functionality with new modal components
apps/web/src/services/auth/	Added MFA setup page for enforced authentication flow
apps/web/src/common/components/mfa/	Created reusable MFA components with Vue Query integration
apps/web/src/api-clients/identity/	Updated API schemas to support MFA enforcement parameters

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

Copilot · 2025-08-14T00:45:48Z

apps/web/src/services/my-page/pages/UserAccountPage.vue

                passwordFormState.invalidText = '';
                passwordFormState.passwordCheckModalVisible = false;
-                showSuccessMessage(i18n.t('COMMON.PROFILE.SUCCESS_PASSWORD_CHECK'));
+                showSuccessMessage(i18n.t('COMMON.PROFILE.SUCCESS_PASSWORD_CHECK'), '');


The showSuccessMessage function is being called with an empty string as the second argument. This pattern is inconsistent and the empty string parameter should either be removed or properly documented if it serves a specific purpose.

Suggested change

showSuccessMessage(i18n.t('COMMON.PROFILE.SUCCESS_PASSWORD_CHECK'), '');

showSuccessMessage(i18n.t('COMMON.PROFILE.SUCCESS_PASSWORD_CHECK'));

Copilot · 2025-08-14T00:45:48Z

apps/web/src/services/my-page/pages/UserAccountPage.vue

            passwordFormState.invalidText = '';
            passwordFormState.passwordCheckModalVisible = false;
-            showSuccessMessage(i18n.t('COMMON.PROFILE.SUCCESS_PASSWORD_CHECK'));
+            showSuccessMessage(i18n.t('COMMON.PROFILE.SUCCESS_PASSWORD_CHECK'), '');


Same issue as above - inconsistent use of showSuccessMessage with empty string parameter.

Suggested change

showSuccessMessage(i18n.t('COMMON.PROFILE.SUCCESS_PASSWORD_CHECK'), '');

showSuccessMessage(i18n.t('COMMON.PROFILE.SUCCESS_PASSWORD_CHECK'));

Copilot · 2025-08-14T00:45:49Z

apps/web/src/services/my-page/components/mfa/UserAccountMultiFactorAuthOTPEnableModal.vue

+/* API */
+const { mutateAsync: confirmMfa, isPending: isConfirmingMfa } = useUserProfileConfirmMfaMutation({
+    onSuccess: (data: UserModel) => {
+        showSuccessMessage(i18n.t('COMMON.MFA_MODAL.ALT_S_ENABLED'), '');


Inconsistent use of showSuccessMessage with empty string parameter.

Suggested change

showSuccessMessage(i18n.t('COMMON.MFA_MODAL.ALT_S_ENABLED'), '');

showSuccessMessage(i18n.t('COMMON.MFA_MODAL.ALT_S_ENABLED'));

Copilot · 2025-08-14T00:45:49Z

apps/web/src/services/iam/components/UserManagementTable.vue

            </template>
            <template #col-tags-format="{value}">
-                <template v-if="value && !!Object.keys(value).length">
+                <template v-if="value && typeof value === 'object' && !!Object.keys(value).length">


The type check 'typeof value === 'object'' should also exclude null since typeof null === 'object' in JavaScript. Consider using 'value && typeof value === 'object' && value !== null' or a more specific check.

Suggested change

<template v-if="value && typeof value === 'object' && !!Object.keys(value).length">

<template v-if="value && typeof value === 'object' && value !== null && !!Object.keys(value).length">

Copilot · 2025-08-14T00:45:49Z

apps/web/src/services/iam/components/UserManagementTab.vue

                    </template>
                    <template #col-tags-format="{value}">
-                        <template v-if="value !== undefined && Object.keys(value).length > 0">
+                        <template v-if="value && typeof value === 'object' && Object.keys(value).length > 0">


Same issue as above - the type check should exclude null since typeof null === 'object' in JavaScript.

Suggested change

<template v-if="value && typeof value === 'object' && Object.keys(value).length > 0">

<template v-if="value && typeof value === 'object' && value !== null && Object.keys(value).length > 0">

Copilot · 2025-08-14T00:45:49Z

apps/web/src/services/iam/components/UserManagementFormPasswordForm.vue

-        if (!oneNumberValidator(value)) return i18n.t('IDENTITY.USER.FORM.ONE_NUMBER_INVALID');
+        const passwordRegex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{8,}$/;
+
+        if (!passwordRegex.test(value)) {


The password validation regex is duplicated in multiple files (UserManagementAddPassword.vue and UserManagementFormPasswordForm.vue). Consider extracting this to a shared constant or utility function to maintain consistency and avoid duplication.

Suggested change

if (!passwordRegex.test(value)) {

if (!PASSWORD_REGEX.test(value)) {

Copilot · 2025-08-14T00:45:50Z

apps/web/src/services/iam/components/UserManagementAddPassword.vue

+}, {
+    password(value: string) {
+        if (value === '') return '';
+        const passwordRegex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{8,}$/;


This password validation regex is duplicated from UserManagementFormPasswordForm.vue. Consider extracting to a shared utility.

Suggested change

const passwordRegex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{8,}$/;

Signed-off-by: 이승연 <sylee1274@mz.co.kr>

…#6132)" This reverts commit 5299a2a.

seungyeoneeee added 3 commits August 14, 2025 09:42

fix: resolve conflicts (merge develop into feature-query-integration)

4ec20e3

Signed-off-by: 이승연 <sylee1274@mz.co.kr>

refactor: fix MFA related codes as vue query updated

5af3762

Signed-off-by: 이승연 <sylee1274@mz.co.kr>

fix: bug of reactivity about user update form

9061d83

Signed-off-by: 이승연 <sylee1274@mz.co.kr>

seungyeoneeee requested review from Copilot, skdud4659 and sulmoJ August 14, 2025 00:44

github-actions bot added the pass/signedoff label Aug 14, 2025

github-actions bot requested a review from yuda110 August 14, 2025 00:44

Copilot AI reviewed Aug 14, 2025

View reviewed changes

seungyeoneeee removed the request for review from yuda110 August 14, 2025 00:48

fix: table selection sync issues after user update

f0a070b

Signed-off-by: 이승연 <sylee1274@mz.co.kr>

sulmoJ approved these changes Aug 14, 2025

View reviewed changes

skdud4659 approved these changes Aug 14, 2025

View reviewed changes

seungyeoneeee merged commit 5299a2a into cloudforet-io:feature-query-integration Aug 14, 2025
5 of 7 checks passed

sulmoJ added a commit that referenced this pull request Aug 14, 2025

Revert "refactor: resolve conflict and match MFA codes with vue query (…

f01ebf5

…#6132)" This reverts commit 5299a2a.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: resolve conflict and match MFA codes with vue query#6132

refactor: resolve conflict and match MFA codes with vue query#6132
seungyeoneeee merged 4 commits intocloudforet-io:feature-query-integrationfrom
seungyeoneeee:feature/user-conflict-fix

seungyeoneeee commented Aug 14, 2025

Uh oh!

vercel bot commented Aug 14, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Aug 14, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Aug 14, 2025

Uh oh!

Copilot AI Aug 14, 2025

Uh oh!

Copilot AI Aug 14, 2025

Uh oh!

Copilot AI Aug 14, 2025

Uh oh!

Copilot AI Aug 14, 2025

Uh oh!

Copilot AI Aug 14, 2025

Uh oh!

Copilot AI Aug 14, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	showSuccessMessage(i18n.t('COMMON.PROFILE.SUCCESS_PASSWORD_CHECK'), '');
	showSuccessMessage(i18n.t('COMMON.PROFILE.SUCCESS_PASSWORD_CHECK'));

	showSuccessMessage(i18n.t('COMMON.MFA_MODAL.ALT_S_ENABLED'), '');
	showSuccessMessage(i18n.t('COMMON.MFA_MODAL.ALT_S_ENABLED'));

	<template v-if="value && typeof value === 'object' && !!Object.keys(value).length">
	<template v-if="value && typeof value === 'object' && value !== null && !!Object.keys(value).length">

	if (!passwordRegex.test(value)) {
	if (!PASSWORD_REGEX.test(value)) {

Conversation

seungyeoneeee commented Aug 14, 2025

Skip Review (optional)

Description (optional)

Things to Talk About (optional)

Uh oh!

vercel bot commented Aug 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Aug 14, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Aug 14, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 14, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 14, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 14, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 14, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 14, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Aug 14, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

vercel bot commented Aug 14, 2025 •

edited

Loading