github/infisical
1
0
Fork 0
mirror of https://github.com/Infisical/infisical.git synced 2026-01-11 00:17:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1895 from Infisical/maidul-12djiqd

Browse Source
This commit is contained in:
Maidul Islam
2024-05-29 02:07:26 -04:00
committed by GitHub
parent f3eda1fd13 6055661515
commit b79ed28bb8
2 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
backend/src/db/migrations/20240529043051_snap-shot-secret-index-secretversionid.ts Normal file
View File

@@ -0,0 +1,21 @@
import { Knex } from "knex";
import { TableName } from "../schemas";
export async function up(knex: Knex): Promise<void> {
const doesSecretVersionIdExist = await knex.schema.hasColumn(TableName.SnapshotSecret, "secretVersionId");
if (await knex.schema.hasTable(TableName.SnapshotSecret)) {
await knex.schema.alterTable(TableName.SnapshotSecret, (t) => {
if (doesSecretVersionIdExist) t.index("secretVersionId");
});
}
}
export async function down(knex: Knex): Promise<void> {
const doesSecretVersionIdExist = await knex.schema.hasColumn(TableName.SnapshotSecret, "secretVersionId");
if (await knex.schema.hasTable(TableName.SnapshotSecret)) {
await knex.schema.alterTable(TableName.SnapshotSecret, (t) => {
if (doesSecretVersionIdExist) t.dropIndex("secretVersionId");
});
}
}

26
backend/src/server/routes/v1/project-router.ts
View File

@@ -8,7 +8,6 @@ import {
UsersSchema
} from "@app/db/schemas";
import { PROJECTS } from "@app/lib/api-docs";
import { BadRequestError } from "@app/lib/errors";
import { readLimit, writeLimit } from "@app/server/config/rateLimiter";
import { verifyAuth } from "@app/server/plugins/auth/verify-auth";
import { AuthMode } from "@app/services/auth/auth-type";
@@ -193,19 +192,18 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => {
}
},
onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),
handler: async () => {
// const workspace = await server.services.project.deleteProject({
// filter: {
// type: ProjectFilterType.ID,
// projectId: req.params.workspaceId
// },
// actorId: req.permission.id,
// actorAuthMethod: req.permission.authMethod,
// actor: req.permission.type,
// actorOrgId: req.permission.orgId
// });
// return { workspace };
throw new BadRequestError({ message: "Project delete has been paused temporarily, please try again later" });
handler: async (req) => {
const workspace = await server.services.project.deleteProject({
filter: {
type: ProjectFilterType.ID,
projectId: req.params.workspaceId
},
actorId: req.permission.id,
actorAuthMethod: req.permission.authMethod,
actor: req.permission.type,
actorOrgId: req.permission.orgId
});
return { workspace };
}
});