Merge pull request goharbor#148 from nox1134/issue-145

Autogenerate the Name of Credential in Login Flow
Althaf66 · Sep 24, 2024 · bdf0233 · bdf0233
2 parents 37a6ab4 + 5968399
commit bdf0233
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/cmd/harbor/root/login.go b/cmd/harbor/root/login.go
@@ -3,6 +3,7 @@ package root
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"github.com/goharbor/go-client/pkg/harbor"
 	"github.com/goharbor/go-client/pkg/sdk/v2.0/client/user"
@@ -61,6 +62,20 @@ func LoginCommand() *cobra.Command {
 	return cmd
 }
 
+// generateCredentialName creates a default credential name based on server and username
+func generateCredentialName(server, username string) string {
+	if strings.HasPrefix(server, "http://") {
+		server = strings.ReplaceAll(server, "http://", "")
+	}
+	if strings.HasPrefix(server, "https://") {
+		server = strings.ReplaceAll(server, "https://", "")
+	}
+	if username != "" {
+		return fmt.Sprintf("%s@%s", username, server)
+	}
+	return server
+}
+
 func createLoginView(loginView *login.LoginView) error {
 	if loginView == nil {
 		loginView = &login.LoginView{
@@ -89,6 +104,9 @@ func runLogin(opts login.LoginView) error {
 	if err != nil {
 		return fmt.Errorf("login failed, please check your credentials: %s", err)
 	}
+	if opts.Name == "" {
+		opts.Name = generateCredentialName(opts.Server, opts.Username)
+	}
 
 	cred := utils.Credential{
 		Name:          opts.Name,

diff --git a/pkg/views/login/create.go b/pkg/views/login/create.go
@@ -38,7 +38,7 @@ func CreateView(loginView *LoginView) {
 				}),
 			huh.NewInput().
 				Title("Password").
-        EchoMode(huh.EchoModePassword).
+				EchoMode(huh.EchoModePassword).
 				Value(&loginView.Password).
 				Validate(func(str string) error {
 					if str == "" {
@@ -48,13 +48,7 @@ func CreateView(loginView *LoginView) {
 				}),
 			huh.NewInput().
 				Title("Name of Credential").
-				Value(&loginView.Name).
-				Validate(func(str string) error {
-					if str == "" {
-						return errors.New("credential name cannot be empty")
-					}
-					return nil
-				}),
+				Value(&loginView.Name),
 		),
 	).WithTheme(theme).Run()
 

diff --git a/pkg/views/user/create/view.go b/pkg/views/user/create/view.go
@@ -49,7 +49,7 @@ func CreateUserView(createView *CreateView) {
 				}),
 			huh.NewInput().
 				Title("Password").
-        EchoMode(huh.EchoModePassword).
+				EchoMode(huh.EchoModePassword).
 				Value(&createView.Password).
 				Validate(func(str string) error {
 					if str == "" {