refactor WithValidSubsonicArgs

handler/middleware_sub.go

@@ -5,10 +5,7 @@ import (
 	"encoding/hex"
 	"fmt"
 	"net/http"
-
+	"net/url"
-	"github.com/jinzhu/gorm"
-
-	"github.com/sentriz/gonic/db"
 )
 
 var (
@@ -17,6 +14,17 @@ var (
 	}
 )
 
+func checkHasAllParams(params url.Values) error {
+	for _, req := range requiredParameters {
+		param := params.Get(req)
+		if param != "" {
+			continue
+		}
+		return fmt.Errorf("please provide a `%s` parameter", req)
+	}
+	return nil
+}
+
 func checkCredentialsToken(password, token, salt string) bool {
 	toHash := fmt.Sprintf("%s%s", password, salt)
 	hash := md5.Sum([]byte(toHash))
@@ -34,33 +42,26 @@ func checkCredentialsBasic(password, givenPassword string) bool {
 
 func (c *Controller) WithValidSubsonicArgs(next http.HandlerFunc) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		for _, req := range requiredParameters {
+		err := checkHasAllParams(r.URL.Query())
-			param := r.URL.Query().Get(req)
+		if err != nil {
-			if param != "" {
+			respondError(w, r, 10, err.Error())
-				continue
-			}
-			respondError(w, r,
-				10, fmt.Sprintf("please provide a `%s` parameter", req),
-			)
 			return
 		}
-		username := r.URL.Query().Get("u")
+		username, password := r.URL.Query().Get("u"),
-		password := r.URL.Query().Get("p")
+			r.URL.Query().Get("p")
-		token := r.URL.Query().Get("t")
+		token, salt := r.URL.Query().Get("t"),
-		salt := r.URL.Query().Get("s")
+			r.URL.Query().Get("s")
-		passwordAuth := token == "" && salt == ""
+		passwordAuth, tokenAuth := token == "" && salt == "",
-		tokenAuth := password == ""
+			password == ""
 		if tokenAuth == passwordAuth {
 			respondError(w, r,
 				10, "please provide parameters `t` and `s`, or just `p`",
 			)
 			return
 		}
-		user := db.User{
+		user := c.GetUserFromName(username)
-			Name: username,
+		if user.ID == 0 {
-		}
+			// the user does not exist
-		err := c.DB.Where(user).First(&user).Error
-		if gorm.IsRecordNotFoundError(err) {
 			respondError(w, r, 40, "invalid username")
 			return
 		}