Refactor UserPasswordSet to simplify password check logic

Piotr Andruszkiewicz · Piotr Andruszkiewicz · commit 65c841cab396 · 2025-05-24T00:59:43.000+02:00
diff --git a/pkg/user_manager.go b/pkg/user_manager.go
@@ -3,7 +3,6 @@ package pkg
 import (
 	"fmt"
 
-	"github.com/go-resty/resty/v2"
 	"github.com/wttech/aemc/pkg/keystore"
 	"github.com/wttech/aemc/pkg/user"
 )
@@ -103,18 +102,16 @@ func (um *UserManager) UserPasswordSet(scope string, id string, password string)
 
 	userPath := UsersPath + "/" + scope + "/" + id
 
-	passwordCheckResponse, passwordCheckError := um.instance.http.Client().
-		SetRedirectPolicy(resty.NoRedirectPolicy()).
-		R().
+	passwordCheckResponse, passwordCheckError := um.instance.http.Request().
 		SetBasicAuth(userStatus.AuthorizableID, password).
-		Get(userPath)
+		Get(userPath + ".json")
 
 	if passwordCheckError != nil {
-		if passwordCheckResponse != nil && !passwordCheckResponse.IsError() {
-			return false, nil
-		}
 		return false, fmt.Errorf("%s > cannot check user password: %w", um.instance.IDColor(), passwordCheckError)
 	}
+	if passwordCheckError == nil && passwordCheckResponse != nil && !passwordCheckResponse.IsError() {
+		return false, nil
+	}
 
 	props := map[string]any{
 		"rep:password": password,
