Basic logout workflow

internal/route/home.go

@@ -0,0 +1,28 @@
+package route
+
+import (
+	"net/http"
+
+	oidc "forge.cadoles.com/wpetit/goweb-oidc"
+	"github.com/pkg/errors"
+	"gitlab.com/wpetit/goweb/middleware/container"
+	"gitlab.com/wpetit/goweb/service/template"
+)
+
+func serveHomePage(w http.ResponseWriter, r *http.Request) {
+	ctn := container.Must(r.Context())
+	tmpl := template.Must(ctn)
+
+	idToken, _ := oidc.IDToken(w, r)
+
+	if idToken != nil {
+		http.Redirect(w, r, "/profile", http.StatusSeeOther)
+		return
+	}
+
+	data := extendTemplateData(w, r, template.Data{})
+
+	if err := tmpl.RenderPage(w, "home.html.tmpl", data); err != nil {
+		panic(errors.Wrapf(err, "could not render '%s' page", r.URL.Path))
+	}
+}

internal/route/login.go

@@ -1,41 +1,20 @@
 package route
 
 import (
-	"encoding/json"
 	"net/http"
 
 	oidc "forge.cadoles.com/wpetit/goweb-oidc"
-	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/logger"
 	"gitlab.com/wpetit/goweb/middleware/container"
-	"gitlab.com/wpetit/goweb/service/template"
 )
 
-func serveHomePage(w http.ResponseWriter, r *http.Request) {
+func handleLogin(w http.ResponseWriter, r *http.Request) {
 	ctn := container.Must(r.Context())
-	tmpl := template.Must(ctn)
-
-	idToken, err := oidc.IDToken(w, r)
-	if err != nil {
-		panic(errors.Wrap(err, "could not retrieve idToken"))
-	}
-
-	jsonIDToken, err := json.MarshalIndent(idToken, "", " ")
-	if err != nil {
-		panic(errors.Wrap(err, "could not encode idToken"))
-	}
-
-	data := extendTemplateData(w, r, template.Data{
-		"IDToken":     idToken,
-		"JSONIDToken": string(jsonIDToken),
-	})
-
-	if err := tmpl.RenderPage(w, "home.html.tmpl", data); err != nil {
-		panic(errors.Wrapf(err, "could not render '%s' page", r.URL.Path))
-	}
+	client := oidc.Must(ctn)
+	client.Login(w, r)
 }
 
-func handleLogin(w http.ResponseWriter, r *http.Request) {
+func handleLoginCallback(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
 	idToken, err := oidc.IDToken(w, r)

internal/route/logout.go

@@ -23,5 +23,5 @@ func handleLogout(w http.ResponseWriter, r *http.Request) {
 
 	client := oidc.Must(ctn)
 
-	client.Logout(w, r)
+	client.Logout(w, r, "")
 }

internal/route/mount.go

@@ -9,14 +9,16 @@ import (
 )
 
 func Mount(r *chi.Mux, config *config.Config) error {
-	r.Group(func(r chi.Router) {
-		r.Use(oidc.Middleware)
 
-		r.Get("/", serveHomePage)
-	})
-
-	r.With(oidc.HandleCallback).Get("/oauth2/callback", handleLogin)
+	r.With(oidc.HandleCallback).Get("/oauth2/callback", handleLoginCallback)
+	r.Get("/", serveHomePage)
 	r.Get("/logout", handleLogout)
+	r.Get("/login", handleLogin)
+
+	r.Route("/profile", func(r chi.Router) {
+		r.Use(oidc.Middleware)
+		r.Get("/", serveProfilePage)
+	})
 
 	notFoundHandler := r.NotFoundHandler()
 	r.Get("/*", static.Dir(config.HTTP.PublicDir, "", notFoundHandler))

internal/route/profile.go

@@ -0,0 +1,35 @@
+package route
+
+import (
+	"encoding/json"
+	"net/http"
+
+	oidc "forge.cadoles.com/wpetit/goweb-oidc"
+	"github.com/pkg/errors"
+	"gitlab.com/wpetit/goweb/middleware/container"
+	"gitlab.com/wpetit/goweb/service/template"
+)
+
+func serveProfilePage(w http.ResponseWriter, r *http.Request) {
+	ctn := container.Must(r.Context())
+	tmpl := template.Must(ctn)
+
+	idToken, err := oidc.IDToken(w, r)
+	if err != nil {
+		panic(errors.Wrap(err, "could not retrieve idToken"))
+	}
+
+	jsonIDToken, err := json.MarshalIndent(idToken, "", " ")
+	if err != nil {
+		panic(errors.Wrap(err, "could not encode idToken"))
+	}
+
+	data := extendTemplateData(w, r, template.Data{
+		"IDToken":     idToken,
+		"JSONIDToken": string(jsonIDToken),
+	})
+
+	if err := tmpl.RenderPage(w, "profile.html.tmpl", data); err != nil {
+		panic(errors.Wrapf(err, "could not render '%s' page", r.URL.Path))
+	}
+}