Rename good

3 files changed, 15 insertions, 15 deletions

diff --git a/backend/api/api.go b/backend/api/api.go
index 59fecba..9dd68a9 100644
--- a/backend/api/api.go
+++ b/backend/api/api.go
@@ -31,8 +31,8 @@ func Serve(port int) {
 	r := mux.NewRouter()
 	r.HandleFunc("/health", healthCheckFunc)
 	r.HandleFunc("/api", insertFunc).Methods("POST", "OPTIONS")
-	r.HandleFunc("/api/{hash}", getHashFunc).Methods("GET", "OPTIONS")
-	r.HandleFunc("/api/{hash}", getHashWithPasswordFunc).Methods("POST", "OPTIONS")
+	r.HandleFunc("/api/{hash}", getPasteFunc).Methods("GET", "OPTIONS")
+	r.HandleFunc("/api/{hash}", getPasteWithPasswordFunc).Methods("POST", "OPTIONS")
 
 	http.Handle("/", r)
 
diff --git a/backend/api/routes.go b/backend/api/routes.go
index 6b9ba43..f8d2e4f 100644
--- a/backend/api/routes.go
+++ b/backend/api/routes.go
@@ -51,26 +51,26 @@ func insertFunc(w http.ResponseWriter, r *http.Request) {
 	fmt.Fprintf(w, "%+v", string(jsonData))
 }
 
-func getHashFunc(w http.ResponseWriter, r *http.Request) {
+func getPasteFunc(w http.ResponseWriter, r *http.Request) {
 	// no password given for get
-	handleGetHash(w, r, "")
+	handleGetPaste(w, r, "")
 }
 
-func getHashWithPasswordFunc(w http.ResponseWriter, r *http.Request) {
+func getPasteWithPasswordFunc(w http.ResponseWriter, r *http.Request) {
 	// get password from form
 	_ = r.ParseMultipartForm(0)
-	gotPassword := r.FormValue("password")
+	parsedPassword := r.FormValue("password")
 
-	handleGetHash(w, r, gotPassword)
+	handleGetPaste(w, r, parsedPassword)
 
 }
 
-func handleGetHash(w http.ResponseWriter, r *http.Request, gotPassword string) {
+func handleGetPaste(w http.ResponseWriter, r *http.Request, parsedPassword string) {
 	// Allow CORS
 	w.Header().Set("Access-Control-Allow-Origin", "*")
 
 	hash := mux.Vars(r)["hash"]
-	paste, err := cache.C.Get(hash, gotPassword)
+	paste, err := cache.C.Get(hash, parsedPassword)
 
 	// if hash was not found
 	if err == cache.PasteNotFound {
diff --git a/backend/hashing/hash.go b/backend/hashing/hash.go
index d8e699a..d4b2566 100644
--- a/backend/hashing/hash.go
+++ b/backend/hashing/hash.go
@@ -31,15 +31,15 @@ func HashPassword(password string) (string, error) {
 	return string(hashedPassword), err
 }
 
-func ComparePasswords(dbPassword, gotPassword string) bool {
+func ComparePasswords(dbPassword, parsedPassword string) bool {
 	dbPassBytes := []byte(dbPassword)
-	gotPassBytes := []byte(gotPassword)
-	compErr := bcrypt.CompareHashAndPassword(dbPassBytes, gotPassBytes)
+	parsedPassBytes := []byte(parsedPassword)
+	compErr := bcrypt.CompareHashAndPassword(dbPassBytes, parsedPassBytes)
 
 	// if comparison error, the given password is not valid
-	if compErr != nil {
-		return false
-	} else {
+	if compErr == nil {
 		return true
+	} else {
+		return false
 	}
 }
\ No newline at end of file