fix(classes): reset user data when removing congregation

src/v3/classes/User.ts

@@ -301,9 +301,23 @@ export class User {
 
 		const profile = structuredClone(this.profile);
 		profile.congregation = undefined;
-
 		await this.updateProfile(profile);
 
+		const settings = structuredClone(this.settings);
+		settings.backup_automatic = '';
+		settings.data_view = '';
+		settings.hour_credits_enabled = '';
+		settings.theme_follow_os_enabled = '';
+		await this.updateSettings(settings);
+
+		await this.updateSessions([]);
+
+		await this.saveFieldServiceReports([]);
+
+		await this.saveBibleStudies([]);
+
+		await this.saveDelegatedFieldServiceReports([]);
+
 		if (cong) {
 			await cong.reloadMembers();
 		}

src/v3/controllers/admin_controller.ts

@@ -856,7 +856,13 @@ export const userRemoveCongregation = async (req: Request, res: Response) => {
 
 	const userCong = user.profile.congregation?.id;
 
-	await user.removeCongregation();
+	if (user.profile.role === 'vip') {
+		await user.removeCongregation();
+	}
+
+	if (user.profile.role === 'pocket') {
+		await UsersList.delete(user.id);
+	}
 
 	if (userCong) {
 		const cong = CongregationsList.findById(userCong);

src/v3/controllers/congregation_admin_controller.ts

@@ -726,7 +726,13 @@ export const congregationDeleteUser = async (req: Request, res: Response) => {
 		return;
 	}
 
-	await foundUser.removeCongregation();
+	if (foundUser.profile.role === 'vip') {
+		await foundUser.removeCongregation();
+	}
+
+	if (foundUser.profile.role === 'pocket') {
+		await UsersList.delete(foundUser.id);
+	}
 
 	const cong_members = cong.getMembers(req.signedCookies.visitorid);