Change authentication success page more descriptive (#312)

* Refactor: rename to authcode_browser.go * Change authentication success page more descriptive
int128 · Jun 23, 2020 · 77a6b91 · 77a6b91
1 parent 9e27385
commit 77a6b91
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 0 deletions.
diff --git a/pkg/adaptors/oidcclient/oidcclient.go b/pkg/adaptors/oidcclient/oidcclient.go
@@ -48,6 +48,7 @@ type GetTokenByAuthCodeInput struct {
 	PKCEParams             pkce.Params
 	RedirectURLHostname    string
 	AuthRequestExtraParams map[string]string
+	LocalServerSuccessHTML string
 }
 
 // TokenSet represents an output DTO of
@@ -85,6 +86,7 @@ func (c *client) GetTokenByAuthCode(ctx context.Context, in GetTokenByAuthCodeIn
 		LocalServerBindAddress: in.BindAddress,
 		LocalServerReadyChan:   localServerReadyChan,
 		RedirectURLHostname:    in.RedirectURLHostname,
+		LocalServerSuccessHTML: in.LocalServerSuccessHTML,
 	}
 	token, err := oauth2cli.GetToken(ctx, config)
 	if err != nil {

diff --git a/pkg/templates/authcode_browser.go b/pkg/templates/authcode_browser.go
@@ -0,0 +1,35 @@
+package templates
+
+// AuthCodeBrowserSuccessHTML is the success page on browser based authentication.
+const AuthCodeBrowserSuccessHTML = `
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>Authenticated</title>
+	<script>
+		window.close()
+	</script>
+	<style>
+		body {
+			background-color: #eee;
+			margin: 0;
+			padding: 0;
+			font-family: sans-serif;
+		}
+		.placeholder {
+			margin: 5em;
+			padding: 2em;
+			background-color: #fff;
+			border-radius: 1em;
+		}
+	</style>
+</head>
+<body>
+	<div class="placeholder">
+		<h1>Authenticated</h1>
+		<p>You have logged in to the cluster. You can close this window.</p>
+	</div>
+</body>
+</html>
+`
diff --git a/pkg/templates/httpserver/httpserver.go b/pkg/templates/httpserver/httpserver.go
@@ -0,0 +1,17 @@
+package main
+
+import (
+	"log"
+	"net/http"
+
+	"github.com/int128/kubelogin/pkg/templates"
+)
+
+func main() {
+	http.HandleFunc("/AuthCodeBrowserSuccessHTML", func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Add("content-type", "text/html")
+		_, _ = w.Write([]byte(templates.AuthCodeBrowserSuccessHTML))
+	})
+	log.Printf("http://localhost:8000/AuthCodeBrowserSuccessHTML")
+	log.Fatal(http.ListenAndServe("127.0.0.1:8000", nil))
+}
diff --git a/pkg/templates/package.go b/pkg/templates/package.go
@@ -0,0 +1,6 @@
+// Package templates provides templates such as HTML and messages.
+//
+// You can preview HTML pages by running httpserver package.
+//	go run ./httpserver
+//
+package templates
diff --git a/pkg/usecases/authentication/authcode.go → ...ecases/authentication/authcode_browser.go b/pkg/usecases/authentication/authcode.go → ...ecases/authentication/authcode_browser.go
@@ -8,6 +8,7 @@ import (
 	"github.com/int128/kubelogin/pkg/adaptors/oidcclient"
 	"github.com/int128/kubelogin/pkg/domain/oidc"
 	"github.com/int128/kubelogin/pkg/domain/pkce"
+	"github.com/int128/kubelogin/pkg/templates"
 	"golang.org/x/sync/errgroup"
 	"golang.org/x/xerrors"
 )
@@ -39,6 +40,7 @@ func (u *AuthCode) Do(ctx context.Context, o *AuthCodeOption, client oidcclient.
 		PKCEParams:             p,
 		RedirectURLHostname:    o.RedirectURLHostname,
 		AuthRequestExtraParams: o.AuthRequestExtraParams,
+		LocalServerSuccessHTML: templates.AuthCodeBrowserSuccessHTML,
 	}
 	readyChan := make(chan string, 1)
 	defer close(readyChan)

diff --git a/pkg/usecases/authentication/authcode_test.go → ...s/authentication/authcode_browser_test.go b/pkg/usecases/authentication/authcode_test.go → ...s/authentication/authcode_browser_test.go