Remove username MC account addition

Author: MineGame159

pkg/web/api/account.go

@@ -1,12 +1,10 @@
 package api
 
 import (
-	"bytes"
 	"encoding/json"
 	"github.com/meyskens/go-turnstile"
 	"image"
 	_ "image/png"
-	"io/ioutil"
 	"meteor-server/pkg/discord"
 	"net/http"
 	"os"
@@ -258,86 +256,51 @@ func McAccountHandler(w http.ResponseWriter, r *http.Request) {
 
 	if r.Method == "POST" {
 		code := r.URL.Query().Get("code")
+		if code == "" {
+			core.JsonError(w, "Invalid code")
+			return
+		}
 
-		if code != "" {
-			res, err := http.Get("http://mcauth:8080/retrieve/" + code)
-			if err != nil {
-				core.JsonError(w, "Failed to retrieve code's UUID. "+err.Error())
-				return
-			}
-
-			//goland:noinspection GoUnhandledErrorResult
-			defer res.Body.Close()
-
-			if res.StatusCode != http.StatusOK {
-				var data struct{ Error string }
-
-				err := json.NewDecoder(res.Body).Decode(&data)
-				if err != nil {
-					core.JsonError(w, "Failed to parse code's UUID Error")
-					return
-				}
-
-				core.JsonError(w, data.Error)
-				return
-			}
+		res, err := http.Get("http://mcauth:8080/retrieve/" + code)
+		if err != nil {
+			core.JsonError(w, "Failed to retrieve code's UUID. "+err.Error())
+			return
+		}
 
-			var data struct{ Uuid string }
+		//goland:noinspection GoUnhandledErrorResult
+		defer res.Body.Close()
 
-			err = json.NewDecoder(res.Body).Decode(&data)
-			if err != nil {
-				core.JsonError(w, "Failed to parse code's UUID")
-				return
-			}
+		if res.StatusCode != http.StatusOK {
+			var data struct{ Error string }
 
-			id, err := uuid.Parse(data.Uuid)
+			err := json.NewDecoder(res.Body).Decode(&data)
 			if err != nil {
-				core.JsonError(w, "Invalid UUID")
+				core.JsonError(w, "Failed to parse code's UUID Error")
 				return
 			}
 
-			err = account.AddMcAccount(id)
-			if err != nil {
-				core.JsonError(w, err.Error())
-				return
-			}
-		} else {
-			// Get Minecraft username
-			username := r.URL.Query().Get("username")
-			if username == "" {
-				core.JsonError(w, "Invalid username 1.")
-				return
-			}
-
-			// Get uuid
-			req, _ := http.NewRequest("GET", "https://api.mojang.com/users/profiles/minecraft/"+username, bytes.NewReader([]byte{}))
-			req.Header.Set("User-Agent", "Meteor Server")
-
-			client := http.Client{}
-			res, err := client.Do(req)
-			if err != nil {
-				core.JsonError(w, "Invalid username 2.")
-				return
-			}
+			core.JsonError(w, data.Error)
+			return
+		}
 
-			body, _ := ioutil.ReadAll(res.Body)
-			var user mcUser
-			_ = json.Unmarshal(body, &user)
+		var data struct{ Uuid string }
 
-			_ = res.Body.Close()
+		err = json.NewDecoder(res.Body).Decode(&data)
+		if err != nil {
+			core.JsonError(w, "Failed to parse code's UUID")
+			return
+		}
 
-			id, err := uuid.Parse(user.Id)
-			if err != nil {
-				core.JsonError(w, "Invalid username 3. "+err.Error())
-				return
-			}
+		id, err := uuid.Parse(data.Uuid)
+		if err != nil {
+			core.JsonError(w, "Invalid UUID")
+			return
+		}
 
-			// Add Minecraft account
-			err = account.AddMcAccount(id)
-			if err != nil {
-				core.JsonError(w, err.Error())
-				return
-			}
+		err = account.AddMcAccount(id)
+		if err != nil {
+			core.JsonError(w, err.Error())
+			return
 		}
 
 		UpdateCapes()