Revert "refactor: resolve conflict and match MFA codes with vue query (#6132)"

This reverts commit 5299a2a.

Author: sulmoJ

.github/workflows/dispatch_storybook_release.yaml

@@ -48,7 +48,7 @@ jobs:
           aws-region: ap-northeast-2
 
       - name: Deploy to s3
-        run: aws s3 sync apps/mirinae-storybook/storybook-static/ s3://${{ secrets.STORYBOOK_S3_BUCKET }} --delete
+        run: aws s3 sync apps/storybook/storybook-static/ s3://${{ secrets.STORYBOOK_S3_BUCKET }} --delete
 
       - name: Invalidate CloudFront Cache
         run: aws cloudfront create-invalidation --distribution-id ${{ secrets.CDN_DISTRIBUTION_ID }} --paths "/*"

apps/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web",
-  "version": "2.0.0-dev378",
+  "version": "2.0.0-dev377",
   "private": true,
   "description": "Cloudforet Console Web Application",
   "author": "Cloudforet",

apps/web/src/api-clients/identity/user-profile/composables/use-user-profile-api.ts

@@ -1,16 +1,16 @@
 import { SpaceConnector } from '@cloudforet/core-lib/space-connector';
 
+import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list';
 import type { UserProfileConfirmEmailParameters } from '@/api-clients/identity/user-profile/schema/api-verbs/confirm-email';
 import type { UserProfileConfirmMfaParameters } from '@/api-clients/identity/user-profile/schema/api-verbs/confirm-mfa';
-import type { UserProfileDisableMfaParameters } from '@/api-clients/identity/user-profile/schema/api-verbs/disable-mfa';
 import type { UserProfileEnableMfaParameters } from '@/api-clients/identity/user-profile/schema/api-verbs/enable-mfa';
 import type { UserProfileGetWorkspacesParameters } from '@/api-clients/identity/user-profile/schema/api-verbs/get-workspaces';
 import type { UserProfileResetPasswordParameters } from '@/api-clients/identity/user-profile/schema/api-verbs/reset-password';
 import type { UserProfileUpdateParameters } from '@/api-clients/identity/user-profile/schema/api-verbs/update';
 import type { UserProfileUpdatePasswordParameters } from '@/api-clients/identity/user-profile/schema/api-verbs/update-password';
 import type { UserProfileVerifyEmailParameters } from '@/api-clients/identity/user-profile/schema/api-verbs/verify-email';
-import type { UserModel } from '@/api-clients/identity/user/schema/model';
-
+import type { WorkspaceGroupModel } from '@/api-clients/identity/workspace-group/schema/model';
+import type { WorkspaceModel } from '@/api-clients/identity/workspace/schema/model';
 
 
 export const useUserProfileApi = () => {
@@ -19,11 +19,12 @@ export const useUserProfileApi = () => {
         updatePassword: SpaceConnector.clientV2.identity.userProfile.updatePassword<UserProfileUpdatePasswordParameters, any>,
         resetPassword: SpaceConnector.clientV2.identity.userProfile.resetPassword<UserProfileResetPasswordParameters, any>,
         verifyEmail: SpaceConnector.clientV2.identity.userProfile.verifyEmail<UserProfileVerifyEmailParameters, any>,
-        confirmEmail: SpaceConnector.clientV2.identity.userProfile.confirmEmail<UserProfileConfirmEmailParameters, UserModel>,
-        disableMfa: SpaceConnector.clientV2.identity.userProfile.disableMfa<UserProfileDisableMfaParameters, UserModel>,
-        enableMfa: SpaceConnector.clientV2.identity.userProfile.enableMfa<UserProfileEnableMfaParameters, UserModel>,
-        confirmMfa: SpaceConnector.clientV2.identity.userProfile.confirmMfa<UserProfileConfirmMfaParameters, UserModel>,
-        getWorkspaces: SpaceConnector.clientV2.identity.userProfile.getWorkspaces<UserProfileGetWorkspacesParameters, any>,
+        confirmEmail: SpaceConnector.clientV2.identity.userProfile.confirmEmail<UserProfileConfirmEmailParameters, any>,
+        enableMfa: SpaceConnector.clientV2.identity.userProfile.enableMfa<UserProfileEnableMfaParameters, any>,
+        confirmMfa: SpaceConnector.clientV2.identity.userProfile.confirmMfa<UserProfileConfirmMfaParameters, any>,
+        getWorkspaces: SpaceConnector.clientV2.identity.userProfile.getWorkspaces<UserProfileGetWorkspacesParameters, ListResponse<WorkspaceModel>>,
+        getWorkspaceGroups: SpaceConnector.clientV2.identity.userProfile.getWorkspaceGroups<undefined, ListResponse<WorkspaceGroupModel>>,
+
     };
 
     return {

apps/web/src/api-clients/identity/user-profile/schema/api-verbs/disable-mfa.ts

@@ -2,8 +2,3 @@ export const MULTI_FACTOR_AUTH_TYPE = {
     OTP: 'OTP',
     EMAIL: 'EMAIL',
 } as const;
-
-export const MFA_STATE = {
-    ENABLED: 'ENABLED',
-    DISABLED: 'DISABLED',
-} as const;

apps/web/src/api-clients/identity/user-profile/schema/constant.ts

@@ -1,4 +1,3 @@
-import type { MFA_STATE, MULTI_FACTOR_AUTH_TYPE } from '@/api-clients/identity/user-profile/schema/constant';
+import type { MULTI_FACTOR_AUTH_TYPE } from '@/api-clients/identity/user-profile/schema/constant';
 
 export type MultiFactorAuthType = typeof MULTI_FACTOR_AUTH_TYPE[keyof typeof MULTI_FACTOR_AUTH_TYPE];
-export type MfaState = typeof MFA_STATE[keyof typeof MFA_STATE];

apps/web/src/api-clients/identity/user-profile/schema/type.ts

@@ -1,5 +1,4 @@
 import type { Tags } from '@/api-clients/_common/schema/model';
-import type { MfaState, MultiFactorAuthType } from '@/api-clients/identity/user-profile/schema/type';
 import type { AuthType } from '@/api-clients/identity/user/schema/type';
 
 
@@ -13,6 +12,4 @@ export interface UserCreateParameters {
     timezone?: string;
     tags?: Tags;
     reset_password?: boolean;
-    enforce_mfa_state?: MfaState;
-    enforce_mfa_type?: MultiFactorAuthType; // only when enforce_mfa_state is ENABLED, this field is required
 }

apps/web/src/api-clients/identity/user/schema/api-verbs/create.ts

@@ -1,5 +1,4 @@
 import type { Tags } from '@/api-clients/_common/schema/model';
-import type { MfaState, MultiFactorAuthType } from '@/api-clients/identity/user-profile/schema/type';
 
 
 export interface UserUpdateParameters {
@@ -11,6 +10,4 @@ export interface UserUpdateParameters {
     timezone?: string;
     tags?: Tags;
     reset_password?: boolean;
-    enforce_mfa_state?: MfaState;
-    enforce_mfa_type?: MultiFactorAuthType; // only when enforce_mfa_state is ENABLED, this field is required
 }

apps/web/src/api-clients/identity/user/schema/api-verbs/update.ts

@@ -14,7 +14,7 @@ export interface UserModel {
     auth_type: AuthType; // backend
     role_type: RoleType;
     role_id?: string;
-    mfa?: UserMfa;
+    mfa: UserMfa;
     language: string;
     timezone: string;
     api_key_count: number;
@@ -26,13 +26,11 @@ export interface UserModel {
 }
 
 export interface UserMfa {
-    state?: UserMfaState,
-    mfa_type?: MultiFactorAuthType,
-    options?: {
-        enforce?: boolean, // if true, mfa_type is required
+    state: UserMfaState,
+    mfa_type: MultiFactorAuthType,
+    options: {
         email?: string,
         user_secret_id?: string,
-        otp_qrcode_uri?: string, // response from 'enable-mfa' verb only
     }
 }
 

apps/web/src/api-clients/identity/user/schema/model.ts

@@ -1,5 +1,4 @@
 import type { Tags } from '@/api-clients/_common/schema/model';
-import type { MfaState, MultiFactorAuthType } from '@/api-clients/identity/user-profile/schema/type';
 import type { AuthType } from '@/api-clients/identity/user/schema/type';
 
 export interface WorkspaceUserCreateParameters {
@@ -12,7 +11,5 @@ export interface WorkspaceUserCreateParameters {
     timezone?: string;
     tags?: Tags;
     reset_password?: boolean;
-    enforce_mfa_state?: MfaState;
-    enforce_mfa_type?: MultiFactorAuthType;
     role_id: string;
 }