Refactor user password management: update command descriptions and streamline path generation

Author: Piotr Andruszkiewicz

cmd/aem/user.go

@@ -105,7 +105,6 @@ func (c *CLI) KeystoreCreate() *cobra.Command {
 	cmd.Flags().String("id", "", "user id")
 	_ = cmd.MarkFlagRequired("id")
 	cmd.Flags().String("scope", "", "user scope")
-	_ = cmd.MarkFlagRequired("scope")
 	cmd.Flags().String("keystore-password", "", "keystore password")
 	_ = cmd.MarkFlagRequired("keystore-password")
 	return cmd
@@ -114,7 +113,7 @@ func (c *CLI) KeystoreCreate() *cobra.Command {
 func (c *CLI) UserPasswordSet() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "set",
-		Short:   "Set user password",
+		Short:   "Set user password. Password is read from input.",
 		Aliases: []string{"update", "change"},
 		Run: func(cmd *cobra.Command, args []string) {
 			instances, err := c.aem.InstanceManager().One()
@@ -132,7 +131,7 @@ func (c *CLI) UserPasswordSet() *cobra.Command {
 				return
 			}
 
-			changed, err := instances.Auth().UserManager().PasswordSet(scope, id, password)
+			changed, err := instances.Auth().UserManager().SetPassword(scope, id, password)
 			if err != nil {
 				c.Error(err)
 				return
@@ -149,7 +148,6 @@ func (c *CLI) UserPasswordSet() *cobra.Command {
 	cmd.Flags().String("id", "", "user id")
 	_ = cmd.MarkFlagRequired("id")
 	cmd.Flags().String("scope", "", "user scope")
-	_ = cmd.MarkFlagRequired("scope")
 
 	return cmd
 }

pkg/user/user_status.go pkg/user/status.gopkg/user/user_status.go renamed to pkg/user/status.go

@@ -20,7 +20,7 @@ const (
 )
 
 func (um *UserManager) KeystoreStatus(scope, id string) (*keystore.Status, error) {
-	userKeystorePath := UsersPath + "/" + scope + "/" + id + ".ks.json"
+	userKeystorePath := generateUserPath(scope, id) + ".ks.json"
 
 	response, err := um.instance.http.Request().Get(userKeystorePath)
 
@@ -48,7 +48,7 @@ func (um *UserManager) KeystoreCreate(scope, id, keystorePassword string) (bool,
 		return false, statusError
 	}
 
-	if statusResponse.Created == true {
+	if statusResponse.Created {
 		return false, nil
 	}
 
@@ -58,7 +58,7 @@ func (um *UserManager) KeystoreCreate(scope, id, keystorePassword string) (bool,
 		":operation":  "createStore",
 	}
 
-	userKeystoreCreatePath := UsersPath + "/" + scope + "/" + id + ".ks.html"
+	userKeystoreCreatePath := generateUserPath(scope, id) + ".ks.html"
 	postResponse, postError := um.instance.http.Request().SetQueryParams(pathParams).Post(userKeystoreCreatePath)
 
 	if postError != nil {
@@ -73,7 +73,7 @@ func (um *UserManager) KeystoreCreate(scope, id, keystorePassword string) (bool,
 }
 
 func (um *UserManager) ReadState(scope string, id string) (*user.Status, error) {
-	userPath := UsersPath + "/" + scope + "/" + id
+	userPath := generateUserPath(scope, id)
 
 	response, err := um.instance.http.Request().Get(userPath + ".json")
 
@@ -93,14 +93,14 @@ func (um *UserManager) ReadState(scope string, id string) (*user.Status, error)
 	return result, nil
 }
 
-func (um *UserManager) PasswordSet(scope string, id string, password string) (bool, error) {
+func (um *UserManager) SetPassword(scope string, id string, password string) (bool, error) {
 	userStatus, err := um.ReadState(scope, id)
 
 	if err != nil {
 		return false, err
 	}
 
-	userPath := UsersPath + "/" + scope + "/" + id
+	userPath := generateUserPath(scope, id)
 
 	passwordCheckResponse, err := um.instance.http.Request().
 		SetBasicAuth(userStatus.AuthorizableID, password).
@@ -128,3 +128,10 @@ func (um *UserManager) PasswordSet(scope string, id string, password string) (bo
 
 	return true, nil
 }
+
+func generateUserPath(scope string, id string) string {
+	if scope == "" {
+		return UsersPath + "/" + id
+	}
+	return UsersPath + "/" + scope + "/" + id
+}