revert code

reearth · Feb 26, 2025 · 3a07893 · 3a07893
1 parent 9fcd7b2
commit 3a07893
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 19 deletions.
diff --git a/server/internal/app/app.go b/server/internal/app/app.go
@@ -58,24 +58,22 @@ func initEcho(ctx context.Context, cfg *ServerConfig) *echo.Echo {
 	}
 
 	// auth
+	authConfig := cfg.Config.JWTProviders()
+	log.Infof("auth: config: %#v", authConfig)
+
 	var wrapHandler func(http.Handler) http.Handler
 	if cfg.Config.UseMockAuth() {
 		log.Infof("Using mock auth for local development")
 		wrapHandler = func(next http.Handler) http.Handler {
 			return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+
 				ctx := r.Context()
 				ctx = adapter.AttachMockAuth(ctx, true)
 				next.ServeHTTP(w, r.WithContext(ctx))
 			})
 		}
 	} else {
-		authConfig := cfg.Config.JWTProviders()
-		log.Infof("auth: config: %#v", authConfig)
-		if cfg.Config.AuthSrv.Disabled {
-			wrapHandler = lo.Must(AuthMiddlewareDummy())
-		} else {
-			wrapHandler = lo.Must(appx.AuthMiddleware(authConfig, adapter.ContextAuthInfo, true))
-		}
+		wrapHandler = lo.Must(appx.AuthMiddleware(authConfig, adapter.ContextAuthInfo, true))
 	}
 
 	e.Use(echo.WrapMiddleware(wrapHandler))
@@ -161,12 +159,6 @@ func initEcho(ctx context.Context, cfg *ServerConfig) *echo.Echo {
 	return e
 }
 
-func AuthMiddlewareDummy() (func(http.Handler) http.Handler, error) {
-	return func(next http.Handler) http.Handler {
-		return next
-	}, nil
-}
-
 func errorHandler(next func(error, echo.Context)) func(error, echo.Context) {
 	return func(err error, c echo.Context) {
 		if c.Response().Committed {

diff --git a/server/internal/app/auth_client.go b/server/internal/app/auth_client.go
@@ -102,19 +102,15 @@ func attachOpMiddleware(cfg *ServerConfig) echo.MiddlewareFunc {
 
 			if u != nil {
 				ctx = adapter.AttachUser(ctx, u)
-				if u.Name() != "e2e" {
-					log.Debugfc(ctx, "auth: user: id=%s name=%s email=%s", u.ID(), u.Name(), u.Email())
-				}
+				log.Debugfc(ctx, "auth: user: id=%s name=%s email=%s", u.ID(), u.Name(), u.Email())
 
 				op, err := generateOperator(ctx, cfg, u)
 				if err != nil {
 					return err
 				}
 
 				ctx = adapter.AttachOperator(ctx, op)
-				if u.Name() != "e2e" {
-					log.Debugfc(ctx, "auth: op: %#v", op)
-				}
+				log.Debugfc(ctx, "auth: op: %#v", op)
 			}
 
 			ctx = adapter.AttachCurrentHost(ctx, cfg.Config.Host)