From b4d6848197c993170144b0af302606d5d3f7dee3 Mon Sep 17 00:00:00 2001 From: Gijsdeman Date: Fri, 1 Dec 2023 18:33:13 +0100 Subject: [PATCH] Remove console.log --- src/index.ts | 15 ++++++++++++--- src/mailcowDatabase.ts | 1 + 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/index.ts b/src/index.ts index d5933d8..61cf92d 100644 --- a/src/index.ts +++ b/src/index.ts @@ -111,9 +111,6 @@ async function synchronizeUserACL(activeDirectoryUser: ActiveDirectoryUser, perm attributes: ['memberFlattened'], })).searchEntries[0] as unknown as ActiveDirectoryUser; - console.log('CHECKING'); - console.log(activeDirectoryUser); - await updateLocalUserPermissions(activeDirectoryUser.mail, activeDirectoryPermissionGroup.memberFlattened, permission) .then(async (changedUsers: ChangedUsers) => { if (changedUsers.newUsers.length != 0) { @@ -357,6 +354,8 @@ async function synchronizeUsersWithActiveDirectory(): Promise { const localUser: LocalUserData = await getLocalUser(mail); const mailcowUser: MailcowUserData = await getMailcowUser(mail); + // console.log('start checking local user'); + if (!localUser.exists) { console.log(`Adding local user ${mail} (active: ${isActive})`); await createLocalUser(mail, displayName, isActive); @@ -364,6 +363,8 @@ async function synchronizeUsersWithActiveDirectory(): Promise { localUser.isActive = isActive; } + // console.log('start checking mailcow user'); + if (!mailcowUser.exists) { console.log(`Adding Mailcow user ${mail} (active: ${isActive})`); await createMailcowUser(mail, displayName, isActive, 256); @@ -372,21 +373,29 @@ async function synchronizeUsersWithActiveDirectory(): Promise { mailcowUser.displayName = displayName; } + // console.log('start checking local user active'); + if (localUser.isActive !== isActive) { console.log(`Set ${mail} to active state ${isActive} in local user database`); await updateLocalUserActivity(mail, isActive, 0); } + // console.log('start checking mailcow user active'); + if (mailcowUser.isActive !== isActive) { console.log(`Set ${mail} to active state ${isActive} in Mailcow`); await editMailcowUser(mail, { active: isActive }); } + // console.log('start checking mailcow displayname'); + if (mailcowUser.displayName !== displayName) { console.log(`Changed displayname for ${mail} to ${displayName} in Mailcow`); await editMailcowUser(mail, { name: displayName }); } + // console.log('start checking loal displayname'); + if (localUser.displayName !== displayName) { console.log(`Changed displayname for ${mail} to ${displayName} in local database`); await editLocalUserDisplayName(mail, displayName); diff --git a/src/mailcowDatabase.ts b/src/mailcowDatabase.ts index 3390839..d5a7056 100644 --- a/src/mailcowDatabase.ts +++ b/src/mailcowDatabase.ts @@ -57,6 +57,7 @@ export async function editUserSignatures(user: Users, SOBs: string[]): Promise