Use JSStr to encapsulate bits of login and API commands

Author: vojtechszocs

pkg/server/tokenrequest/tokenrequest.go

@@ -144,6 +144,18 @@ func (t *tokenRequest) displayTokenPost(osinOAuthClient *osincli.Client, w http.
 	}
 
 	data.AccessToken = accessData.AccessToken
+	data.commandData = commandData{
+		LoginParts: []template.JSStr{
+			"oc login",
+			template.JSStr(fmt.Sprintf("--token=%s", data.AccessToken)),
+			template.JSStr(fmt.Sprintf("--server=%s", data.PublicMasterURL)),
+		},
+		APICallParts: []template.JSStr{
+			"curl",
+			template.JSStr(fmt.Sprintf("-H \"Authorization: Bearer %s\"", data.AccessToken)),
+			template.JSStr(fmt.Sprintf("\"%s/apis/user.openshift.io/v1/users/~\"", data.PublicMasterURL)),
+		},
+	}
 	renderToken(w, data)
 }
 
@@ -175,8 +187,14 @@ type sharedData struct {
 	RequestURL string
 }
 
+type commandData struct {
+	LoginParts   []template.JSStr
+	APICallParts []template.JSStr
+}
+
 type tokenData struct {
 	sharedData
+	commandData
 
 	AccessToken     string
 	PublicMasterURL string
@@ -233,27 +251,16 @@ var tokenTemplate = template.Must(template.New("tokenTemplate").Parse(
   <h2>Your API token is</h2>
   <code>{{.AccessToken}}</code>
 
-  <script>
-    var cmd = {
-      login: 'oc login --token={{.AccessToken}} --server={{.PublicMasterURL}}',
-      api: 'curl -H "Authorization: Bearer {{.AccessToken}}" "{{.PublicMasterURL}}/apis/user.openshift.io/v1/users/~"',
-    };
-  </script>
-
   <h2>Log in with this token</h2>
   <pre>
-    oc login
-    <span class="nowrap">--token={{.AccessToken}}</span>
-    <span class="nowrap">--server={{.PublicMasterURL}}</span>
-    <button onclick="navigator.clipboard.writeText(cmd.login)">Copy</button>
+    {{range $p := .LoginParts}}<span class="nowrap">{{$p}}</span>{{end}}
+    <button onclick="navigator.clipboard.writeText('{{join .LoginParts " "}}')">Copy</button>
   </pre>
 
   <h3>Use this token directly against the API</h3>
   <pre>
-    curl
-    <span class="nowrap">-H "Authorization: Bearer {{.AccessToken}}"</span>
-    <span class="nowrap">"{{.PublicMasterURL}}/apis/user.openshift.io/v1/users/~"</span>
-    <button onclick="navigator.clipboard.writeText(cmd.api)">Copy</button>
+    {{range $p := .APICallParts}}<span class="nowrap">{{$p}}</span>{{end}}
+    <button onclick="navigator.clipboard.writeText('{{join .APICallParts " "}}')">Copy</button>
   </pre>
 {{ end }}