Backend: rename db.Authenticate to db.AuthenticateByCredentials.

Author: paveloom

backend/db/session.go

@@ -16,12 +16,17 @@ var (
 	InternalServerError = errors.New("internal server error")
 )
 
-func Authenticate(username string, password string) (int, error) {
+type Credentials struct {
+	Username string `json:"username"`
+	Password string `json:"password"`
+}
+
+func AuthenticateByCredentials(credentials Credentials) (int, error) {
 	var userID int
 	var hashedPassword string
 
 	query := `SELECT id, password FROM users WHERE username = ?`
-	err := db.QueryRow(query, username).Scan(&userID, &hashedPassword)
+	err := db.QueryRow(query, credentials.Username).Scan(&userID, &hashedPassword)
 	if err != nil {
 		if err == sql.ErrNoRows {
 			return -1, Unathorized
@@ -30,7 +35,7 @@ func Authenticate(username string, password string) (int, error) {
 		return -1, InternalServerError
 	}
 
-	err = bcrypt.CompareHashAndPassword([]byte(hashedPassword), []byte(password))
+	err = bcrypt.CompareHashAndPassword([]byte(hashedPassword), []byte(credentials.Password))
 	if err != nil {
 		return -1, Unathorized
 	}

backend/server/session.go

@@ -13,11 +13,6 @@ const (
 	sessionKeyPresentCookieName = "flowey_session_key_present"
 )
 
-type Credentials struct {
-	Username string `json:"username"`
-	Password string `json:"password"`
-}
-
 type sessionHandler struct{}
 
 func (handler *sessionHandler) handlePost(writer http.ResponseWriter, request *http.Request) {
@@ -27,14 +22,14 @@ func (handler *sessionHandler) handlePost(writer http.ResponseWriter, request *h
 		return
 	}
 
-	var credentials Credentials
+	var credentials db.Credentials
 	err = json.Unmarshal(body, &credentials)
 	if err != nil {
 		http.Error(writer, "couldn't parse the body as a JSON object", http.StatusBadRequest)
 		return
 	}
 
-	userID, err := db.Authenticate(credentials.Username, credentials.Password)
+	userID, err := db.AuthenticateByCredentials(credentials)
 	if err == db.Unathorized {
 		http.Error(writer, err.Error(), http.StatusUnauthorized)
 		return