From fed022ed09c93e5208b2ac22168c26042bff7642 Mon Sep 17 00:00:00 2001 From: Akhil Mohan Date: Thu, 22 Feb 2024 13:09:51 +0530 Subject: [PATCH] feat: removed unused inviteSignup flag --- ...=> 20240222073748_admin-signup-control.ts} | 7 ------- backend/src/db/schemas/super-admin.ts | 1 - backend/src/db/seeds/1-user.ts | 2 +- backend/src/server/routes/v1/admin-router.ts | 3 +-- backend/src/server/routes/v3/signup-router.ts | 7 ------- .../super-admin/super-admin-service.ts | 2 +- frontend/src/hooks/api/admin/types.ts | 3 +-- frontend/src/hooks/api/serverDetails/types.ts | 3 +-- .../components/InitialStep/InitialStep.tsx | 2 +- .../admin/DashboardPage/DashboardPage.tsx | 20 ++++--------------- 10 files changed, 10 insertions(+), 40 deletions(-) rename backend/src/db/migrations/{20240205200732_invite-only.ts => 20240222073748_admin-signup-control.ts} (70%) diff --git a/backend/src/db/migrations/20240205200732_invite-only.ts b/backend/src/db/migrations/20240222073748_admin-signup-control.ts similarity index 70% rename from backend/src/db/migrations/20240205200732_invite-only.ts rename to backend/src/db/migrations/20240222073748_admin-signup-control.ts index 4bebab17f..c52f753c0 100644 --- a/backend/src/db/migrations/20240205200732_invite-only.ts +++ b/backend/src/db/migrations/20240222073748_admin-signup-control.ts @@ -6,19 +6,12 @@ export async function up(knex: Knex): Promise { const isTablePresent = await knex.schema.hasTable(TableName.SuperAdmin); if (isTablePresent) { await knex.schema.alterTable(TableName.SuperAdmin, (t) => { - t.boolean("inviteOnlySignUp").defaultTo(false); t.string("allowedSignUpDomain"); }); } } export async function down(knex: Knex): Promise { - if (await knex.schema.hasColumn(TableName.SuperAdmin, "inviteOnlySignUp")) { - await knex.schema.alterTable(TableName.SuperAdmin, (t) => { - t.dropColumn("inviteOnlySignUp"); - }); - } - if (await knex.schema.hasColumn(TableName.SuperAdmin, "allowedSignUpDomain")) { await knex.schema.alterTable(TableName.SuperAdmin, (t) => { t.dropColumn("allowedSignUpDomain"); diff --git a/backend/src/db/schemas/super-admin.ts b/backend/src/db/schemas/super-admin.ts index 707ec60e9..b4631195b 100644 --- a/backend/src/db/schemas/super-admin.ts +++ b/backend/src/db/schemas/super-admin.ts @@ -13,7 +13,6 @@ export const SuperAdminSchema = z.object({ allowSignUp: z.boolean().default(true).nullable().optional(), createdAt: z.date(), updatedAt: z.date(), - inviteOnlySignUp: z.boolean().default(false).nullable().optional(), allowedSignUpDomain: z.string().nullable().optional() }); diff --git a/backend/src/db/seeds/1-user.ts b/backend/src/db/seeds/1-user.ts index 0da9be9b1..ca0042a98 100644 --- a/backend/src/db/seeds/1-user.ts +++ b/backend/src/db/seeds/1-user.ts @@ -9,7 +9,7 @@ export async function seed(knex: Knex): Promise { await knex(TableName.Users).del(); await knex(TableName.UserEncryptionKey).del(); await knex(TableName.SuperAdmin).del(); - await knex(TableName.SuperAdmin).insert([{ initialized: true, allowSignUp: true, inviteOnlySignUp: false }]); + await knex(TableName.SuperAdmin).insert([{ initialized: true, allowSignUp: true }]); // Inserts seed entries const [user] = await knex(TableName.Users) .insert([ diff --git a/backend/src/server/routes/v1/admin-router.ts b/backend/src/server/routes/v1/admin-router.ts index 9552c10eb..2f26893d8 100644 --- a/backend/src/server/routes/v1/admin-router.ts +++ b/backend/src/server/routes/v1/admin-router.ts @@ -32,8 +32,7 @@ export const registerAdminRouter = async (server: FastifyZodProvider) => { schema: { body: z.object({ allowSignUp: z.boolean().optional(), - inviteOnlySignUp: z.boolean().optional(), - allowedSignUpDomain: z.string().optional() + allowedSignUpDomain: z.string().optional().nullable() }), response: { 200: z.object({ diff --git a/backend/src/server/routes/v3/signup-router.ts b/backend/src/server/routes/v3/signup-router.ts index ad3b3bc8f..b04b88d2f 100644 --- a/backend/src/server/routes/v3/signup-router.ts +++ b/backend/src/server/routes/v3/signup-router.ts @@ -187,13 +187,6 @@ export const registerSignupRouter = async (server: FastifyZodProvider) => { if (!userAgent) throw new Error("user agent header is required"); const appCfg = getConfig(); - const serverCfg = await getServerCfg(); - if (!serverCfg.allowSignUp) { - throw new BadRequestError({ - message: "Sign up is disabled!" - }); - } - const { user, accessToken, refreshToken } = await server.services.signup.completeAccountInvite({ ...req.body, ip: req.realIp, diff --git a/backend/src/services/super-admin/super-admin-service.ts b/backend/src/services/super-admin/super-admin-service.ts index b15d95e56..1144bd414 100644 --- a/backend/src/services/super-admin/super-admin-service.ts +++ b/backend/src/services/super-admin/super-admin-service.ts @@ -33,7 +33,7 @@ export const superAdminServiceFactory = ({ const serverCfg = await serverCfgDAL.findOne({}); if (serverCfg) return; - const newCfg = await serverCfgDAL.create({ initialized: false, allowSignUp: true, inviteOnlySignUp: false }); + const newCfg = await serverCfgDAL.create({ initialized: false, allowSignUp: true }); return newCfg; }; diff --git a/frontend/src/hooks/api/admin/types.ts b/frontend/src/hooks/api/admin/types.ts index e28e7f972..c7022a1d7 100644 --- a/frontend/src/hooks/api/admin/types.ts +++ b/frontend/src/hooks/api/admin/types.ts @@ -1,8 +1,7 @@ export type TServerConfig = { initialized: boolean; allowSignUp: boolean; - inviteOnlySignUp: boolean; - allowedSignUpDomain?: string; + allowedSignUpDomain?: string | null; isMigrationModeOn?: boolean; }; diff --git a/frontend/src/hooks/api/serverDetails/types.ts b/frontend/src/hooks/api/serverDetails/types.ts index 32cc92ae1..af7bc5b28 100644 --- a/frontend/src/hooks/api/serverDetails/types.ts +++ b/frontend/src/hooks/api/serverDetails/types.ts @@ -2,7 +2,6 @@ export type ServerStatus = { date: string; message: string; emailConfigured: boolean; - inviteOnlySignup: boolean; secretScanningConfigured: boolean redisConfigured: boolean -}; \ No newline at end of file +}; diff --git a/frontend/src/views/Login/components/InitialStep/InitialStep.tsx b/frontend/src/views/Login/components/InitialStep/InitialStep.tsx index 16541c9a0..bbef55751 100644 --- a/frontend/src/views/Login/components/InitialStep/InitialStep.tsx +++ b/frontend/src/views/Login/components/InitialStep/InitialStep.tsx @@ -226,7 +226,7 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }: {!isLoading && loginError && } - {config.allowSignUp && !config.inviteOnlySignUp ? ( + {config.allowSignUp ? (
diff --git a/frontend/src/views/admin/DashboardPage/DashboardPage.tsx b/frontend/src/views/admin/DashboardPage/DashboardPage.tsx index afaa53d87..2c7e3662a 100644 --- a/frontend/src/views/admin/DashboardPage/DashboardPage.tsx +++ b/frontend/src/views/admin/DashboardPage/DashboardPage.tsx @@ -28,21 +28,12 @@ enum TabSections { enum SignUpModes { Disabled = "disabled", - InviteOnly = "invite-only", Anyone = "anyone" } -const getSignUpMode = (isSignUpEnabled: boolean, isInviteOnly: boolean) => { - if (isSignUpEnabled) { - if (isInviteOnly) return SignUpModes.InviteOnly; - return SignUpModes.Anyone; - } - return SignUpModes.Disabled; -}; - const formSchema = z.object({ signUpMode: z.nativeEnum(SignUpModes), - allowedSignUpDomain: z.string().optional() + allowedSignUpDomain: z.string().optional().nullable() }); type TDashboardForm = z.infer; @@ -55,13 +46,12 @@ export const AdminDashboardPage = () => { control, handleSubmit, watch, - getValues, formState: { isSubmitting, isDirty } } = useForm({ resolver: zodResolver(formSchema), values: { // eslint-disable-next-line - signUpMode: getSignUpMode(config.allowSignUp, config.inviteOnlySignUp), + signUpMode: config.allowSignUp ? SignUpModes.Anyone : SignUpModes.Disabled, allowedSignUpDomain: config.allowedSignUpDomain } }); @@ -91,8 +81,7 @@ export const AdminDashboardPage = () => { const { signUpMode, allowedSignUpDomain } = formData; await updateServerConfig({ allowSignUp: signUpMode !== SignUpModes.Disabled, - inviteOnlySignUp: signUpMode === SignUpModes.InviteOnly, - allowedSignUpDomain: signUpMode === SignUpModes.Anyone ? allowedSignUpDomain : "" + allowedSignUpDomain: signUpMode === SignUpModes.Anyone ? allowedSignUpDomain : null }); createNotification({ text: "Successfully changed sign up setting.", @@ -107,7 +96,6 @@ export const AdminDashboardPage = () => { } }; - console.log(isDirty,getValues()); return (
@@ -152,7 +140,6 @@ export const AdminDashboardPage = () => { {...field} > Disabled - Invite Only Anyone @@ -177,6 +164,7 @@ export const AdminDashboardPage = () => { > } />