awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-14 09:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update move to react hook form, rename allowedSignUpDomain

Browse Source
This commit is contained in:
Salman
2024-02-12 04:09:46 +05:30
parent 2ef8781378
commit 0fb87ab05f
9 changed files with 100 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/db/migrations/20240205200732_invite-only.ts
+3 -3
View File
@@ -7,7 +7,7 @@ export async function up(knex: Knex): Promise<void> {
if (isTablePresent) {
await knex.schema.alterTable(TableName.SuperAdmin, (t) => {
t.boolean("inviteOnlySignUp").defaultTo(false);
t.string("allowSpecificDomainSignUp");
t.string("allowedSignUpDomain");
});
}
}
@@ -19,9 +19,9 @@ export async function down(knex: Knex): Promise<void> {
});
}
if (await knex.schema.hasColumn(TableName.SuperAdmin, "allowSpecificDomainSignUp")) {
if (await knex.schema.hasColumn(TableName.SuperAdmin, "allowedSignUpDomain")) {
await knex.schema.alterTable(TableName.SuperAdmin, (t) => {
t.dropColumn("allowSpecificDomainSignUp");
t.dropColumn("allowedSignUpDomain");
});
}
}
backend/src/db/schemas/super-admin.ts
+1 -1
View File
@@ -12,7 +12,7 @@ export const SuperAdminSchema = z.object({
initialized: z.boolean().default(false).nullable().optional(),
allowSignUp: z.boolean().default(true).nullable().optional(),
inviteOnlySignUp: z.boolean().default(false).nullable().optional(),
allowSpecificDomainSignUp: z.string().nullable().optional(),
allowedSignUpDomain: z.string().nullable().optional(),
createdAt: z.date(),
updatedAt: z.date()
});
backend/src/server/routes/v1/admin-router.ts
+1 -1
View File
@@ -33,7 +33,7 @@ export const registerAdminRouter = async (server: FastifyZodProvider) => {
body: z.object({
allowSignUp: z.boolean().optional(),
inviteOnlySignUp: z.boolean().optional(),
allowSpecificDomainSignUp: z.string().optional()
allowedSignUpDomain: z.string().optional()
}),
response: {
200: z.object({
backend/src/server/routes/v3/signup-router.ts
+2 -2
View File
@@ -28,9 +28,9 @@ export const registerSignupRouter = async (server: FastifyZodProvider) => {
const { email } = req.body;
const serverCfg = await getServerCfg();
if (serverCfg?.allowSpecificDomainSignUp) {
if (serverCfg?.allowedSignUpDomain) {
const domain = email.split("@")[1];
const allowedDomains = serverCfg.allowSpecificDomainSignUp.split(",").map((e) => e.trim());
const allowedDomains = serverCfg.allowedSignUpDomain.split(",").map((e) => e.trim());
if (!allowedDomains.includes(domain)) {
throw new BadRequestError({
message: `Email with a domain (@${domain}) is not supported`
backend/src/services/auth/auth-login-service.ts
+2 -2
View File
@@ -273,9 +273,9 @@ export const authLoginServiceFactory = ({ userDAL, tokenService, smtpService }:
if (!serverCfg?.allowSignUp)
throw new BadRequestError({ message: "User signup disabled", name: "Oauth 2 login" });
if (serverCfg?.allowSpecificDomainSignUp) {
if (serverCfg?.allowedSignUpDomain) {
const domain = email.split("@")[1];
const allowedDomains = serverCfg.allowSpecificDomainSignUp.split(",").map((e) => e.trim());
const allowedDomains = serverCfg.allowedSignUpDomain.split(",").map((e) => e.trim());
if (!allowedDomains.includes(domain))
throw new BadRequestError({
message: `Email with a domain (@${domain}) is not supported`,