From d789ba3ffacbe4fe3f298e84da056ca6a93dbea5 Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Wed, 23 Jul 2025 20:46:48 -0700
Subject: [PATCH] refactor: rename MFA enabled field to is_enabled

---
 apps/client/src/ee/mfa/components/mfa-settings.tsx        | 2 +-
 apps/client/src/ee/mfa/types/mfa.types.ts                 | 6 +++---
 apps/server/src/core/auth/services/auth.service.ts        | 2 +-
 .../server/src/database/migrations/20250715T070817-mfa.ts | 8 +++-----
 apps/server/src/database/repos/user/user.repo.ts          | 2 +-
 apps/server/src/database/types/db.d.ts                    | 2 +-
 apps/server/src/ee                                        | 2 +-
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/apps/client/src/ee/mfa/components/mfa-settings.tsx b/apps/client/src/ee/mfa/components/mfa-settings.tsx
index 50eaddea..beab11a0 100644
--- a/apps/client/src/ee/mfa/components/mfa-settings.tsx
+++ b/apps/client/src/ee/mfa/components/mfa-settings.tsx
@@ -25,7 +25,7 @@ export function MfaSettings() {
   }
 
   // Check if MFA is truly enabled
-  const isMfaEnabled = mfaStatus?.enabled === true;
+  const isMfaEnabled = mfaStatus?.isEnabled === true;
 
   const handleSetupComplete = () => {
     setSetupModalOpen(false);
diff --git a/apps/client/src/ee/mfa/types/mfa.types.ts b/apps/client/src/ee/mfa/types/mfa.types.ts
index 0b92080f..ac032195 100644
--- a/apps/client/src/ee/mfa/types/mfa.types.ts
+++ b/apps/client/src/ee/mfa/types/mfa.types.ts
@@ -1,10 +1,10 @@
 export interface MfaMethod {
   type: 'totp' | 'email';
-  enabled: boolean;
+  isEnabled: boolean;
 }
 
 export interface MfaSettings {
-  enabled: boolean;
+  isEnabled: boolean;
   methods: MfaMethod[];
   backupCodesCount: number;
   lastUpdated?: string;
@@ -19,7 +19,7 @@ export interface MfaSetupState {
 }
 
 export interface MfaStatusResponse {
-  enabled?: boolean;
+  isEnabled?: boolean;
   method?: string | null;
   backupCodesCount?: number;
 }
diff --git a/apps/server/src/core/auth/services/auth.service.ts b/apps/server/src/core/auth/services/auth.service.ts
index 46eabd95..72ffc521 100644
--- a/apps/server/src/core/auth/services/auth.service.ts
+++ b/apps/server/src/core/auth/services/auth.service.ts
@@ -207,7 +207,7 @@ export class AuthService {
     });
 
     // Check if user has MFA enabled or workspace enforces MFA
-    const userHasMfa = user?.['mfa']?.enabled || false;
+    const userHasMfa = user?.['mfa']?.isEnabled || false;
     const workspaceEnforcesMfa = workspace.enforceMfa || false;
 
     if (userHasMfa || workspaceEnforcesMfa) {
diff --git a/apps/server/src/database/migrations/20250715T070817-mfa.ts b/apps/server/src/database/migrations/20250715T070817-mfa.ts
index 06c15863..8aa6a92c 100644
--- a/apps/server/src/database/migrations/20250715T070817-mfa.ts
+++ b/apps/server/src/database/migrations/20250715T070817-mfa.ts
@@ -9,11 +9,9 @@ export async function up(db: Kysely<any>): Promise<void> {
     .addColumn('user_id', 'uuid', (col) =>
       col.references('users.id').onDelete('cascade').notNull(),
     )
-    .addColumn('method', 'varchar(50)', (col) =>
-      col.notNull().defaultTo('totp'),
-    )
-    .addColumn('secret', 'varchar(255)', (col) => col)
-    .addColumn('enabled', 'boolean', (col) => col.defaultTo(false))
+    .addColumn('method', 'varchar', (col) => col.notNull().defaultTo('totp'))
+    .addColumn('secret', 'text', (col) => col)
+    .addColumn('is_enabled', 'boolean', (col) => col.defaultTo(false))
     .addColumn('backup_codes', sql`text[]`, (col) => col)
     .addColumn('workspace_id', 'uuid', (col) =>
       col.references('workspaces.id').onDelete('cascade').notNull(),
diff --git a/apps/server/src/database/repos/user/user.repo.ts b/apps/server/src/database/repos/user/user.repo.ts
index f263f79b..190670e3 100644
--- a/apps/server/src/database/repos/user/user.repo.ts
+++ b/apps/server/src/database/repos/user/user.repo.ts
@@ -190,7 +190,7 @@ export class UserRepo {
         .select([
           'userMfa.id',
           'userMfa.method',
-          'userMfa.enabled',
+          'userMfa.isEnabled',
           'userMfa.createdAt',
         ])
         .whereRef('userMfa.userId', '=', 'users.id'),
diff --git a/apps/server/src/database/types/db.d.ts b/apps/server/src/database/types/db.d.ts
index 9703e8ec..1d2051d4 100644
--- a/apps/server/src/database/types/db.d.ts
+++ b/apps/server/src/database/types/db.d.ts
@@ -250,8 +250,8 @@ export interface Spaces {
 export interface UserMfa {
   backupCodes: string[] | null;
   createdAt: Generated<Timestamp>;
-  enabled: Generated<boolean | null>;
   id: Generated<string>;
+  isEnabled: Generated<boolean | null>;
   method: Generated<string>;
   secret: string | null;
   updatedAt: Generated<Timestamp>;
diff --git a/apps/server/src/ee b/apps/server/src/ee
index f60ab136..c889c880 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit f60ab136986cf4801e0baa43d8553655f3f2947d
+Subproject commit c889c880019a24094543b9caadc566114b235ddf