From f2e589ee53f6fc7aff8063728eb546ae6ceab5b4 Mon Sep 17 00:00:00 2001
From: jcj83429 <jcj83429@gmail.com>
Date: Sat, 10 Dec 2016 20:01:12 -0800
Subject: [PATCH] fix hiding of u2f-related things in web ui when u2f is
 disabled

---
 lib/auth/auth.go | 3 +++
 lib/web/web.go   | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/auth/auth.go b/lib/auth/auth.go
index da06a1079cf..4e20afa365e 100644
--- a/lib/auth/auth.go
+++ b/lib/auth/auth.go
@@ -175,6 +175,9 @@ func (a *AuthServer) GetDomainName() (string, error) {
 }
 
 func (a *AuthServer) GetU2FAppID() (string, error) {
+	if err := a.CheckU2FEnabled(); err != nil {
+		return "", err
+	}
 	return a.U2F.AppID, nil
 }
 
diff --git a/lib/web/web.go b/lib/web/web.go
index 9413aa92622..ab9680bfc48 100644
--- a/lib/web/web.go
+++ b/lib/web/web.go
@@ -279,9 +279,10 @@ func (m *Handler) getSettings(w http.ResponseWriter, r *http.Request) (interface
 	}
 	u2fAppID, err := m.cfg.ProxyClient.GetU2FAppID()
 	if err != nil {
-		return nil, trace.Wrap(err)
+		settings.Auth.U2FAppID = ""
+	} else {
+		settings.Auth.U2FAppID = u2fAppID
 	}
-	settings.Auth.U2FAppID = u2fAppID
 	out, err := json.Marshal(settings)
 	if err != nil {
 		return nil, trace.Wrap(err)