From 04c12d9a75428cc9f13465baa5226a03e600e97b Mon Sep 17 00:00:00 2001 From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com> Date: Tue, 13 Feb 2024 23:22:55 +0100 Subject: [PATCH] Revert seed --- backend/src/db/seeds/1-user.ts | 16 ++------------ backend/src/db/seeds/2-org.ts | 3 --- backend/src/db/seeds/3-project.ts | 36 +++++-------------------------- 3 files changed, 7 insertions(+), 48 deletions(-) diff --git a/backend/src/db/seeds/1-user.ts b/backend/src/db/seeds/1-user.ts index 5f9fcd509..8e2b00b90 100644 --- a/backend/src/db/seeds/1-user.ts +++ b/backend/src/db/seeds/1-user.ts @@ -1,14 +1,8 @@ -/* eslint-disable @typescript-eslint/ban-ts-comment */ -// @ts-nocheck - import { Knex } from "knex"; -// eslint-disable-next-line @typescript-eslint/no-unused-vars -import { generateUserSrpKeys } from "@app/lib/crypto/srp"; - import { AuthMethod } from "../../services/auth/auth-type"; import { TableName } from "../schemas"; -import { seedData1 } from "../seed-data"; +import { generateUserSrpKeys, seedData1 } from "../seed-data"; export async function seed(knex: Knex): Promise { // Deletes ALL existing entries @@ -25,7 +19,6 @@ export async function seed(knex: Knex): Promise { id: seedData1.id, email: seedData1.email, superAdmin: true, - ghost: false, firstName: "test", lastName: "", authMethods: [AuthMethod.EMAIL], @@ -37,7 +30,7 @@ export async function seed(knex: Knex): Promise { ]) .returning("*"); - const encKeys = await generateUserSrpKeys(seedData1.email, seedData1.password); + const encKeys = await generateUserSrpKeys(seedData1.password); // password: testInfisical@1 await knex(TableName.UserEncryptionKey).insert([ { @@ -67,9 +60,4 @@ export async function seed(knex: Knex): Promise { refreshVersion: 1, lastUsed: new Date() }); - - seedData1.encryptionKeys = { - publicKey: encKeys.publicKey, - privateKey: encKeys.plainPrivateKey - }; } diff --git a/backend/src/db/seeds/2-org.ts b/backend/src/db/seeds/2-org.ts index a2990054b..ba2f65a36 100644 --- a/backend/src/db/seeds/2-org.ts +++ b/backend/src/db/seeds/2-org.ts @@ -1,6 +1,3 @@ -/* eslint-disable @typescript-eslint/ban-ts-comment */ -// @ts-nocheck - import { Knex } from "knex"; import { OrgMembershipRole, OrgMembershipStatus, TableName } from "../schemas"; diff --git a/backend/src/db/seeds/3-project.ts b/backend/src/db/seeds/3-project.ts index af74140dc..8b1c2d958 100644 --- a/backend/src/db/seeds/3-project.ts +++ b/backend/src/db/seeds/3-project.ts @@ -16,8 +16,6 @@ export const DEFAULT_PROJECT_ENVS = [ ]; export async function seed(knex: Knex): Promise { - initEnvConfig(await initLogger()); - const appCfg = getConfig(); // Deletes ALL existing entries await knex(TableName.Project).del(); await knex(TableName.Environment).del(); @@ -29,38 +27,14 @@ export async function seed(knex: Knex): Promise { orgId: seedData1.organization.id, slug: "first-project", // @ts-expect-error exluded type id needs to be inserted here to keep it testable - id: seedData1.project.id, - version: "v1" + id: seedData1.project.id }) .returning("*"); - const blindIndex = createSecretBlindIndex(appCfg.ROOT_ENCRYPTION_KEY, appCfg.ENCRYPTION_KEY); - - await knex(TableName.SecretBlindIndex).insert({ - projectId: project.id, - algorithm: blindIndex.algorithm, - keyEncoding: blindIndex.keyEncoding, - saltIV: blindIndex.iv, - encryptedSaltCipherText: blindIndex.ciphertext, - saltTag: blindIndex.tag - }); - - const randomBytes = crypto.randomBytes(16).toString("hex"); // Project key - // const encKeys = await generateUserSrpKeys(seedData1.email, seedData1.password); // User keys - - const { ciphertext: encryptedProjectKey, nonce: encryptedProjectKeyIv } = encryptAsymmetric( - randomBytes, - seedData1.encryptionKeys.publicKey, - seedData1.encryptionKeys.privateKey - ); - - await knex(TableName.ProjectKeys).insert({ - projectId: project.id, - senderId: seedData1.id, - receiverId: seedData1.id, - encryptedKey: encryptedProjectKey, - nonce: encryptedProjectKeyIv - }); + // await knex(TableName.ProjectKeys).insert({ + // projectId: project.id, + // senderId: seedData1.id + // }); await knex(TableName.ProjectMembership).insert({ projectId: project.id,