diff --git a/pkg/server/tokenrequest/tokenrequest.go b/pkg/server/tokenrequest/tokenrequest.go index 7ed86387d..5d03f335d 100644 --- a/pkg/server/tokenrequest/tokenrequest.go +++ b/pkg/server/tokenrequest/tokenrequest.go @@ -144,6 +144,8 @@ func (t *tokenRequest) displayTokenPost(osinOAuthClient *osincli.Client, w http. } data.AccessToken = accessData.AccessToken + data.AccessTokenJSStr = template.JSStr(data.AccessToken) + data.PublicMasterURLJSStr = template.JSStr(data.PublicMasterURL) renderToken(w, data) } @@ -178,9 +180,11 @@ type sharedData struct { type tokenData struct { sharedData - AccessToken string - PublicMasterURL string - LogoutURL string + AccessToken string + AccessTokenJSStr template.JSStr + PublicMasterURL string + PublicMasterURLJSStr template.JSStr + LogoutURL string } func getBaseURL(req *http.Request) (*url.URL, error) { @@ -214,6 +218,9 @@ const cssStyle = ` code,pre { font-family: Menlo, Monaco, Consolas, monospace; } code { font-weight: 300; font-size: 1.5em; margin-bottom: 1em; display: inline-block; color: #646464; } pre { padding-left: 1em; border-radius: 5px; color: #003d6e; background-color: #EAEDF0; padding: 1.5em 0 1.5em 4.5em; white-space: normal; text-indent: -2em; } + pre>button { margin-left: 1.5em; margin-right: 1.5em; float: right; } + pre>button:disabled { color: #444; } + pre>button:disabled:hover { text-decoration: none; cursor: default; } a { color: #00f; text-decoration: none; } a:hover { text-decoration: underline; } button { background: none; border: none; color: #00f; text-decoration: none; font: inherit; padding: 0; } @@ -229,14 +236,81 @@ var tokenTemplate = template.Must(template.New("tokenTemplate").Parse( {{ if .Error }} {{ .Error }} {{ else }} + +
{{.AccessToken}}
+
oc login --token={{.AccessToken}} --server={{.PublicMasterURL}}+
curl -H "Authorization: Bearer {{.AccessToken}}" "{{.PublicMasterURL}}/apis/user.openshift.io/v1/users/~"+ + + {{ end }}