From 5d834c1cd2138d6bd0d4daf415bdb5221c38bb1c Mon Sep 17 00:00:00 2001
From: Nick Gerakines <ngerakines@users.noreply.github.com>
Date: Wed, 15 Jan 2020 13:37:57 -0500
Subject: [PATCH] Minor code cleanup on settings page to improve oauth account
 management UI. T713

---
 account.go                   | 19 +++++++++++++--
 templates.go                 |  1 +
 templates/user/settings.tmpl | 45 +++++++++++++++++++++---------------
 3 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/account.go b/account.go
index 3544813..ae3ef87 100644
--- a/account.go
+++ b/account.go
@@ -1038,11 +1038,24 @@ func viewSettings(app *App, u *User, w http.ResponseWriter, r *http.Request) err
 
 	flashes, _ := getSessionFlashes(app, w, r, nil)
 
+	enableOauthSlack := app.Config().SlackOauth.ClientID != ""
+	enableOauthWriteAs := app.Config().WriteAsOauth.ClientID != ""
+
 	oauthAccounts, err := app.db.GetOauthAccounts(r.Context(), u.ID)
 	if err != nil {
 		log.Error("Unable to get oauth accounts for settings: %s", err)
 		return impart.HTTPError{http.StatusInternalServerError, "Unable to retrieve user data. The humans have been alerted."}
 	}
+	for _, oauthAccount := range oauthAccounts {
+		switch oauthAccount.Provider {
+		case "slack":
+			enableOauthSlack = false
+		case "write.as":
+			enableOauthWriteAs = false
+		}
+	}
+
+	displayOauthSection := enableOauthSlack || enableOauthWriteAs || len(oauthAccounts) > 0
 
 	obj := struct {
 		*UserPage
@@ -1050,6 +1063,7 @@ func viewSettings(app *App, u *User, w http.ResponseWriter, r *http.Request) err
 		HasPass       bool
 		IsLogOut      bool
 		Suspended     bool
+		OauthSection  bool
 		OauthAccounts []oauthAccountInfo
 		OauthSlack    bool
 		OauthWriteAs  bool
@@ -1059,9 +1073,10 @@ func viewSettings(app *App, u *User, w http.ResponseWriter, r *http.Request) err
 		HasPass:       passIsSet,
 		IsLogOut:      r.FormValue("logout") == "1",
 		Suspended:     fullUser.IsSilenced(),
+		OauthSection:  displayOauthSection,
 		OauthAccounts: oauthAccounts,
-		OauthSlack:    app.Config().SlackOauth.ClientID != "",
-		OauthWriteAs:  app.Config().WriteAsOauth.ClientID != "",
+		OauthSlack:    enableOauthSlack,
+		OauthWriteAs:  enableOauthWriteAs,
 	}
 
 	showUserPage(w, "settings", obj)
diff --git a/templates.go b/templates.go
index 968845d..c1a6da8 100644
--- a/templates.go
+++ b/templates.go
@@ -37,6 +37,7 @@ var (
 		"localstr":    localStr,
 		"localhtml":   localHTML,
 		"tolower":     strings.ToLower,
+		"title":       strings.Title,
 	}
 )
 
diff --git a/templates/user/settings.tmpl b/templates/user/settings.tmpl
index 2cda7dd..fc76f48 100644
--- a/templates/user/settings.tmpl
+++ b/templates/user/settings.tmpl
@@ -67,26 +67,33 @@ h3 { font-weight: normal; }
 		</div>
 	</form>
 
-	{{ if .OauthAccounts }}
-	    {{ range $oauth_account := .OauthAccounts }}
-		    <form method="post" action="/me/oauth/remove" autocomplete="false">
-		        <input type="hidden" name="provider" value="{{ $oauth_account.Provider }}" />
-		        <input type="hidden" name="client_id" value="{{ $oauth_account.ClientID }}" />
-		        <input type="hidden" name="remote_user_id" value="{{ $oauth_account.RemoteUserID }}" />
-    		    <div class="option">
-    			    <h3>{{ $oauth_account.Provider }} </h3>
-    			    <div class="section">
-    				    <input type="submit" value="Remove" style="margin-left: 1em;" />
-    			    </div>
-    		    </div>
-    	    </form>
+    {{ if .OauthSection }}
+        <h1>OAuth Management</h1>
+	    {{ if .OauthAccounts }}
+	        <p>Existing OAuth accounts can be removed from your account.</p>
+	        {{ range $oauth_account := .OauthAccounts }}
+		        <form method="post" action="/me/oauth/remove" autocomplete="false">
+		            <input type="hidden" name="provider" value="{{ $oauth_account.Provider }}" />
+		            <input type="hidden" name="client_id" value="{{ $oauth_account.ClientID }}" />
+		            <input type="hidden" name="remote_user_id" value="{{ $oauth_account.RemoteUserID }}" />
+    		        <div class="option">
+    			        <div class="section">
+        				    <input type="submit" value="Remove {{ $oauth_account.Provider | title }}" style="margin-left: 1em;" />
+    			        </div>
+    		        </div>
+    	        </form>
+            {{ end }}
+	    {{ end }}
+	    {{ if or .OauthSlack .OauthWriteAs }}
+	        <p>
+	        {{ if .OauthSlack }}
+    	        <a class="loginbtn" href="/oauth/slack?attach=t"><img alt="Sign in with Slack" height="40" width="172" src="/img/sign_in_with_slack.png" srcset="/img/sign_in_with_slack.png 1x, /img/sign_in_with_slack@2x.png 2x" /></a>
+            {{ end }}
+            {{ if .OauthWriteAs }}
+                <a class="btn cta loginbtn" id="writeas-login" href="/oauth/write.as?attach=t">Link your <strong>Write.as</strong> account.</a>
+            {{ end }}
+            </p>
         {{ end }}
-	{{ end }}
-	{{ if .OauthSlack }}
-    	<a class="loginbtn" href="/oauth/slack?attach=t"><img alt="Sign in with Slack" height="40" width="172" src="/img/sign_in_with_slack.png" srcset="/img/sign_in_with_slack.png 1x, /img/sign_in_with_slack@2x.png 2x" /></a>
-    {{ end }}
-    {{ if .OauthWriteAs }}
-        <a class="btn cta loginbtn" id="writeas-login" href="/oauth/write.as?attach=t">Link your <strong>Write.as</strong> account.</a>
     {{ end }}
 </div>