feat: update

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)
 }