Skip to content

refactor: remove unnecessary code #1946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 17, 2025
Merged

refactor: remove unnecessary code #1946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
745aca1
Merge pull request #1298 from nxglabs/sync-to-public_repo-17798472199
prafull-opensignlabs Sep 17, 2025
d1c4059
Merge pull request #1945 from OpenSignLabs/updates-17798985943
prafull-opensignlabs Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions apps/OpenSignServer/cloud/customRoute/deleteAccount/deleteUser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import axios from 'axios';
import { cloudServerUrl, generateId, serverAppId } from '../../../Utils.js';
import sendmailtoSupport from '../sendMailToSupport.js';
import { deleteContactsInBatch, deleteDataFiles, deleteInBatches } from './deleteFileUrl.js';
import { MAX_ATTEMPTS } from './deleteUtils.js';
const serverUrl = cloudServerUrl;
Expand Down Expand Up @@ -55,7 +54,6 @@ export async function deleteUser(userId, adminId) {
userDetails = { ...userDetails, UserId: userId };
if (!userResult) {
const errorMessage = 'User not found.';
sendmailtoSupport(userDetails, errorMessage);
return { code: 400, message: errorMessage };
}
const contractsUserId = userResult.id;
Expand All @@ -74,7 +72,6 @@ export async function deleteUser(userId, adminId) {
};
if (adminId && isAdmin) {
const errorMessage = 'An error occurred while deleting your account.';
sendmailtoSupport(userDetails, errorMessage);
return { code: 400, message: errorMessage };
}

Expand All @@ -86,7 +83,6 @@ export async function deleteUser(userId, adminId) {
} catch (err) {
console.error('Failed during contracts_Template cleanup:', err);
const errorMessage = 'Failed during contracts_Template cleanup:' + err?.message;
sendmailtoSupport(userDetails, errorMessage);
return { code: 400, message: errorMessage };
}

Expand All @@ -96,7 +92,6 @@ export async function deleteUser(userId, adminId) {
} catch (err) {
console.error('Failed during contactbook cleanup:', err);
const errorMessage = 'Failed during contactbook cleanup:' + err?.message;
sendmailtoSupport(userDetails, errorMessage);
return { code: 400, message: errorMessage };
}

Expand All @@ -117,7 +112,6 @@ export async function deleteUser(userId, adminId) {
console.error('Failed during contactbook current user cleanup:', err);
const errorMessage =
'Failed during contactbook current user cleanup: ' + (err?.message || err);
sendmailtoSupport(userDetails, errorMessage);
return { code: 400, message: errorMessage };
}

Expand All @@ -131,7 +125,6 @@ export async function deleteUser(userId, adminId) {
} catch (err) {
console.error('Failed to delete appToken entries:', err);
const errorMessage = 'Failed to delete appToken entries:' + err?.message;
sendmailtoSupport(userDetails, errorMessage);
return { code: 400, message: errorMessage };
}

Expand All @@ -141,7 +134,6 @@ export async function deleteUser(userId, adminId) {
} catch (err) {
console.error('Failed during partners_DataFiles cleanup:', err);
const errorMessage = 'Failed during partners_DataFiles cleanup:' + err?.message;
sendmailtoSupport(userDetails, errorMessage);
return { code: 400, message: errorMessage };
}

Expand All @@ -157,7 +149,6 @@ export async function deleteUser(userId, adminId) {
} catch (err) {
console.error('Failed to delete contracts_Organizations entry:', err);
const errorMessage = 'Failed to delete contracts_Organizations entry:' + err?.message;
sendmailtoSupport(userDetails, errorMessage);
return { code: 400, message: errorMessage };
}
// STEP 7: Delete each entry in contracts_Teams by objectId from teamIds
Expand All @@ -171,15 +162,13 @@ export async function deleteUser(userId, adminId) {
} catch (teamErr) {
console.error(`Failed to delete team with ID ${team.id}:`, teamErr);
const errorMessage = `Failed to delete team with ID ${team.id}` + teamErr?.message;
sendmailtoSupport(userDetails, errorMessage);
return { code: 400, message: errorMessage };
}
}
}
} catch (err) {
console.error('Failed during contracts_Teams deletion loop:', err);
const errorMessage = 'Failed during contracts_Teams deletion loop:' + err?.message;
sendmailtoSupport(userDetails, errorMessage);
return { code: 400, message: errorMessage };
}

Expand All @@ -195,7 +184,6 @@ export async function deleteUser(userId, adminId) {
const msg = `Failed during partners_Tenant ${'cleanup:'} `;
console.error(msg, err);
const errorMessage = msg + err?.message;
sendmailtoSupport(userDetails, errorMessage);
return { code: 400, message: errorMessage };
}

Expand All @@ -215,7 +203,6 @@ export async function deleteUser(userId, adminId) {
} catch (err) {
console.error('Failed during partners_TenantCredits cleanup:', err);
const errorMessage = 'Failed during partners_TenantCredits cleanup:' + err?.message;
sendmailtoSupport(userDetails, errorMessage);
return { code: 400, message: errorMessage };
}
}
Expand All @@ -229,7 +216,6 @@ export async function deleteUser(userId, adminId) {
} catch (err) {
console.error('Failed during contracts_Signature cleanup:', err);
const errorMessage = 'Failed during contracts_Signature cleanup:' + err?.message;
sendmailtoSupport(userDetails, errorMessage);
return { code: 400, message: errorMessage };
}

Expand All @@ -239,14 +225,12 @@ export async function deleteUser(userId, adminId) {
} catch (err) {
console.error('Failed to delete contracts_Users entry:', err);
const errorMessage = 'Failed to delete contracts_Users entry:' + err?.message;
sendmailtoSupport(userDetails, errorMessage);
return { code: 400, message: errorMessage };
}
return { code: 200, message: 'User and all associated data deleted successfully.' };
} catch (error) {
console.error('User deletion process failed:', error);
const errorMessage = `User deletion failed: ${error.message || error}`;
sendmailtoSupport(userDetails, errorMessage);
return { code: 400, message: errorMessage };
}
}
Expand All @@ -272,8 +256,6 @@ export const deleteUserPost = async (req, res) => {
const user = await userQuery.first({ useMasterKey: true });
if (!user) {
const errorMessage = 'User not found.';
// sendmailtoSupport(userDetails, errorMessage);
// return res.status(404).send(errorMessage);
return res.send(errorMessage);
}
const extUserQuery = new Parse.Query('contracts_Users');
Expand Down Expand Up @@ -321,8 +303,6 @@ export const deleteUserPost = async (req, res) => {
await extUser.save(null, { useMasterKey: true });
} catch (err) {
console.log('err while validating password: ', err?.response?.data || err);
// sendmailtoSupport(userDetails, errorMessage);
// return res.status(401).send(errorMessage);
}

const response = await deleteUser(userId);
Expand All @@ -332,7 +312,6 @@ export const deleteUserPost = async (req, res) => {
} catch (error) {
console.error('Account deletion error:', error);
const errorMessage = error?.message || 'An error occurred while deleting your account.';
sendmailtoSupport(userDetails, errorMessage);
return res.status(500).send(errorMessage);
}
};
Expand Down Expand Up @@ -371,7 +350,6 @@ export const deleteUserByAdmin = async (req, res) => {
const user = await userQuery.first({ useMasterKey: true });
if (!user) {
const errorMessage = 'User not found.';
sendmailtoSupport(userDetails, errorMessage);
return res.status(400).json({ message: errorMessage });
}
const response = await deleteUser(userId, adminId);
Expand All @@ -385,7 +363,6 @@ export const deleteUserByAdmin = async (req, res) => {
error?.message ||
'An error occurred while deleting your account.';
console.error(`Account deletion error:`, errorMessage);
sendmailtoSupport(userDetails, errorMessage);
return res.status(code).json({ message: errorMessage });
}
};
83 changes: 0 additions & 83 deletions apps/OpenSignServer/cloud/customRoute/sendMailToSupport.js
View file
Open in desktop

This file was deleted.

Loading