Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

fix: allow cors for grpc gateway handler (#3574)

Ryoa09c66986537
diff --git a/server/router/api/v1/v1.go b/server/router/api/v1/v1.go
index a7b098d49..3170438a4 100644
--- a/server/router/api/v1/v1.go
+++ b/server/router/api/v1/v1.go
@@ -7,6 +7,7 @@ import (
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"github.com/improbable-eng/grpc-web/go/grpcweb"
"github.com/labstack/echo/v4"
+ "github.com/labstack/echo/v4/middleware"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/reflection"
@@ -104,8 +105,12 @@ func (s *APIV1Service) RegisterGateway(ctx context.Context, echoServer *echo.Ech
if err := v1pb.RegisterIdentityProviderServiceHandler(ctx, gwMux, conn); err != nil {
return err
}
- echoServer.Any("/api/v1/*", echo.WrapHandler(gwMux))
- echoServer.Any("/file/*", echo.WrapHandler(gwMux))
+ gwGroup := echoServer.Group("")
+ gwGroup.Use(middleware.CORS())
+ handler := echo.WrapHandler(gwMux)
+
+ gwGroup.Any("/api/v1/*", handler)
+ gwGroup.Any("/file/*", handler)
// GRPC web proxy.
options := []grpcweb.Option{