From b39eceafcbb45e85c6b9cd3f4d0a113e447b3312 Mon Sep 17 00:00:00 2001
From: Keith Irwin <git@ki9.us>
Date: Wed, 2 Nov 2022 12:28:36 -0600
Subject: [PATCH] Send usernumber too

---
 back/lib/admin/user/del | 14 +++++++++-----
 front/admin.js          |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/back/lib/admin/user/del b/back/lib/admin/user/del
index 76f93d3..b6aeec1 100755
--- a/back/lib/admin/user/del
+++ b/back/lib/admin/user/del
@@ -2,7 +2,7 @@
 # FILE:       	admin/user/del
 # DESCRIPTION:	Delete a user
 # USAGE:      	del remote_ip querystring
-# QUERYSTRING:	?t=$token&user=$username
+# QUERYSTRING:	?t=$token&user=$username&un=$usernumber
 # ERRORS:
 # 	 3: bad args/usage
 # 	 4: Wireguard not installed
@@ -46,14 +46,18 @@ saved_token="$(grep "${ip}" "${TOKENS_FILE}" | cut -f2)"
 <<<"${qs}" grep -qx "t=${saved_token}" || token_fail 'mismatched'
 printf '%s token was valid\n' "${ip}" >>"${LOGFILE}"
 
-# Check username
+# Check username and usernumber
 username="$(<<<"${qs}" grep -oP 'user=(.*)' | sed 's/^user=//')"
+
+usernumber="$(<<<"${qs}" grep -oP 'un=(.*)' | sed 's/^un=//')"
 if [[ "${username}" == "" ]]; then
-	printf 'ERROR! Username "%s" missing!\n' "${username}" >>"${LOGFILE}"
-	printf 'Username missing!\n' | "${LIB_DIR}/http_res" 400
+	printf 'ERROR! Username missing!\n' | tee -a "${LOGFILE}" | "${LIB_DIR}/http_res" 400
+	exit 9
+elif [[ "${usernumber}" == "" ]]; then
+	printf 'ERROR! Usernumber missing!\n' | tee -a "${LOGFILE}" |"${LIB_DIR}/http_res" 400
 	exit 9
 else
-	printf 'Admin %s requested deletion of user "%s"\n' "${ip}" "${username}" >>"${LOGFILE}"
+	printf 'Admin %s requested deletion of user "%s" with usernumber "%s"\n' "${ip}" "${username}" "${usernumber}" >>"${LOGFILE}"
 fi
 
 # Get all peer IPs
diff --git a/front/admin.js b/front/admin.js
index 965ab5d..fd153df 100644
--- a/front/admin.js
+++ b/front/admin.js
@@ -195,7 +195,7 @@ function PeerList() {
 		user = self.userToDelete()
 		if (confirm(`Are you sure you want to delete ${user.name}?`)) {
 			user.isDeleting(true)
-			const url = `${API_URL}/user?t=${self.token()}&user=${user.name}`
+			const url = `${API_URL}/user?t=${self.token()}&user=${user.name}&un=${user.number}`
 			try {
 				const res = await fetch(url, {method: 'DELETE'})
 				if (res.ok) self.peers.remove(peer)