Merge branch 'main' into feat/storybook-styled-themeing

server/internal/adapter/context.go

@@ -6,6 +6,7 @@ import (
 	"github.com/reearth/reearth/server/internal/usecase"
 	"github.com/reearth/reearth/server/internal/usecase/interfaces"
 	"github.com/reearth/reearth/server/pkg/user"
+	"github.com/reearth/reearthx/appx"
 	"golang.org/x/text/language"
 )
 
@@ -14,7 +15,7 @@ type ContextKey string
 const (
 	contextUser     ContextKey = "user"
 	contextOperator ContextKey = "operator"
-	contextAuthInfo ContextKey = "authinfo"
+	ContextAuthInfo ContextKey = "authinfo"
 	contextUsecases ContextKey = "usecases"
 )
 
@@ -37,10 +38,6 @@ func AttachOperator(ctx context.Context, o *usecase.Operator) context.Context {
 	return context.WithValue(ctx, contextOperator, o)
 }
 
-func AttachAuthInfo(ctx context.Context, a AuthInfo) context.Context {
-	return context.WithValue(ctx, contextAuthInfo, a)
-}
-
 func AttachUsecases(ctx context.Context, u *interfaces.Container) context.Context {
 	ctx = context.WithValue(ctx, contextUsecases, u)
 	return ctx
@@ -82,9 +79,9 @@ func Operator(ctx context.Context) *usecase.Operator {
 	return nil
 }
 
-func GetAuthInfo(ctx context.Context) *AuthInfo {
-	if v := ctx.Value(contextAuthInfo); v != nil {
-		if v2, ok := v.(AuthInfo); ok {
+func GetAuthInfo(ctx context.Context) *appx.AuthInfo {
+	if v := ctx.Value(ContextAuthInfo); v != nil {
+		if v2, ok := v.(appx.AuthInfo); ok {
 			return &v2
 		}
 	}

server/internal/app/app.go

@@ -11,10 +11,13 @@ import (
 	"github.com/99designs/gqlgen/graphql/playground"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
+	"github.com/reearth/reearth/server/internal/adapter"
 	http2 "github.com/reearth/reearth/server/internal/adapter/http"
 	"github.com/reearth/reearth/server/internal/usecase/interactor"
+	"github.com/reearth/reearthx/appx"
 	"github.com/reearth/reearthx/log"
 	"github.com/reearth/reearthx/rerror"
+	"github.com/samber/lo"
 	"go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho"
 )
 
@@ -52,8 +55,7 @@ func initEcho(ctx context.Context, cfg *ServerConfig) *echo.Echo {
 	}
 
 	e.Use(
-		jwtEchoMiddleware(cfg),
-		loadAuthInfoMiddleware(),
+		echo.WrapMiddleware(lo.Must(appx.AuthMiddleware(cfg.Config.JWTProviders(), adapter.ContextAuthInfo, true))),
 		attachOpMiddleware(cfg),
 	)
 

server/internal/app/auth_client.go

@@ -13,6 +13,13 @@ import (
 	"github.com/reearth/reearthx/util"
 )
 
+type contextKey string
+
+const (
+	debugUserHeader            = "X-Reearth-Debug-User"
+	contextUser     contextKey = "reearth_user"
+)
+
 // load user from db and attach it to context along with operator
 // user id can be from debug header or jwt token
 // if its new user, create new user and attach it to context

server/internal/app/config/auth.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/reearth/reearthx/appx"
 	"github.com/samber/lo"
 )
 
@@ -17,6 +18,16 @@ type AuthConfig struct {
 	JWKSURI  *string
 }
 
+func (a AuthConfig) JWTProvider() appx.JWTProvider {
+	return appx.JWTProvider{
+		ISS:     a.ISS,
+		AUD:     a.AUD,
+		ALG:     a.ALG,
+		TTL:     a.TTL,
+		JWKSURI: a.JWKSURI,
+	}
+}
+
 type AuthConfigs []AuthConfig
 
 type AuthProvider interface {
@@ -40,6 +51,10 @@ func (ipd *AuthConfigs) Decode(value string) error {
 	return nil
 }
 
+func (a AuthConfigs) JWTProviders() []appx.JWTProvider {
+	return lo.Map(a, func(a AuthConfig, _ int) appx.JWTProvider { return a.JWTProvider() })
+}
+
 type Auth0Config struct {
 	Domain       string
 	Audience     string
@@ -114,6 +129,9 @@ func prepareUrl(url string) string {
 	if !strings.HasPrefix(url, "https://") && !strings.HasPrefix(url, "http://") {
 		url = "https://" + url
 	}
-	url = strings.TrimSuffix(url, "/")
+	// url = strings.TrimSuffix(url, "/")
+	if !strings.HasSuffix(url, "/") {
+		url = url + "/"
+	}
 	return url
 }

server/internal/app/config/auth_test.go

@@ -9,29 +9,29 @@ import (
 
 func TestAuth0Config_AuthConfigs(t *testing.T) {
 	assert.Equal(t, AuthConfigs{{
-		ISS:      "https://hoge.auth0.com",
+		ISS:      "https://hoge.auth0.com/",
 		AUD:      []string{"xxx"},
 		ClientID: lo.ToPtr("yyy"),
 	}}, Auth0Config{
-		Domain:   "hoge.auth0.com/",
+		Domain:   "hoge.auth0.com",
 		Audience: "xxx",
 		ClientID: "yyy",
 	}.Configs())
 	assert.Equal(t, AuthConfigs{{
-		ISS:      "https://hoge.auth0.com",
+		ISS:      "https://hoge.auth0.com/",
 		AUD:      []string{"xxx"},
 		ClientID: lo.ToPtr("zzz"),
 	}}, Auth0Config{
-		Domain:      "hoge.auth0.com/",
+		Domain:      "hoge.auth0.com",
 		Audience:    "xxx",
 		WebClientID: "zzz",
 	}.Configs())
 	assert.Equal(t, AuthConfigs{{
-		ISS:      "https://hoge.auth0.com",
+		ISS:      "https://hoge.auth0.com/",
 		AUD:      []string{"xxx"},
 		ClientID: lo.ToPtr("zzz"),
 	}, {
-		ISS:      "https://hoge.auth0.com",
+		ISS:      "https://hoge.auth0.com/",
 		AUD:      []string{"xxx"},
 		ClientID: lo.ToPtr("yyy"),
 	}}, Auth0Config{

server/internal/app/config/config.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/joho/godotenv"
 	"github.com/kelseyhightower/envconfig"
+	"github.com/reearth/reearthx/appx"
 	"github.com/reearth/reearthx/log"
 	"github.com/reearth/reearthx/mailer"
 	"github.com/samber/lo"
@@ -156,6 +157,10 @@ func (c Config) Auths() (res AuthConfigs) {
 	return append(res, c.Auth...)
 }
 
+func (c Config) JWTProviders() (res []appx.JWTProvider) {
+	return c.Auths().JWTProviders()
+}
+
 func (c Config) AuthForWeb() *AuthConfig {
 	if ac := c.Auth0.AuthConfigForWeb(); ac != nil {
 		return ac

server/internal/app/config/config_test.go

@@ -42,10 +42,10 @@ func TestReadConfig(t *testing.T) {
 	cfg, err = ReadConfig(false)
 	assert.NoError(t, err)
 	assert.Equal(t, AuthConfigs{
-		{ISS: "https://foo", ClientID: &clientID}, // Auth0
-		{ISS: "hoge", AUD: []string{"foo"}},       // REEARTH_AUTH_*
-		localAuth,                                 // local auth srv
-		{ISS: "bar"},                              // REEARTH_AUTH
+		{ISS: "https://foo/", ClientID: &clientID}, // Auth0
+		{ISS: "hoge", AUD: []string{"foo"}},        // REEARTH_AUTH_*
+		localAuth,                                  // local auth srv
+		{ISS: "bar"},                               // REEARTH_AUTH
 	}, cfg.Auths())
 	assert.Equal(t, "foo", cfg.Auth_AUD)
 	assert.Equal(t, map[string]string{}, cfg.Web)

web/src/beta/lib/core/mantle/evaluator/simple/index.ts

@@ -1,4 +1,4 @@
-import { pick } from "lodash-es";
+import { cloneDeep, pick } from "lodash-es";
 
 import type { EvalContext, EvalResult } from "..";
 import {
@@ -132,7 +132,7 @@ function evalExpression(
   try {
     if (hasExpression(expressionContainer)) {
       const styleExpression = expressionContainer.expression;
-      const parsedFeature = recursiveJSONParse(feature);
+      const parsedFeature = recursiveJSONParse(cloneDeep(feature));
       if (typeof styleExpression === "undefined") {
         return undefined;
       } else if (typeof styleExpression === "object" && styleExpression.conditions) {

web/src/classic/core/mantle/evaluator/simple/index.ts

@@ -1,4 +1,4 @@
-import { pick } from "lodash-es";
+import { cloneDeep, pick } from "lodash-es";
 
 import type { EvalContext, EvalResult } from "..";
 import {
@@ -127,7 +127,7 @@ function evalExpression(
   try {
     if (hasExpression(expressionContainer)) {
       const styleExpression = expressionContainer.expression;
-      const parsedFeature = recursiveJSONParse(feature);
+      const parsedFeature = recursiveJSONParse(cloneDeep(feature));
       if (typeof styleExpression === "undefined") {
         return undefined;
       } else if (typeof styleExpression === "object" && styleExpression.conditions) {