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

feat: changed line length to 120

Browse Source
This commit is contained in:
Akhil Mohan
2024-01-30 22:40:10 +05:30
parent 5855cc660a
commit bcbb49ed1b
142 changed files with 1183 additions and 3706 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/user/user-dal.ts
+4 -19
View File
@@ -24,11 +24,7 @@ export const userDALFactory = (db: TDbClient) => {
try {
return await db(TableName.Users)
.where({ email })
.join(
TableName.UserEncryptionKey,
`${TableName.Users}.id`,
`${TableName.UserEncryptionKey}.userId`
)
.join(TableName.UserEncryptionKey, `${TableName.Users}.id`, `${TableName.UserEncryptionKey}.userId`)
.first();
} catch (error) {
throw new DatabaseError({ error, name: "Find user enc by email" });
@@ -39,11 +35,7 @@ export const userDALFactory = (db: TDbClient) => {
try {
const user = await db(TableName.Users)
.where(`${TableName.Users}.id`, userId)
.join(
TableName.UserEncryptionKey,
`${TableName.Users}.id`,
`${TableName.UserEncryptionKey}.userId`
)
.join(TableName.UserEncryptionKey, `${TableName.Users}.id`, `${TableName.UserEncryptionKey}.userId`)
.first();
if (user?.id) {
// change to user id
@@ -64,11 +56,7 @@ export const userDALFactory = (db: TDbClient) => {
}
};
const updateUserEncryptionByUserId = async (
userId: string,
data: TUserEncryptionKeysUpdate,
tx?: Knex
) => {
const updateUserEncryptionByUserId = async (userId: string, data: TUserEncryptionKeysUpdate, tx?: Knex) => {
try {
const [userEnc] = await (tx || db)(TableName.UserEncryptionKey)
.where({ userId })
@@ -86,10 +74,7 @@ export const userDALFactory = (db: TDbClient) => {
tx?: Knex
) => {
try {
const [userEnc] = await (tx
? tx(TableName.UserEncryptionKey)
: db(TableName.UserEncryptionKey)
)
const [userEnc] = await (tx ? tx(TableName.UserEncryptionKey) : db(TableName.UserEncryptionKey))
// if user insert make sure to pass all required data
.insert({ userId, ...data } as TUserEncryptionKeys)
.onConflict("userId")
backend/src/services/user/user-service.ts
+1 -3
View File
@@ -31,9 +31,7 @@ export const userServiceFactory = ({ userDAL }: TUserServiceFactoryDep) => {
if (!user) throw new BadRequestError({ name: "Update auth methods" });
const hasSamlEnabled = user?.authMethods?.some((method) =>
[AuthMethod.OKTA_SAML, AuthMethod.AZURE_SAML, AuthMethod.JUMPCLOUD_SAML].includes(
method as AuthMethod
)
[AuthMethod.OKTA_SAML, AuthMethod.AZURE_SAML, AuthMethod.JUMPCLOUD_SAML].includes(method as AuthMethod)
);
if (hasSamlEnabled)
throw new BadRequestError({