Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: work js-api signature #818

Merged
merged 16 commits into from
Jan 14, 2025
Merged

fix: work js-api signature #818

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
988ea49
feat: enhance WorkAccessToken to include AgentID for improved token m…
mahongran Jan 3, 2025
dd5f680
refactor: enhance WorkAccessToken to improve cache key handling
mahongran Jan 3, 2025
4b412ef
feat(work): add JsSdk method for JavaScript SDK integration
mahongran Jan 4, 2025
30ed5b6
Merge branch 'v2' into work-js-sdk
mahongran Jan 14, 2025
8c198aa
Merge remote-tracking branch 'upstream/v2' into work-js-sdk
mahongran Jan 14, 2025
2342969
Merge remote-tracking branch 'origin/work-js-sdk' into work-js-sdk
mahongran Jan 14, 2025
1ee33a0
fix gofmt
mahongran Jan 14, 2025
dea8c4b
refactor(jsapi): simplify signature generation in GetConfig and GetAg…
mahongran Jan 14, 2025
87e4bdb
Merge remote-tracking branch 'upstream/v2' into v2
mahongran Jan 14, 2025
3f10bdb
Merge branch 'work-js-sdk' into v2
mahongran Jan 14, 2025
a19cd39
Merge branch 'v2' into work-js-sdk
mahongran Jan 14, 2025
e04c31e
fix gofmt
mahongran Jan 14, 2025
a9c249d
fix gofmt
mahongran Jan 14, 2025
b5d08a2
fix gofmt
mahongran Jan 14, 2025
0828c2c
fix gofmt
mahongran Jan 14, 2025
df83b1b
refactor(js): correct initialization of Config in GetConfig method
mahongran Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions credential/default_access_token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ func (ak *WorkAccessToken) GetAccessTokenContext(ctx context.Context) (accessTok

// 构建缓存key
var accessTokenCacheKey string

if ak.AgentID != "" {
// 如果设置了AgentID，使用新的key格式
accessTokenCacheKey = fmt.Sprintf("%s_access_token_%s_%s", ak.cacheKeyPrefix, ak.CorpID, ak.AgentID)
Expand Down
9 changes: 5 additions & 4 deletions work/jsapi/jsapi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package jsapi

import (
"strconv"

"fmt"
houseme marked this conversation as resolved.
Show resolved Hide resolved
"github.com/silenceper/wechat/v2/credential"
"github.com/silenceper/wechat/v2/util"
"github.com/silenceper/wechat/v2/work/context"
Expand Down Expand Up @@ -49,7 +48,8 @@ func (js *Js) GetConfig(uri string) (config *Config, err error) {
}
config.NonceStr = util.RandomStr(16)
config.Timestamp = util.GetCurrTS()
config.Signature = util.Signature(ticketStr, config.NonceStr, strconv.FormatInt(config.Timestamp, 10), uri)
str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s&timestamp=%d&url=%s", ticketStr, config.NonceStr, config.Timestamp, uri)
config.Signature = util.Signature(str)
return
}

Expand All @@ -68,6 +68,7 @@ func (js *Js) GetAgentConfig(uri string) (config *Config, err error) {
}
config.NonceStr = util.RandomStr(16)
config.Timestamp = util.GetCurrTS()
config.Signature = util.Signature(ticketStr, config.NonceStr, strconv.FormatInt(config.Timestamp, 10), uri)
str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s&timestamp=%d&url=%s", ticketStr, config.NonceStr, config.Timestamp, uri)
config.Signature = util.Signature(str)
return
}