feat: removed unused inviteSignup flag

Infisical · Feb 22, 2024 · fed022e · fed022e
1 parent 97d2a15
commit fed022e
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 40 deletions.
diff --git a/.../migrations/20240205200732_invite-only.ts → ...ns/20240222073748_admin-signup-control.ts b/.../migrations/20240205200732_invite-only.ts → ...ns/20240222073748_admin-signup-control.ts
@@ -6,19 +6,12 @@ export async function up(knex: Knex): Promise<void> {
   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<void> {
-  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
@@ -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
@@ -9,7 +9,7 @@ export async function seed(knex: Knex): Promise<void> {
   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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -2,7 +2,6 @@ export type ServerStatus = {
   date: string;
   message: string;
   emailConfigured: boolean;
-  inviteOnlySignup: boolean;
   secretScanningConfigured: boolean
   redisConfigured: boolean
-};
+};
diff --git 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 }:
         </Button>
       </div>
       {!isLoading && loginError && <Error text={t("login.error-login") ?? ""} />}
-      {config.allowSignUp && !config.inviteOnlySignUp ? (
+      {config.allowSignUp ? (
         <div className="mt-6 flex flex-row text-sm text-bunker-400">
           <Link href="/signup">
             <span className="cursor-pointer duration-200 hover:text-bunker-200 hover:underline hover:decoration-primary-700 hover:underline-offset-4">

diff --git 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<typeof formSchema>;
@@ -55,13 +46,12 @@ export const AdminDashboardPage = () => {
     control,
     handleSubmit,
     watch,
-    getValues,
     formState: { isSubmitting, isDirty }
   } = useForm<TDashboardForm>({
     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 (
     <div className="container mx-auto max-w-7xl px-4 pb-12 text-white dark:[color-scheme:dark]">
       <div className="mx-auto mb-6 w-full max-w-7xl pt-6">
@@ -152,7 +140,6 @@ export const AdminDashboardPage = () => {
                           {...field}
                         >
                           <SelectItem value={SignUpModes.Disabled}>Disabled</SelectItem>
-                          <SelectItem value={SignUpModes.InviteOnly}>Invite Only</SelectItem>
                           <SelectItem value={SignUpModes.Anyone}>Anyone</SelectItem>
                         </Select>
                       </FormControl>
@@ -177,6 +164,7 @@ export const AdminDashboardPage = () => {
                         >
                           <Input
                             {...field}
+                            value={field.value || ""}
                             placeholder="domain.com, domain2.com"
                             leftIcon={<FontAwesomeIcon icon={faAt} />}
                           />