Merge #49

49: feat: add jsApiTicket, jsApiTicketAgentConfig and refactor(token): accessToken r=xen0n a=w3xse7en

Support  jsApiTicket, jsApiTicketAgentConfig

doc: https://open.work.weixin.qq.com/api/doc/90000/90136/90506

jsApiTicket, jsApiTicketAgentConfig similar with accessToken, they all needs cache in system

so i reference the accesstoken design, refact token to support accessToken, jsApiTicket and jsApiTicketAgentConfig

Co-authored-by: Lyi <zhanghong@zuodashi.com>
Co-authored-by: mew <w3xse7en@outlook.com>
Co-authored-by: w3xse7en <w3xse7en@outlook.com>

Author: 3 people

accesstoken.go

@@ -7,7 +7,6 @@ import (
 	"mime/multipart"
 	"net/url"
 	"sync"
-	"time"
 )
 
 // Workwx 企业微信客户端
@@ -25,12 +24,10 @@ type WorkwxApp struct {
 	// CorpSecret 应用的凭证密钥，必填
 	CorpSecret string
 	// AgentID 应用 ID，必填
-	AgentID int64
-
-	tokenMu        *sync.RWMutex
-	accessToken    string
-	tokenExpiresIn time.Duration
-	lastRefresh    time.Time
+	AgentID                int64
+	accessToken            *token
+	jsapiTicket            *token
+	jsapiTicketAgentConfig *token
 }
 
 // New 构造一个 Workwx 客户端对象，需要提供企业 ID
@@ -50,22 +47,22 @@ func New(corpID string, opts ...CtorOption) *Workwx {
 
 // WithApp 构造本企业下某自建 app 的客户端
 func (c *Workwx) WithApp(corpSecret string, agentID int64) *WorkwxApp {
-	return &WorkwxApp{
+	app := WorkwxApp{
 		Workwx: c,
 
 		CorpSecret: corpSecret,
 		AgentID:    agentID,
 
-		tokenMu:     &sync.RWMutex{},
-		accessToken: "",
-		lastRefresh: time.Time{},
+		accessToken:            &token{mutex: &sync.RWMutex{}},
+		jsapiTicket:            &token{mutex: &sync.RWMutex{}},
+		jsapiTicketAgentConfig: &token{mutex: &sync.RWMutex{}},
 	}
+	app.accessToken.setGetTokenFunc(app.getAccessToken)
+	app.jsapiTicket.setGetTokenFunc(app.getJSAPITicket)
+	app.jsapiTicketAgentConfig.setGetTokenFunc(app.getJSAPITicketAgentConfig)
+	return &app
 }
 
-//
-// impl WorkwxApp
-//
-
 func (c *WorkwxApp) composeQyapiURL(path string, req interface{}) *url.URL {
 	values := url.Values{}
 	if valuer, ok := req.(urlValuer); ok {
@@ -92,19 +89,8 @@ func (c *WorkwxApp) composeQyapiURLWithToken(path string, req interface{}, withA
 		return url
 	}
 
-	// intensive mutex juggling action
-	c.tokenMu.RLock()
-	if c.accessToken == "" {
-		c.tokenMu.RUnlock() // RWMutex doesn't like recursive locking
-		// TODO: what to do with the possible error?
-		_ = c.syncAccessToken()
-		c.tokenMu.RLock()
-	}
-	tokenToUse := c.accessToken
-	c.tokenMu.RUnlock()
-
 	q := url.Query()
-	q.Set("access_token", tokenToUse)
+	q.Set("access_token", c.accessToken.getToken())
 	url.RawQuery = q.Encode()
 
 	return url

apis.md.go

@@ -5,6 +5,8 @@
 Name|Request Type|Response Type|Access Token|URL|Doc
 :---|------------|-------------|------------|:--|:--
 `execGetAccessToken`|`reqAccessToken`|`respAccessToken`|-|`GET /cgi-bin/gettoken`|[获取access_token](https://work.weixin.qq.com/api/doc#90000/90135/91039)
+`execGetJSAPITicket`|`reqJSAPITicket`|`respJSAPITicket`|+|`GET /cgi-bin/get_jsapi_ticket`|[获取企业的jsapi_ticket](https://open.work.weixin.qq.com/api/doc/90000/90136/90506)
+`execGetJSAPITicketAgentConfig`|`reqJSAPITicketAgentConfig`|`respJSAPITicket`|+|`GET /cgi-bin/ticket/get`|[获取应用的jsapi_ticket](https://open.work.weixin.qq.com/api/doc/90000/90136/90506)
 
 # 成员管理
 

client.go

@@ -55,6 +55,31 @@ type respAccessToken struct {
 	ExpiresInSecs int64  `json:"expires_in"`
 }
 
+type reqJSAPITicketAgentConfig struct{}
+
+var _ urlValuer = reqJSAPITicketAgentConfig{}
+
+func (x reqJSAPITicketAgentConfig) intoURLValues() url.Values {
+	return url.Values{
+		"type": {"agent_config"},
+	}
+}
+
+type reqJSAPITicket struct{}
+
+var _ urlValuer = reqJSAPITicket{}
+
+func (x reqJSAPITicket) intoURLValues() url.Values {
+	return url.Values{}
+}
+
+type respJSAPITicket struct {
+	respCommon
+
+	Ticket        string `json:"ticket"`
+	ExpiresInSecs int64  `json:"expires_in"`
+}
+
 // reqMessage 消息发送请求
 type reqMessage struct {
 	ToUser  []string