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

Remove print statements, cleanup

Browse Source
This commit is contained in:
Tuan Dang
2024-04-18 13:51:47 -07:00
parent fa7587900e
commit 6e3d5a8c7c
7 changed files with 7 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/ee/routes/v1/scim-router.ts
View File

@@ -192,7 +192,6 @@ export const registerScimRouter = async (server: FastifyZodProvider) => {
},
onRequest: verifyAuth([AuthMode.SCIM_TOKEN]),
handler: async (req) => {
console.log(`GET /Users/${req.params.userId}`);
const user = await req.server.services.scim.getScimUser({
userId: req.params.userId,
orgId: req.permission.orgId
@@ -247,7 +246,6 @@ export const registerScimRouter = async (server: FastifyZodProvider) => {
},
onRequest: verifyAuth([AuthMode.SCIM_TOKEN]),
handler: async (req) => {
console.log(`POST /Users req.body: `, req.body);
const primaryEmail = req.body.emails?.find((email) => email.primary)?.value;
const user = await req.server.services.scim.createScimUser({
@@ -275,7 +273,6 @@ export const registerScimRouter = async (server: FastifyZodProvider) => {
},
onRequest: verifyAuth([AuthMode.SCIM_TOKEN]),
handler: async (req) => {
console.log(`DELETE /Users/${req.params.userId}`);
const user = await req.server.services.scim.deleteScimUser({
userId: req.params.userId,
orgId: req.permission.orgId
@@ -322,7 +319,6 @@ export const registerScimRouter = async (server: FastifyZodProvider) => {
},
onRequest: verifyAuth([AuthMode.SCIM_TOKEN]),
handler: async (req) => {
console.log(`POST /Groups req.body: `, req.body);
const group = await req.server.services.scim.createScimGroup({
orgId: req.permission.orgId,
...req.body
@@ -363,7 +359,6 @@ export const registerScimRouter = async (server: FastifyZodProvider) => {
},
onRequest: verifyAuth([AuthMode.SCIM_TOKEN]),
handler: async (req) => {
console.log(`GET /Groups req.query: `, req.query);
const groups = await req.server.services.scim.listScimGroups({
orgId: req.permission.orgId,
offset: req.query.startIndex,
@@ -400,7 +395,6 @@ export const registerScimRouter = async (server: FastifyZodProvider) => {
},
onRequest: verifyAuth([AuthMode.SCIM_TOKEN]),
handler: async (req) => {
console.log(`GET /Groups/${req.params.groupId}`);
const group = await req.server.services.scim.getScimGroup({
groupId: req.params.groupId,
orgId: req.permission.orgId
@@ -446,7 +440,6 @@ export const registerScimRouter = async (server: FastifyZodProvider) => {
},
onRequest: verifyAuth([AuthMode.SCIM_TOKEN]),
handler: async (req) => {
console.log(`PUT /Groups/${req.params.groupId} req.body: `, req.body);
const group = await req.server.services.scim.updateScimGroupNamePut({
groupId: req.params.groupId,
orgId: req.permission.orgId,
@@ -508,7 +501,6 @@ export const registerScimRouter = async (server: FastifyZodProvider) => {
},
onRequest: verifyAuth([AuthMode.SCIM_TOKEN]),
handler: async (req) => {
console.log(`PATCH /Groups/:${req.params.groupId} req.body: `, req.body);
const group = await req.server.services.scim.updateScimGroupNamePatch({
groupId: req.params.groupId,
orgId: req.permission.orgId,
@@ -532,7 +524,6 @@ export const registerScimRouter = async (server: FastifyZodProvider) => {
},
onRequest: verifyAuth([AuthMode.SCIM_TOKEN]),
handler: async (req) => {
console.log(`DELETE /Groups/:${req.params.groupId}`);
const group = await req.server.services.scim.deleteScimGroup({
groupId: req.params.groupId,
orgId: req.permission.orgId
@@ -583,7 +574,6 @@ export const registerScimRouter = async (server: FastifyZodProvider) => {
},
onRequest: verifyAuth([AuthMode.SCIM_TOKEN]),
handler: async (req) => {
console.log(`PUT /Users/:${req.params.userId} req.body: `, req.body);
const user = await req.server.services.scim.replaceScimUser({
userId: req.params.userId,
orgId: req.permission.orgId,

3
backend/src/ee/services/group/group-fns.ts
View File

@@ -658,9 +658,6 @@ export const removeUsersFromGroupByUserIds = async ({
}
});
console.log("removeUsersFromGroupByUserIds membersToRemoveFromGroupDirectly: ", membersToRemoveFromGroupDirectly);
console.log("removeUsersFromGroupByUserIds membersToRemoveFromGroupPending: ", membersToRemoveFromGroupPending);
let removedUsers: TUsers[] = [];
if (membersToRemoveFromGroupDirectly.length) {

6
backend/src/ee/services/license/licence-fns.ts
View File

@@ -24,10 +24,10 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({
customAlerts: false,
auditLogs: false,
auditLogsRetentionDays: 0,
samlSSO: true,
scim: true,
samlSSO: false,
scim: false,
ldap: false,
groups: true,
groups: false,
status: null,
trial_end: null,
has_used_trial: true,

6
backend/src/ee/services/license/license-types.ts
View File

@@ -40,10 +40,10 @@ export type TFeatureSet = {
customAlerts: false;
auditLogs: false;
auditLogsRetentionDays: 0;
samlSSO: true;
scim: true;
samlSSO: false;
scim: false;
ldap: false;
groups: true;
groups: false;
status: null;
trial_end: null;
has_used_trial: true;

7
backend/src/ee/services/scim/scim-service.ts
View File

@@ -633,13 +633,6 @@ export const scimServiceFactory = ({
};
const updateScimGroupNamePut = async ({ groupId, orgId, displayName, members }: TUpdateScimGroupNamePutDTO) => {
console.log("updateScimGroupNamePut args: ", {
groupId,
orgId,
displayName,
members
});
const plan = await licenseService.getPlan(orgId);
if (!plan.groups)
throw new BadRequestError({

13
backend/src/services/auth/auth-signup-service.ts
View File

@@ -187,7 +187,6 @@ export const authSignupServiceFactory = ({
const uniqueOrgId = [...new Set(updatedMembersips.map(({ orgId }) => orgId))];
await Promise.allSettled(uniqueOrgId.map((orgId) => licenseService.updateSubscriptionOrgMemberCount(orgId)));
console.log("conv A");
await convertPendingGroupAdditionsToGroupMemberships({
userIds: [user.id],
userDAL,
@@ -199,7 +198,6 @@ export const authSignupServiceFactory = ({
projectDAL,
projectBotDAL
});
console.log("conv B");
const tokenSession = await tokenService.getUserTokenSession({
userAgent,
@@ -258,16 +256,13 @@ export const authSignupServiceFactory = ({
encryptedPrivateKeyTag,
authorization
}: TCompleteAccountInviteDTO) => {
console.log("conv 0");
const user = await userDAL.findUserByUsername(email);
if (!user || (user && user.isAccepted)) {
throw new Error("Failed to complete account for complete user");
}
console.log("conv 1");
validateSignUpAuthorization(authorization, user.id);
console.log("conv 2");
const [orgMembership] = await orgDAL.findMembership({
inviteEmail: email,
status: OrgMembershipStatus.Invited
@@ -278,12 +273,9 @@ export const authSignupServiceFactory = ({
name: "complete account invite"
});
console.log("conv 3");
const updateduser = await authDAL.transaction(async (tx) => {
console.log("conv 4");
const us = await userDAL.updateById(user.id, { firstName, lastName, isAccepted: true }, tx);
if (!us) throw new Error("User not found");
console.log("conv 5");
const userEncKey = await userDAL.upsertUserEncryptionKey(
us.id,
{
@@ -300,19 +292,15 @@ export const authSignupServiceFactory = ({
},
tx
);
console.log("conv 6");
const updatedMembersips = await orgDAL.updateMembership(
{ inviteEmail: email, status: OrgMembershipStatus.Invited },
{ userId: us.id, status: OrgMembershipStatus.Accepted },
tx
);
console.log("conv 7");
const uniqueOrgId = [...new Set(updatedMembersips.map(({ orgId }) => orgId))];
console.log("conv 8");
await Promise.allSettled(uniqueOrgId.map((orgId) => licenseService.updateSubscriptionOrgMemberCount(orgId)));
console.log("conv AA");
await convertPendingGroupAdditionsToGroupMemberships({
userIds: [user.id],
userDAL,
@@ -325,7 +313,6 @@ export const authSignupServiceFactory = ({
projectBotDAL,
tx
});
console.log("conv BB");
return { info: us, key: userEncKey };
});

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

@@ -248,7 +248,7 @@ export const orgServiceFactory = ({
ForbiddenError.from(permission).throwUnlessCan(OrgPermissionActions.Edit, OrgPermissionSubjects.Scim);
}
if (authEnforced || scimEnabled) {
if (authEnforced) {
const samlCfg = await samlConfigDAL.findEnforceableSamlCfg(orgId);
if (!samlCfg)
throw new BadRequestError({