refactor: introduce api to parse id token from multiple locations

2 files changed, 45 insertions, 30 deletions

diff --git a/app/controllers/dashboard/controller.go b/app/controllers/dashboard/controller.go
index 184a8ed..b0477ba 100644
--- a/app/controllers/dashboard/controller.go
+++ b/app/controllers/dashboard/controller.go
@@ -5,6 +5,7 @@ import (
 	"net/http"
 
 	"github.com/xlgmokha/x/pkg/x"
+	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/domain"
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/key"
 )
 
@@ -60,11 +61,13 @@ func (c *Controller) Show(w http.ResponseWriter, r *http.Request) {
 
 	t := x.Must(template.New("show").Parse(tpl))
 	data := struct {
-		Title    string
-		Sparkles []string
+		Title       string
+		CurrentUser *domain.User
+		Sparkles    []string
 	}{
-		Title:    "SparkleLab",
-		Sparkles: []string{},
+		Title:       "SparkleLab",
+		CurrentUser: currentUser,
+		Sparkles:    []string{},
 	}
 	t.Execute(w, data)
 }
diff --git a/pkg/web/middleware/unpack_token.go b/pkg/web/middleware/unpack_token.go
index db04e0e..d31f9cc 100644
--- a/pkg/web/middleware/unpack_token.go
+++ b/pkg/web/middleware/unpack_token.go
@@ -4,41 +4,53 @@ import (
 	"net/http"
 
 	"github.com/xlgmokha/x/pkg/log"
+	"github.com/xlgmokha/x/pkg/x"
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/key"
 	"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/oidc"
 )
 
-func UnpackToken(cfg *oidc.OpenID) func(http.Handler) http.Handler {
-	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			ctx := r.Context()
-			cookies := r.CookiesNamed("session")
+type TokenParser func(*http.Request) string
 
-			if len(cookies) != 1 {
-				next.ServeHTTP(w, r)
-				return
-			}
+func fromSessionCookie(r *http.Request) string {
+	cookies := r.CookiesNamed("session")
 
-			tokens, err := oidc.TokensFromBase64String(cookies[0].Value)
-			if err != nil {
-				log.WithFields(ctx, log.Fields{"error": err})
-				next.ServeHTTP(w, r)
-				return
-			}
+	if len(cookies) != 1 {
+		return ""
+	}
+
+	tokens, err := oidc.TokensFromBase64String(cookies[0].Value)
+	if err != nil {
+		log.WithFields(r.Context(), log.Fields{"error": err})
+		return ""
+	}
+
+	return tokens.IDToken
+}
 
-			verifier := cfg.Provider.VerifierContext(ctx, cfg.OIDCConfig)
-			idToken, err := verifier.Verify(ctx, tokens.IDToken)
-			if err != nil {
-				log.WithFields(ctx, log.Fields{"error": err})
-				next.ServeHTTP(w, r)
-				return
+func UnpackToken(cfg *oidc.OpenID) func(http.Handler) http.Handler {
+	parsers := []TokenParser{fromSessionCookie}
+
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			for _, parser := range parsers {
+				rawIDToken := parser(r)
+				if !x.IsZero(rawIDToken) {
+					verifier := cfg.Provider.VerifierContext(r.Context(), cfg.OIDCConfig)
+					idToken, err := verifier.Verify(r.Context(), rawIDToken)
+					if err != nil {
+						log.WithFields(r.Context(), log.Fields{"error": err})
+					} else {
+						log.WithFields(r.Context(), log.Fields{"id_token": idToken})
+						next.ServeHTTP(
+							w,
+							r.WithContext(key.IDToken.With(r.Context(), idToken)),
+						)
+						return
+					}
+				}
 			}
 
-			log.WithFields(r.Context(), log.Fields{"id_token": idToken})
-			next.ServeHTTP(
-				w,
-				r.WithContext(key.IDToken.With(r.Context(), idToken)),
-			)
+			next.ServeHTTP(w, r)
 		})
 	}
 }