fix: issues

backend/config.toml

@@ -23,7 +23,11 @@ AppId = "wx45745a8c51091ae0"
 AppSecret = "2ab33bc79d9b47efa4abef19d66e1977"
 Token = "W8Xhw5TivYBgY"
 AesKey = "F6AqCxAV4W1eCrY6llJ2zapphKK49CQN3RgtPDrjhnI"
+DevMode = true
 
+[JWT]
+ExpiresTime = "168h"
+SignKey = "LiXi.Y@140202"
 
 [HashIDs]
 Salt = "LiXi.Y@140202"

backend/main_test.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"encoding/json"
 	"testing"
 
 	"backend/common/service/model"
@@ -32,3 +33,33 @@ func Test_GenModel2(t *testing.T) {
 
 	t.Logf("%+v", oauthInfo)
 }
+
+type Response struct {
+	ErrCode int `json:"errcode"`
+}
+
+func (r *Response) Error() error {
+	return nil
+}
+
+type Access struct {
+	Response
+	AccessToken string `json:"access_token"`
+}
+
+func Test_Data(t *testing.T) {
+	data := &Access{
+		Response: Response{
+			ErrCode: 0,
+		},
+		AccessToken: "123",
+	}
+	b, err := json.Marshal(data)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	data.Error()
+
+	t.Logf("%s", b)
+}

backend/modules/middlewares/m_wechat_auth_userinfo.go

@@ -19,6 +19,7 @@ func (f *Middlewares) WeChatAuthUserInfo(c fiber.Ctx) error {
 		return c.Next()
 	}
 
+	log.WithField("module", "middleware.AuthUserInfo").Debugf("query: %v", c.Queries())
 	state := c.Query("state")
 	code := c.Query("code")
 
@@ -29,13 +30,14 @@ func (f *Middlewares) WeChatAuthUserInfo(c fiber.Ctx) error {
 	if state != "sns_basic_auth" {
 		return c.Next()
 	}
-	log.WithField("module", "middleware.AuthUserInfo").Debug("code", code)
+	log.WithField("module", "middleware.AuthUserInfo").Debugf("code: %s, state: %s", code, state)
 
 	// get the openid
 	token, err := f.client.AuthorizeCode2Token(code)
 	if err != nil {
 		return errors.Wrap(err, "failed to get openid")
 	}
+	log.Debugf("tokenInfo %+v", token)
 
 	paths := lo.Filter(strings.Split(c.Path(), "/"), func(s string, _ int) bool {
 		return s != ""
@@ -58,20 +60,24 @@ func (f *Middlewares) WeChatAuthUserInfo(c fiber.Ctx) error {
 	if err := copier.Copy(&oauthInfo, token); err != nil {
 		return errors.Wrap(err, "failed to copy oauth info")
 	}
+	log.Debugf("oauthInfo %+v", oauthInfo)
 
 	user, err := f.userSvc.GetOrNew(c.Context(), tenant.ID, token.Openid, oauthInfo)
 	if err != nil {
 		return errors.Wrap(err, "failed to get user")
 	}
 
-	claim := f.jwt.CreateClaims(jwt.BaseClaims{OpenID: user.OpenID})
+	claim := f.jwt.CreateClaims(jwt.BaseClaims{
-	claim.ID = user.OpenID
+		OpenID:   user.OpenID,
+		Tenant:   tenantSlug,
+		UserID:   user.ID,
+		TenantID: tenant.ID,
+	})
 	jwtToken, err := f.jwt.CreateToken(claim)
 	if err != nil {
 		return errors.Wrap(err, "failed to create token")
 	}
-	_ = jwtToken
 
 	// TODO: send html with jwt token
-	return c.SendString("Tenant: " + tenantSlug)
+	return c.SendString(jwtToken)
 }

backend/modules/users/controller.go

@@ -9,6 +9,6 @@ type Controller struct {
 
 // List
 func (c *Controller) List(ctx fiber.Ctx) error {
-	return ctx.SendString(ctx.Params("tenant", "no tenant"))
+	return ctx.SendString(ctx.Params("tenant", "no user"))
 	return ctx.JSON(nil)
 }

backend/modules/users/service.go

@@ -161,7 +161,7 @@ func (svc *Service) TenantHasUser(ctx context.Context, userID, tenantID int64) (
 
 	tbl := table.UsersTenants
 	stmt := tbl.
-		SELECT(COUNT(tbl.ID)).
+		SELECT(COUNT(tbl.ID).AS("cnt")).
 		WHERE(
 			tbl.UserID.EQ(Int64(userID)).AND(
 				tbl.TenantID.EQ(Int64(tenantID)),
@@ -169,12 +169,14 @@ func (svc *Service) TenantHasUser(ctx context.Context, userID, tenantID int64) (
 		)
 	log.Debug(stmt.DebugSql())
 
-	var cnt int
+	var result struct {
-	if err := stmt.QueryContext(ctx, db.FromContext(ctx, svc.db), &cnt); err != nil {
+		cnt int64
+	}
+	if err := stmt.QueryContext(ctx, db.FromContext(ctx, svc.db), &result); err != nil {
 		return false, errors.Wrap(err, "failed to query user-tenant relation")
 	}
 
-	return cnt > 0, nil
+	return result.cnt > 0, nil
 }
 
 // CreateTenantUser

backend/providers/wechat/errors.go

@@ -23,8 +23,12 @@ import "github.com/pkg/errors"
 // 10013	state不能为空
 // 10015	公众号未授权第三方平台，请检查授权状态
 // 10016	不支持微信开放平台的Appid，请使用公众号Appid
-func translateError(errCode int) error {
+func translateError(errCode int, msg string) error {
-	errors := map[int]error{
+	if errCode == 0 {
+		return nil
+	}
+
+	errs := map[int]error{
 		0:     nil,
 		-1:    errors.New("系统繁忙，此时请开发者稍候再试"),
 		40001: errors.New("AppSecret错误或者AppSecret不属于这个公众号，请开发者确认AppSecret的正确性"),
@@ -48,8 +52,8 @@ func translateError(errCode int) error {
 		10016: errors.New("不支持微信开放平台的Appid，请使用公众号Appid"),
 	}
 
-	if err, ok := errors[errCode]; ok {
+	if err, ok := errs[errCode]; ok {
 		return err
 	}
-	return nil
+	return errors.New(msg)
 }

backend/providers/wechat/response.go

@@ -1,16 +1,16 @@
 package wechat
 
-type Response struct {
+type ErrorResponse struct {
-	ErrCode     int `json:"errcode"`
+	ErrCode int    `json:"errcode,omitempty"`
-	ErrMsg      int `json:"errmsg"`
+	ErrMsg  string `json:"errmsg,omitempty"`
-	ErrDescribe int `json:"-"`
 }
 
-func (r *Response) Error() error {
+func (r *ErrorResponse) Error() error {
-	return translateError(r.ErrCode)
+	return translateError(r.ErrCode, r.ErrMsg)
 }
 
 type AccessTokenResponse struct {
-	AccessToken string `json:"access_token"`
+	ErrorResponse
-	ExpiresIn   int    `json:"expires_in"` // seconds
+	AccessToken string `json:"access_token,omitempty"`
+	ExpiresIn   int    `json:"expires_in,omitempty"` // seconds
 }

backend/providers/wechat/wechat.go

@@ -80,13 +80,22 @@ func (we *Client) GetAccessToken() (*AccessTokenResponse, error) {
 		"grant_type": "client_credential",
 	}
 
-	var data AccessTokenResponse
+	var data ErrorResponse
-	_, err := we.client.R().SetSuccessResult(&data).SetQueryParams(params).Get("/cgi-bin/token")
+	resp, err := we.client.R().SetSuccessResult(&data).SetQueryParams(params).Get("/cgi-bin/token")
 	if err != nil {
 		return nil, errors.Wrap(err, "call /cgi-bin/token failed")
 	}
 
-	return &data, nil
+	if data.ErrCode != 0 {
+		return nil, data.Error()
+	}
+
+	var token AccessTokenResponse
+	if err := resp.Unmarshal(&token); err != nil {
+		return nil, errors.Wrap(err, "parse response failed")
+	}
+
+	return &token, nil
 }
 
 // ScopeAuthorizeURL
@@ -115,13 +124,14 @@ func (we *Client) ScopeAuthorizeURL(opts ...ScopeAuthorizeURLOptions) (*url.URL,
 }
 
 type AuthorizeAccessToken struct {
-	AccessToken    string `json:"access_token"`
+	ErrorResponse
-	ExpiresIn      int64  `json:"expires_in"`
+	AccessToken    string `json:"access_token,omitempty"`
-	IsSnapshotuser int64  `json:"is_snapshotuser"`
+	ExpiresIn      int64  `json:"expires_in,omitempty"`
-	Openid         string `json:"openid"`
+	IsSnapshotuser int64  `json:"is_snapshotuser,omitempty"`
-	RefreshToken   string `json:"refresh_token"`
+	Openid         string `json:"openid,omitempty"`
-	Scope          string `json:"scope"`
+	RefreshToken   string `json:"refresh_token,omitempty"`
-	Unionid        string `json:"unionid"`
+	Scope          string `json:"scope,omitempty"`
+	Unionid        string `json:"unionid,omitempty"`
 }
 
 func (we *Client) AuthorizeCode2Token(code string) (*AuthorizeAccessToken, error) {
@@ -136,6 +146,10 @@ func (we *Client) AuthorizeCode2Token(code string) (*AuthorizeAccessToken, error
 		return nil, errors.Wrap(err, "call /sns/oauth2/access_token failed")
 	}
 
+	if err := data.Error(); err != nil {
+		return nil, err
+	}
+
 	return &data, nil
 }
 
@@ -151,19 +165,24 @@ func (we *Client) AuthorizeRefreshAccessToken(accessToken string) (*AuthorizeAcc
 		return nil, errors.Wrap(err, "call /sns/oauth2/refresh_token failed")
 	}
 
+	if err := data.Error(); err != nil {
+		return nil, err
+	}
+
 	return &data, nil
 }
 
 type AuthorizeUserInfo struct {
-	City       string   `json:"city"`
+	ErrorResponse
-	Country    string   `json:"country"`
+	City       string   `json:"city,omitempty"`
-	Headimgurl string   `json:"headimgurl"`
+	Country    string   `json:"country,omitempty"`
-	Nickname   string   `json:"nickname"`
+	Headimgurl string   `json:"headimgurl,omitempty"`
-	Openid     string   `json:"openid"`
+	Nickname   string   `json:"nickname,omitempty"`
-	Privilege  []string `json:"privilege"`
+	Openid     string   `json:"openid,omitempty"`
-	Province   string   `json:"province"`
+	Privilege  []string `json:"privilege,omitempty"`
-	Sex        int64    `json:"sex"`
+	Province   string   `json:"province,omitempty"`
-	Unionid    string   `json:"unionid"`
+	Sex        int64    `json:"sex,omitempty"`
+	Unionid    string   `json:"unionid,omitempty"`
 }
 
 func (we *Client) AuthorizeUserInfo(accessToken, openID string) (*AuthorizeUserInfo, error) {
@@ -178,5 +197,9 @@ func (we *Client) AuthorizeUserInfo(accessToken, openID string) (*AuthorizeUserI
 		return nil, errors.Wrap(err, "call /sns/userinfo failed")
 	}
 
+	if err := data.Error(); err != nil {
+		return nil, err
+	}
+
 	return &data, nil
 }