From 2e7c596f7f6f4dca4f5233c1137b88a8e637445d Mon Sep 17 00:00:00 2001
From: Opaque02 <66582645+Opaque02@users.noreply.github.com>
Date: Thu, 17 Oct 2024 09:10:57 +1000
Subject: [PATCH] PR comments

---
 api/endpoints.go | 111 ++++++++++++++++++++++-------------------------
 1 file changed, 51 insertions(+), 60 deletions(-)

diff --git a/api/endpoints.go b/api/endpoints.go
index a1232c8..64ac6d6 100644
--- a/api/endpoints.go
+++ b/api/endpoints.go
@@ -740,38 +740,36 @@ func handleAdminDiscordUnlink(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if err != nil {
-		httpError(w, r, err, http.StatusUnauthorized)
-		return
-	}
-
 	username := r.Form.Get("username")
 	discordId := r.Form.Get("discordId")
 
-	if username != "" {
-		log.Printf("Username given, removing discordId")
-		// this does a quick call to make sure the username exists on the server before allowing the rest of the code to run
-		// this calls error value 404 (StatusNotFound) if there's no data; this means the username does not exist in the server
-		_, err = db.CheckUsernameExists(username)
-		if err != nil {
-			httpError(w, r, fmt.Errorf("username does not exist on the server"), http.StatusNotFound)
-			return
-		}
-		err = db.RemoveDiscordIdByUsername(username)
-		if err != nil {
-			httpError(w, r, err, http.StatusInternalServerError)
-			return
-		}
-	}
-	if discordId != "" {
-		log.Printf("DiscordID given, removing discordId")
-		err = db.RemoveDiscordIdByDiscordId(discordId)
-		if err != nil {
-			httpError(w, r, err, http.StatusInternalServerError)
-			return
-		}
-	}
+	switch {
+		case username != "":
+			log.Printf("Username given, removing discordId")
+			// this does a quick call to make sure the username exists on the server before allowing the rest of the code to run
+			// this calls error value 404 (StatusNotFound) if there's no data; this means the username does not exist in the server
+			_, err = db.CheckUsernameExists(username)
+			if err != nil {
+				httpError(w, r, fmt.Errorf("username does not exist on the server"), http.StatusNotFound)
+				return
+			}
 
+			err = db.RemoveDiscordIdByUsername(username)
+			if err != nil {
+				httpError(w, r, err, http.StatusInternalServerError)
+				return
+			}
+
+		case discordId != "":
+			log.Printf("DiscordID given, removing discordId")
+			err = db.RemoveDiscordIdByDiscordId(discordId)
+			if err != nil {
+				httpError(w, r, err, http.StatusInternalServerError)
+				return
+			}
+
+	}
+	
 	log.Printf("%s: %s removed discord id %s from username %s", userDiscordId, r.URL.Path, r.Form.Get("discordId"), r.Form.Get("username"))
 
 	w.WriteHeader(http.StatusOK)
@@ -849,36 +847,34 @@ func handleAdminGoogleUnlink(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if err != nil {
-		httpError(w, r, err, http.StatusUnauthorized)
-		return
-	}
-
 	username := r.Form.Get("username")
 	googleId := r.Form.Get("googleId")
 
-	if username != "" {
-		log.Printf("Username given, removing googleId")
-		// this does a quick call to make sure the username exists on the server before allowing the rest of the code to run
-		// this calls error value 404 (StatusNotFound) if there's no data; this means the username does not exist in the server
-		_, err = db.CheckUsernameExists(username)
-		if err != nil {
-			httpError(w, r, fmt.Errorf("username does not exist on the server"), http.StatusNotFound)
-			return
-		}
-		err = db.RemoveGoogleIdByUsername(username)
-		if err != nil {
-			httpError(w, r, err, http.StatusInternalServerError)
-			return
-		}
-	}
-	if googleId != "" {
-		log.Printf("DiscordID given, removing googleId")
-		err = db.RemoveGoogleIdByDiscordId(googleId)
-		if err != nil {
-			httpError(w, r, err, http.StatusInternalServerError)
-			return
-		}
+	switch {
+		case username != "":
+			log.Printf("Username given, removing googleId")
+			// this does a quick call to make sure the username exists on the server before allowing the rest of the code to run
+			// this calls error value 404 (StatusNotFound) if there's no data; this means the username does not exist in the server
+			_, err = db.CheckUsernameExists(username)
+			if err != nil {
+				httpError(w, r, fmt.Errorf("username does not exist on the server"), http.StatusNotFound)
+				return
+			}
+
+			err = db.RemoveGoogleIdByUsername(username)
+			if err != nil {
+				httpError(w, r, err, http.StatusInternalServerError)
+				return
+			}
+
+		case googleId != "":
+			log.Printf("DiscordID given, removing googleId")
+			err = db.RemoveGoogleIdByDiscordId(googleId)
+			if err != nil {
+				httpError(w, r, err, http.StatusInternalServerError)
+				return
+			}
+
 	}
 
 	log.Printf("%s: %s removed google id %s from username %s", userDiscordId, r.URL.Path, r.Form.Get("googleId"), r.Form.Get("username"))
@@ -911,11 +907,6 @@ func handleAdminSearch(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if err != nil {
-		httpError(w, r, err, http.StatusUnauthorized)
-		return
-	}
-
 	username := r.Form.Get("username")
 
 	// this does a quick call to make sure the username exists on the server before allowing the rest of the code to run