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

feat(infisical-pg): connected project api changes with frontend

Browse Source
This commit is contained in:
Akhil Mohan
2024-01-27 12:38:22 +05:30
parent 4f3582a98b
commit 8a6ab7f2f6
39 changed files with 343 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend-pg/src/server/routes/index.ts
+2
View File
@@ -38,6 +38,7 @@ import { injectIdentity } from "../plugins/auth/inject-identity";
import { registerV1Routes } from "./v1";
import { registerV2Routes } from "./v2";
import { registerV3Routes } from "./v3";
import { injectPermission } from "../plugins/auth/inject-permission";
export const registerRoutes = async (
server: FastifyZodProvider,
@@ -149,6 +150,7 @@ export const registerRoutes = async (
});
await server.register(injectIdentity);
await server.register(injectPermission);
server.route({
url: "/status",
backend-pg/src/server/routes/v1/password-router.ts
+2 -2
View File
@@ -82,7 +82,7 @@ export const registerPasswordRouter = async (server: FastifyZodProvider) => {
response: {
200: z.object({
message: z.string(),
backupPrivateKey: BackupPrivateKeySchema
backupPrivateKey: BackupPrivateKeySchema.omit({ verifier: true })
})
}
},
@@ -105,7 +105,7 @@ export const registerPasswordRouter = async (server: FastifyZodProvider) => {
response: {
200: z.object({
message: z.string(),
backupPrivateKey: BackupPrivateKeySchema
backupPrivateKey: BackupPrivateKeySchema.omit({ verifier: true })
})
}
},
backend-pg/src/server/routes/v1/project-router.ts
+10 -8
View File
@@ -10,7 +10,13 @@ import {
import { verifyAuth } from "@app/server/plugins/auth/verify-auth";
import { AuthMode } from "@app/services/auth/auth-type";
export const registerProjectRouter = (server: FastifyZodProvider) => {
const projectWithEnv = ProjectsSchema.merge(
z.object({
environments: z.object({ name: z.string(), slug: z.string(), id: z.string() }).array()
})
);
export const registerProjectRouter = async (server: FastifyZodProvider) => {
server.route({
url: "/:workspaceId/keys",
method: "GET",
@@ -81,9 +87,7 @@ export const registerProjectRouter = (server: FastifyZodProvider) => {
schema: {
response: {
200: z.object({
workspaces: ProjectsSchema.merge(
z.object({ environments: z.object({ name: z.string(), slug: z.string() }).array() })
).array()
workspaces: projectWithEnv.array()
})
}
},
@@ -103,9 +107,7 @@ export const registerProjectRouter = (server: FastifyZodProvider) => {
}),
response: {
200: z.object({
workspace: ProjectsSchema.merge(
z.object({ environments: z.object({ name: z.string(), slug: z.string() }).array() })
).optional()
workspace: projectWithEnv.optional()
})
}
},
@@ -130,7 +132,7 @@ export const registerProjectRouter = (server: FastifyZodProvider) => {
}),
response: {
200: z.object({
workspace: ProjectsSchema
workspace: projectWithEnv
})
}
},
backend-pg/src/server/routes/v1/user-router.ts
+2 -2
View File
@@ -1,6 +1,6 @@
import { z } from "zod";
import { UsersSchema } from "@app/db/schemas";
import { UserEncryptionKeysSchema, UsersSchema } from "@app/db/schemas";
import { verifyAuth } from "@app/server/plugins/auth/verify-auth";
import { AuthMode } from "@app/services/auth/auth-type";
@@ -11,7 +11,7 @@ export const registerUserRouter = async (server: FastifyZodProvider) => {
schema: {
response: {
200: z.object({
user: UsersSchema
user: UsersSchema.merge(UserEncryptionKeysSchema.omit({ verifier: true }))
})
}
},
backend-pg/src/server/routes/v2/user-router.ts
+7 -2
View File
@@ -1,6 +1,11 @@
import { z } from "zod";
import { AuthTokenSessionsSchema, OrganizationsSchema, UsersSchema } from "@app/db/schemas";
import {
AuthTokenSessionsSchema,
OrganizationsSchema,
UserEncryptionKeysSchema,
UsersSchema
} from "@app/db/schemas";
import { ApiKeysSchema } from "@app/db/schemas/api-keys";
import { verifyAuth } from "@app/server/plugins/auth/verify-auth";
import { AuthMethod, AuthMode } from "@app/services/auth/auth-type";
@@ -195,7 +200,7 @@ export const registerUserRouter = async (server: FastifyZodProvider) => {
schema: {
response: {
200: z.object({
user: UsersSchema
user: UsersSchema.merge(UserEncryptionKeysSchema.omit({ verifier: true }))
})
}
},