awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Akhil requested changes

Browse Source
This commit is contained in:
Daniel Hougaard
2024-02-17 02:50:49 +01:00
parent 2ef7e8f58e
commit a7bc62f8e4
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
backend/src/services/org/org-dal.ts
View File

@@ -122,7 +122,7 @@ export const orgDALFactory = (db: TDbClient) => {
const findOrgGhostUser = async (orgId: string) => {
try {
const [member] = await db(TableName.OrgMembership)
const member = await db(TableName.OrgMembership)
.where({ orgId })
.join(TableName.Users, `${TableName.OrgMembership}.userId`, `${TableName.Users}.id`)
.leftJoin(TableName.UserEncryptionKey, `${TableName.UserEncryptionKey}.userId`, `${TableName.Users}.id`)
@@ -136,7 +136,8 @@ export const orgDALFactory = (db: TDbClient) => {
db.ref("id").withSchema(TableName.Users).as("userId"),
db.ref("publicKey").withSchema(TableName.UserEncryptionKey)
)
.where({ isGhost: true });
.where({ isGhost: true })
.first();
return member;
} catch (error) {
return null;
@@ -145,13 +146,14 @@ export const orgDALFactory = (db: TDbClient) => {
const ghostUserExists = async (orgId: string) => {
try {
const [member] = await db(TableName.OrgMembership)
const member = await db(TableName.OrgMembership)
.where({ orgId })
.join(TableName.Users, `${TableName.OrgMembership}.userId`, `${TableName.Users}.id`)
.leftJoin(TableName.UserEncryptionKey, `${TableName.UserEncryptionKey}.userId`, `${TableName.Users}.id`)
.select(db.ref("id").withSchema(TableName.Users).as("userId"))
.where({ isGhost: true });
return !!member;
.where({ isGhost: true })
.first();
return Boolean(member);
} catch (error) {
return false;
}

2
backend/src/services/org/org-service.ts
View File

@@ -133,7 +133,7 @@ export const orgServiceFactory = ({
};
const addGhostUser = async (orgId: string, tx?: Knex) => {
const email = `ghost@${nanoid(16)}-${orgId}.com`; // We add a nanoid because the email is unique. And we have to create a new ghost user each time, so we can have access to the private key.
const email = `ghost-${nanoid(16)}-${orgId}@infisical.com`; // We add a nanoid because the email is unique. And we have to create a new ghost user each time, so we can have access to the private key.
const password = crypto.randomBytes(128).toString("hex");
const user = await userDAL.create(

6
backend/src/services/project-bot/project-bot-types.ts
View File

@@ -1,4 +1,3 @@
// import { SecretKeyEncoding } from "@app/db/schemas";
import { TProjectBots } from "@app/db/schemas";
import { TProjectPermission } from "@app/lib/types";
@@ -21,10 +20,5 @@ export type TFindBotByProjectIdDTO = {
} & TProjectPermission;
export type TGetPrivateKeyDTO = {
// encoding: SecretKeyEncoding;
// nonce: string;
// tag: string;
// encryptedPrivateKey: string;
bot: TProjectBots;
};