Correctly show validation error when verifying login to VCSA on OVA UI (

#1234) (#1235)
vmware · Dec 9, 2017 · 236fe98 · 236fe98
1 parent b77cf22
commit 236fe98
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/installer/fileserver/html/index.html b/installer/fileserver/html/index.html
@@ -159,11 +159,11 @@ <h3 class="modal-title">Complete VIC appliance installation</h3>
                             <div class="modal-body">
                                 <form id="login-form" method="post" class="pt-0">
                                     <div id="login-body">
-                                        {{if .InvalidLogin}}
+                                        {{if .ValidationError }}
                                         <div class="alert alert-danger mt-0 mb-2">
                                             <div class="alert-item">
                                                 <span class="alert-text">
-                                                    Username or password are incorrect. Please enter them again.
+                                                    Validation failed: {{ .ValidationError }}
                                                 </span>
                                             </div>
                                         </div>

diff --git a/installer/fileserver/server.go b/installer/fileserver/server.go
@@ -53,13 +53,13 @@ type config struct {
 
 // IndexHTMLOptions contains fields for html templating in index.html
 type IndexHTMLOptions struct {
-	InvalidLogin        bool
 	InitErrorFeedback   string
 	InitSuccessFeedback string
 	NeedLogin           bool
 	AdmiralAddr         string
 	DemoVCHAddr         string
 	FileserverAddr      string
+	ValidationError     string
 }
 
 var (
@@ -200,6 +200,7 @@ func indexHandler(resp http.ResponseWriter, req *http.Request) {
 		NeedLogin:           needInitializationServices(req),
 		InitErrorFeedback:   "",
 		InitSuccessFeedback: "",
+		ValidationError:     "",
 	}
 
 	if req.Method == http.MethodPost {
@@ -213,8 +214,7 @@ func indexHandler(resp http.ResponseWriter, req *http.Request) {
 		defer cancel()
 		if err != nil {
 			log.Infof("Validation failed: %s", err.Error())
-			html.InvalidLogin = true
-
+			html.ValidationError = err.Error()
 		} else {
 			log.Infof("Validation succeeded")
 			html.InitErrorFeedback = startInitializationServices()