From 9fc9a74f26a9646e4e293b8277b692384818b9a6 Mon Sep 17 00:00:00 2001 From: Philipinho <16838612+Philipinho@users.noreply.github.com> Date: Sun, 31 Aug 2025 12:28:21 -0700 Subject: [PATCH] rename column --- .../src/ee/security/components/sso-oidc-form.tsx | 12 ++++++------ .../src/ee/security/components/sso-saml-form.tsx | 12 ++++++------ apps/client/src/ee/security/types/security.types.ts | 2 +- ...50831T191600-add-group-sync-to-auth-providers.ts} | 8 +++----- apps/server/src/database/types/db.d.ts | 2 +- 5 files changed, 17 insertions(+), 19 deletions(-) rename apps/server/src/database/migrations/{20250710T120000-add-group-sync-to-auth-providers.ts => 20250831T191600-add-group-sync-to-auth-providers.ts} (67%) diff --git a/apps/client/src/ee/security/components/sso-oidc-form.tsx b/apps/client/src/ee/security/components/sso-oidc-form.tsx index 9e470388..aa9e653c 100644 --- a/apps/client/src/ee/security/components/sso-oidc-form.tsx +++ b/apps/client/src/ee/security/components/sso-oidc-form.tsx @@ -16,7 +16,7 @@ const ssoSchema = z.object({ oidcClientSecret: z.string().min(1, "Client secret is required"), isEnabled: z.boolean(), allowSignup: z.boolean(), - isGroupSyncEnabled: z.boolean(), + groupSync: z.boolean(), }); type SSOFormValues = z.infer; @@ -37,7 +37,7 @@ export function SsoOIDCForm({ provider, onClose }: SsoFormProps) { oidcClientSecret: provider.oidcClientSecret || "", isEnabled: provider.isEnabled, allowSignup: provider.allowSignup, - isGroupSyncEnabled: provider.isGroupSyncEnabled || false, + groupSync: provider.groupSync || false, }, validate: zodResolver(ssoSchema), }); @@ -69,8 +69,8 @@ export function SsoOIDCForm({ provider, onClose }: SsoFormProps) { if (form.isDirty("allowSignup")) { ssoData.allowSignup = values.allowSignup; } - if (form.isDirty("isGroupSyncEnabled")) { - ssoData.isGroupSyncEnabled = values.isGroupSyncEnabled; + if (form.isDirty("groupSync")) { + ssoData.groupSync = values.groupSync; } await updateSsoProviderMutation.mutateAsync(ssoData); @@ -128,8 +128,8 @@ export function SsoOIDCForm({ provider, onClose }: SsoFormProps) {
{t("Group sync")}
diff --git a/apps/client/src/ee/security/components/sso-saml-form.tsx b/apps/client/src/ee/security/components/sso-saml-form.tsx index 5a7ba9f8..1046a2f4 100644 --- a/apps/client/src/ee/security/components/sso-saml-form.tsx +++ b/apps/client/src/ee/security/components/sso-saml-form.tsx @@ -26,7 +26,7 @@ const ssoSchema = z.object({ samlCertificate: z.string().min(1, "SAML Idp Certificate is required"), isEnabled: z.boolean(), allowSignup: z.boolean(), - isGroupSyncEnabled: z.boolean(), + groupSync: z.boolean(), }); type SSOFormValues = z.infer; @@ -46,7 +46,7 @@ export function SsoSamlForm({ provider, onClose }: SsoFormProps) { samlCertificate: provider.samlCertificate || "", isEnabled: provider.isEnabled, allowSignup: provider.allowSignup, - isGroupSyncEnabled: provider.isGroupSyncEnabled || false, + groupSync: provider.groupSync || false, }, validate: zodResolver(ssoSchema), }); @@ -77,8 +77,8 @@ export function SsoSamlForm({ provider, onClose }: SsoFormProps) { if (form.isDirty("allowSignup")) { ssoData.allowSignup = values.allowSignup; } - if (form.isDirty("isGroupSyncEnabled")) { - ssoData.isGroupSyncEnabled = values.isGroupSyncEnabled; + if (form.isDirty("groupSync")) { + ssoData.groupSync = values.groupSync; } await updateSsoProviderMutation.mutateAsync(ssoData); @@ -141,8 +141,8 @@ export function SsoSamlForm({ provider, onClose }: SsoFormProps) {
{t("Group sync")}
diff --git a/apps/client/src/ee/security/types/security.types.ts b/apps/client/src/ee/security/types/security.types.ts index c676ce2e..7f8156c5 100644 --- a/apps/client/src/ee/security/types/security.types.ts +++ b/apps/client/src/ee/security/types/security.types.ts @@ -11,7 +11,7 @@ export interface IAuthProvider { oidcClientSecret: string; allowSignup: boolean; isEnabled: boolean; - isGroupSyncEnabled: boolean; + groupSync: boolean; creatorId: string; workspaceId: string; createdAt: Date; diff --git a/apps/server/src/database/migrations/20250710T120000-add-group-sync-to-auth-providers.ts b/apps/server/src/database/migrations/20250831T191600-add-group-sync-to-auth-providers.ts similarity index 67% rename from apps/server/src/database/migrations/20250710T120000-add-group-sync-to-auth-providers.ts rename to apps/server/src/database/migrations/20250831T191600-add-group-sync-to-auth-providers.ts index 2f06989f..43e11ae4 100644 --- a/apps/server/src/database/migrations/20250710T120000-add-group-sync-to-auth-providers.ts +++ b/apps/server/src/database/migrations/20250831T191600-add-group-sync-to-auth-providers.ts @@ -3,15 +3,13 @@ import { type Kysely } from 'kysely'; export async function up(db: Kysely): Promise { await db.schema .alterTable('auth_providers') - .addColumn('is_group_sync_enabled', 'boolean', (col) => - col.defaultTo(false).notNull(), - ) + .addColumn('group_sync', 'boolean', (col) => col.defaultTo(false).notNull()) .execute(); } export async function down(db: Kysely): Promise { await db.schema .alterTable('auth_providers') - .dropColumn('is_group_sync_enabled') + .dropColumn('group_sync')// enable_group_sync .execute(); -} \ No newline at end of file +} diff --git a/apps/server/src/database/types/db.d.ts b/apps/server/src/database/types/db.d.ts index 7411e6b7..ab0fa898 100644 --- a/apps/server/src/database/types/db.d.ts +++ b/apps/server/src/database/types/db.d.ts @@ -62,7 +62,7 @@ export interface AuthProviders { deletedAt: Timestamp | null; id: Generated; isEnabled: Generated; - isGroupSyncEnabled: Generated; + groupSync: Generated; name: string; oidcClientId: string | null; oidcClientSecret: string | null;