From b204b37ec99e049481a1f3e955aaff23364c1775 Mon Sep 17 00:00:00 2001
From: peregrineshahin <41402573+peregrineshahin@users.noreply.github.com>
Date: Tue, 7 May 2024 16:56:45 +0300
Subject: [PATCH] log rejecting users
prints some information in the server log since we don't record such events publicly.
this also helps in case of a rejection by mistake, since we can contact the rejected user via email from the log.
---
server/fishtest/templates/user.mak | 16 ++++++++--------
server/fishtest/userdb.py | 8 +++++++-
server/fishtest/views.py | 2 +-
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/server/fishtest/templates/user.mak b/server/fishtest/templates/user.mak
index d021a6c81..d0ce6f6fb 100644
--- a/server/fishtest/templates/user.mak
+++ b/server/fishtest/templates/user.mak
@@ -175,22 +175,22 @@
+ >Reject
+ >Accept
% else:
diff --git a/server/fishtest/userdb.py b/server/fishtest/userdb.py
index 9c5843ba0..443249b45 100644
--- a/server/fishtest/userdb.py
+++ b/server/fishtest/userdb.py
@@ -137,12 +137,18 @@ def save_user(self, user):
self.last_blocked_time = 0
self.clear_cache()
- def remove_user(self, user):
+ def remove_user(self, user, rejector):
+
result = self.users.delete_one({"_id": user["_id"]})
if result.deleted_count > 0:
# User successfully deleted
self.last_pending_time = 0
self.clear_cache()
+ # logs rejected users to the server
+ print(
+ f"user: {user['username']} with email: {user['email']} was rejected by: {rejector}",
+ flush=True,
+ )
return True
else:
# User not found
diff --git a/server/fishtest/views.py b/server/fishtest/views.py
index 4549b2889..279ea6c3b 100644
--- a/server/fishtest/views.py
+++ b/server/fishtest/views.py
@@ -656,7 +656,7 @@ def user(request):
message="accepted",
)
else:
- request.userdb.remove_user(user_data)
+ request.userdb.remove_user(user_data, userid)
return home(request)
userc = request.userdb.user_cache.find_one({"username": user_name})
hours = int(userc["cpu_hours"]) if userc is not None else 0