wip rework

util/set.go

@@ -0,0 +1,9 @@
+package util
+
+type Set[T comparable] map[T]struct{}
+
+func (s Set[T]) Add(v T) bool {
+	_, present := s[v]
+	s[v] = struct{}{}
+	return !present
+}

web/dev_application_client.go

@@ -15,6 +15,7 @@ import (
 	"net/http"
 	"net/url"
 	"slices"
+	"strings"
 	"time"
 )
 
@@ -68,7 +69,12 @@ func CreateDevApplicationClientEndpoint() echo.HandlerFunc {
 			return echo.NewHTTPError(http.StatusBadRequest, errors.New("displayname must be between 1 and 100 characters"))
 		}
 
-		body.RedirectURIs = util.Unique(body.RedirectURIs)
+		applicationClientId, err := uuid.NewV4()
+		if err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, err)
+		}
+
+		body.RedirectURIs = preprocessRedirectURIs(applicationClientId, body.RedirectURIs)
 		if len(body.RedirectURIs) < 1 || len(body.RedirectURIs) > 50 {
 			return echo.NewHTTPError(http.StatusBadRequest, errors.New("at least one and at most 50 redirect URIs might be added"))
 		}
@@ -78,11 +84,6 @@ func CreateDevApplicationClientEndpoint() echo.HandlerFunc {
 		}
 
 		creationTime := time.Now()
-		applicationClientId, err := uuid.NewV4()
-		if err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, err)
-		}
-
 		clientSecret, err := generateClientSecret()
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, err)
@@ -94,7 +95,6 @@ func CreateDevApplicationClientEndpoint() echo.HandlerFunc {
 		}
 
 		ctx := c.Request().Context()
-
 		var created bool
 		err = rctx.ExecuteTx(ctx, pgx.TxOptions{}, func(tx pgx.Tx) error {
 			const sql = `
@@ -435,6 +435,23 @@ AND application_client_accounts.account_id = app_client_account.account_id
 	})
 }
 
+func preprocessRedirectURIs(clientId uuid.UUID, redirectURIs []string) []string {
+	const placeholder = "$client_id"
+
+	clientIdStr := clientId.String()
+	r := make([]string, 0, len(redirectURIs))
+	unq := make(util.Set[string])
+
+	for _, redirectURI := range redirectURIs {
+		redirectURI = strings.ReplaceAll(redirectURI, placeholder, clientIdStr)
+		if unq.Add(redirectURI) {
+			r = append(r, redirectURI)
+		}
+	}
+
+	return r
+}
+
 func validateRedirectURIs(redirectURIs []string) error {
 	var err error
 	for _, redirectURI := range redirectURIs {