feat: update

backend/modules/middlewares/m_jwt_parse.go

@@ -20,17 +20,15 @@ func (f *Middlewares) ParseJWT(c fiber.Ctx) error {
 	}
 
 	// query user
-	user, err := f.userSvc.GetByOpenID(c.Context(), claim.OpenID)
+	_, err = f.userSvc.GetByOpenID(c.Context(), claim.OpenID)
 	if err != nil {
 		return errors.Wrap(err, "failed to get user")
 	}
-	claim.UserID = user.ID
 
-	tenantId, err := f.userSvc.GetTenantIDBySlug(c.Context(), claim.Tenant)
+	_, err = f.userSvc.GetTenantBySlug(c.Context(), claim.Tenant)
 	if err != nil {
 		return errors.Wrap(err, "failed to get tenant")
 	}
-	claim.TenantID = tenantId
 
 	c.Locals(consts.CtxKeyJwt, token)
 	c.Locals(consts.CtxKeyClaim, claim)

backend/modules/middlewares/m_wechat_auth_userinfo.go

@@ -1,16 +1,20 @@
 package middlewares
 
 import (
+	"strings"
+
 	"backend/pkg/pg"
 	"backend/providers/jwt"
 
 	"github.com/gofiber/fiber/v3"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"github.com/samber/lo"
 	log "github.com/sirupsen/logrus"
 )
 
 func (f *Middlewares) WeChatAuthUserInfo(c fiber.Ctx) error {
+	// 如果请求存在 Authorization 头，则跳过
 	if len(c.GetReqHeaders()["Authorization"]) != 0 {
 		return c.Next()
 	}
@@ -33,12 +37,19 @@ func (f *Middlewares) WeChatAuthUserInfo(c fiber.Ctx) error {
 		return errors.Wrap(err, "failed to get openid")
 	}
 
-	tenantSlug := c.Path("tenant")
+	paths := lo.Filter(strings.Split(c.Path(), "/"), func(s string, _ int) bool {
+		return s != ""
+	})
+	if len(paths) < 2 || paths[0] != "t" {
+		return errors.New("invalid path")
+	}
+
+	tenantSlug := paths[1]
 	if tenantSlug == "" {
 		return errors.New("tenant is empty")
 	}
 
-	tenantId, err := f.userSvc.GetTenantIDBySlug(c.Context(), tenantSlug)
+	tenant, err := f.userSvc.GetTenantBySlug(c.Context(), tenantSlug)
 	if err != nil {
 		return errors.Wrap(err, "failed to get tenant id")
 	}
@@ -48,7 +59,7 @@ func (f *Middlewares) WeChatAuthUserInfo(c fiber.Ctx) error {
 		return errors.Wrap(err, "failed to copy oauth info")
 	}
 
-	user, err := f.userSvc.GetOrNew(c.Context(), tenantId, token.Openid, oauthInfo)
+	user, err := f.userSvc.GetOrNew(c.Context(), tenant.ID, token.Openid, oauthInfo)
 	if err != nil {
 		return errors.Wrap(err, "failed to get user")
 	}
@@ -61,5 +72,6 @@ func (f *Middlewares) WeChatAuthUserInfo(c fiber.Ctx) error {
 	}
 	_ = jwtToken
 
-	return c.Redirect().To("/")
+	// TODO: send html with jwt token
+	return c.SendString("Tenant: " + tenantSlug)
 }

backend/modules/middlewares/m_wechat_silent_auth.go

@@ -1,6 +1,8 @@
 package middlewares
 
 import (
+	"strings"
+
 	"backend/providers/wechat"
 
 	"github.com/gofiber/fiber/v3"
@@ -16,8 +18,12 @@ func (f *Middlewares) WeChatSilentAuth(c fiber.Ctx) error {
 	}
 
 	// get current full url
-	url := c.BaseURL()
-	url = "https://qvyun.mp.jdwan.com"
+	url := string(c.Request().URI().FullURI())
+	if f.app.IsDevMode() && f.app.BaseURI != nil {
+		url = strings.ReplaceAll(url, "http", "https")
+		url = strings.ReplaceAll(url, c.BaseURL(), *f.app.BaseURI)
+	}
+
 	log.WithField("module", "middleware.SilentAuth").Debug("url:", url)
 
 	to, err := f.client.ScopeAuthorizeURL(

backend/modules/middlewares/mid_debug.go

@@ -5,5 +5,9 @@ import (
 )
 
 func (f *Middlewares) DebugMode(c fiber.Ctx) error {
+	// fullURI := c.Request().URI().FullURI()
+	// host := c.BaseURL()
+	// fmt.Println(strings.Split(c.Path(), "/"))
+	// return c.SendString(c.Params("tenant", "no tenant: "+c.Path()))
 	return c.Next()
 }

backend/modules/middlewares/middlewares.go

@@ -2,6 +2,7 @@ package middlewares
 
 import (
 	"backend/modules/users"
+	"backend/providers/app"
 	"backend/providers/jwt"
 	"backend/providers/wechat"
 
@@ -10,6 +11,7 @@ import (
 
 // @provider
 type Middlewares struct {
+	app     *app.Config
 	client  *wechat.Client
 	userSvc *users.Service
 	jwt     *jwt.JWT

backend/modules/middlewares/provider.gen.go

@@ -2,6 +2,7 @@ package middlewares
 
 import (
 	"backend/modules/users"
+	"backend/providers/app"
 	"backend/providers/jwt"
 	"backend/providers/wechat"
 
@@ -11,11 +12,13 @@ import (
 
 func Provide(opts ...opt.Option) error {
 	if err := container.Container.Provide(func(
+		app *app.Config,
 		client *wechat.Client,
 		jwt *jwt.JWT,
 		userSvc *users.Service,
 	) (*Middlewares, error) {
 		obj := &Middlewares{
+			app:     app,
 			client:  client,
 			jwt:     jwt,
 			userSvc: userSvc,