handle well-known routes by server-side

traPtitech · May 8, 2024 · 13c15f4 · 13c15f4
1 parent 68c2454
commit 13c15f4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/dev/Caddyfile b/dev/Caddyfile
@@ -10,12 +10,8 @@ root * /usr/share/caddy
 handle /api/* {
     reverse_proxy backend:3000
 }
-
 handle /.well-known/* {
-    respond 404
-}
-handle /.well-known/change-password {
-    redir * /settings/session
+    reverse_proxy backend:3000
 }
 
 handle {

diff --git a/router/router.go b/router/router.go
@@ -34,9 +34,15 @@ type Router struct {
 func Setup(hub *hub.Hub, db *gorm.DB, repo repository.Repository, ss *service.Services, logger *zap.Logger, config *Config) *echo.Echo {
 	r := newRouter(hub, db, repo, ss, logger.Named("router"), config)
 
-	r.e.GET("/.well-known/openid-configuration", func(c echo.Context) error {
-		return c.Redirect(http.StatusFound, "/api/v3/oauth2/oidc/discovery")
-	})
+	wellKnown := r.e.Group("/.well-known")
+	{
+		wellKnown.GET("/reset-password", func(c echo.Context) error {
+			return c.Redirect(http.StatusFound, "/settings/session")
+		})
+		wellKnown.GET("/openid-configuration", func(c echo.Context) error {
+			return c.Redirect(http.StatusFound, "/api/v3/oauth2/oidc/discovery")
+		})
+	}
 
 	api := r.e.Group("/api")
 	api.GET("/metrics", echoprometheus.NewHandler())