Skip to content

Commit d2c70d6

Browse files
author
廖长江
committed
fix: IntrospectAccessTokenOffline and IntrospectToken return type
1 parent 3f8fad1 commit d2c70d6

File tree

3 files changed

+50
-49
lines changed

3 files changed

+50
-49
lines changed

‎authentication/authentication_client.go

+16-7
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ func (client *AuthenticationClient) GetNewAccessTokenByRefreshToken(refreshToken
332332
return string(resp.Body), err
333333
}
334334

335-
func (client *AuthenticationClient) IntrospectToken(token string) (string, error) {
335+
func (client *AuthenticationClient) IntrospectToken(token string) (*dto.IntrospectTokenResult, error) {
336336
url := client.options.AppHost + fmt.Sprintf("/%s/token/introspection", client.options.Protocol)
337337
header := map[string]string{
338338
"Content-Type": "application/x-www-form-urlencoded",
@@ -356,17 +356,26 @@ func (client *AuthenticationClient) IntrospectToken(token string) (string, error
356356
Headers: client.getReqHeaders(header),
357357
ReqDto: body,
358358
})
359-
return string(resp.Body), err
359+
println(string(resp.Body))
360+
var response dto.IntrospectTokenResult
361+
if err != nil {
362+
return nil, err
363+
}
364+
err = json.Unmarshal(resp.Body, &response)
365+
if err != nil {
366+
return nil, err
367+
}
368+
return &response, err
360369
}
361370

362371
// RevokeToken
363372
// 撤回 Access token 或 Refresh token
364-
func (client *AuthenticationClient) RevokeToken(token string) (string, error) {
373+
func (client *AuthenticationClient) RevokeToken(token string) (bool, error) {
365374
if client.options.Protocol != OIDC && client.options.Protocol != OAUTH {
366-
return constant.StringEmpty, errors.New("初始化 AuthenticationClient 时传入的 protocol 参数必须为 ProtocolEnum.OAUTH 或 ProtocolEnum.OIDC，请检查参数")
375+
return false, errors.New("初始化 AuthenticationClient 时传入的 protocol 参数必须为 ProtocolEnum.OAUTH 或 ProtocolEnum.OIDC，请检查参数")
367376
}
368377
if client.options.AppSecret == "" && client.options.TokenEndPointAuthMethod != constant.None {
369-
return constant.StringEmpty, errors.New("请在初始化 AuthenticationClient 时传入 Secret")
378+
return false, errors.New("请在初始化 AuthenticationClient 时传入 Secret")
370379
}
371380

372381
url := client.options.AppHost + fmt.Sprintf("/%s/token/revocation", client.options.Protocol)
@@ -390,13 +399,13 @@ func (client *AuthenticationClient) RevokeToken(token string) (string, error) {
390399
default:
391400
body["client_id"] = client.options.AppId
392401
}
393-
resp, err := client.SendProtocolHttpRequest(&ProtocolRequestOption{
402+
_, err := client.SendProtocolHttpRequest(&ProtocolRequestOption{
394403
Url: url,
395404
Method: fasthttp.MethodPost,
396405
Headers: client.getReqHeaders(header),
397406
ReqDto: body,
398407
})
399-
return string(resp.Body), err
408+
return true, err
400409
}
401410

402411
// 拼接登出 URL

‎authentication/authentication_client_test.go

+24-30
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414

1515
var authenticationClient *AuthenticationClient
1616
var options = AuthenticationClientOptions{
17-
AppId: "635143ae10d1c1b9afb54c39",
18-
AppSecret: "441d87d04bc22a0ac3fc5d7c0736278a",
19-
AppHost: "http://localhost:3000",
20-
RedirectUri: "http://localhost:3003/callback",
17+
AppId: "",
18+
AppSecret: "",
19+
AppHost: "",
20+
RedirectUri: "http://localhost:8989",
2121
InsecureSkipVerify: true,
2222
}
2323

@@ -65,7 +65,7 @@ func TestAuthUrl(t *testing.T) {
6565
Scope: "offline_access " + constant.DefaultScope,
6666
})
6767
if err != nil {
68-
t.Fatalf("构建授权url失败 %v", err)
68+
panic(err)
6969
return
7070
}
7171
println(result.Url)
@@ -111,38 +111,32 @@ func TestAuthUrl(t *testing.T) {
111111
}
112112

113113
func TestCode(t *testing.T) {
114-
tokenResponse, err := authenticationClient.GetAccessTokenByCode("g1FZq2O8y3NzHvn3YwtTW7dau6lJD9Icq2ZTUR88d_a")
114+
tokenResponse, err := authenticationClient.GetAccessTokenByCode("BP7D0_o3Ya0TudEP3VolHVVywFDo_e3DFm-19koxQwy")
115115
if err != nil {
116116
t.Fatalf("code校验失败, %v", err)
117117
return
118118
}
119119
fmt.Println(tokenResponse)
120120
}
121121

122-
func TestAccessToken(t *testing.T) {
123-
accessToken := `eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6I` +
124-
`jROVS13OVZIcmVjU1BuT20zNzJubVF4V0ROV1hQbUQxbDdBckNseXhyVTAifQ.eyJ` +
125-
`qdGkiOiJWeFdMRVJPY0FjSy0xR240Y0M3UGciLCJzdWIiOiI2MjkwNzU3ODliNDI0` +
126-
`M2E1MGY2YzA0NTYiLCJpYXQiOjE2NTUyOTgxNzMsImV4cCI6MTY1NjUwNzc3Mywic` +
127-
`2NvcGUiOiJvcGVuaWQgcHJvZmlsZSIsImlzcyI6Imh0dHBzOi8vbG9jYWx0ZXN0Ln` +
128-
`Rlc3QyLmF1dGhpbmctaW5jLmNvL29pZGMiLCJhdWQiOiI2MmE4NTcwYTg1ODU5ZTI` +
129-
`zOTBlZjM4OGYifQ.c64QBODEI_u1KQJaTi_00kz-zquXBwndwvKSRRc2N0LQBX9Ki` +
130-
`mObyLBLEodkdZH61k-JVtI1IFlyupYB1QxejyxpfsbKMCokJ7JaM4J9l1I4Sre9RZ` +
131-
`5CFrP3I03p0eEGiPSfLx3zBswfTz__b9ClnxyAGy3vqj69j3BZxK139ocnG39LHqg` +
132-
`svZ5thY8w4iwFqZE3lZwKNPRdbaRnC5YyP6Y9M8xP9sQNiRTNxNGZPazCsj1RZWhK` +
133-
`VP8a71QyTydSPccIi6s4-GzusO5iKC2bPEGtjwYaWlIK_C-cJtGhXwoYppbUP5sQV` +
134-
`tVUPTVtbua_KYomBjsVIoGaeadV-cg1TA`
135-
charim, err := authenticationClient.IntrospectAccessTokenOffline(accessToken)
136-
if err != nil {
137-
t.Fatalf("access token 校验失败, %v", err)
138-
return
139-
}
140-
fmt.Println(charim)
141-
user, err1 := authenticationClient.GetUserInfo(accessToken)
142-
if err1 != nil {
143-
t.Fatalf("获取用户信息失败，%v", err1)
144-
}
145-
fmt.Println(user)
122+
func TestIntrospectToken(t *testing.T) {
123+
code := "e1I4h2L-9-BaaL87YKtZgjKxsUHppaPW2jsLCsEokuL"
124+
tokenResponse, _ := authenticationClient.GetAccessTokenByCode(code)
125+
resp1, _ := authenticationClient.IntrospectAccessTokenOffline(tokenResponse.AccessToken)
126+
fmt.Printf("%+v\n", resp1.Id)
127+
resp2, _ := authenticationClient.IntrospectAccessTokenOffline(tokenResponse.RefreshToken)
128+
resp3, _ := authenticationClient.IntrospectAccessTokenOffline(tokenResponse.IDToken)
129+
fmt.Printf("%+v\n", resp1)
130+
fmt.Printf("%+v\n", resp2)
131+
fmt.Printf("%+v\n", resp3)
132+
result1, _ := authenticationClient.IntrospectToken(tokenResponse.AccessToken)
133+
result2, _ := authenticationClient.IntrospectToken(tokenResponse.RefreshToken)
134+
result3, _ := authenticationClient.IntrospectToken(tokenResponse.IDToken)
135+
fmt.Printf("%+v\n", result1)
136+
fmt.Printf("%+v\n", result2)
137+
fmt.Printf("%+v\n", result3)
138+
result4, _ := authenticationClient.RevokeToken(tokenResponse.AccessToken)
139+
fmt.Printf("%+v\n", result4)
146140
}
147141

148142
func TestIDToken(t *testing.T) {

‎dto/TokenIntrospectResponse.go

+10-12
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
package dto
22

3-
4-
type TokenIntrospectResponse struct{
5-
Active bool `json:"active"`
6-
Sub string `json:"sub,omitempty"`
7-
ClientId string `json:"client_id,omitempty"`
8-
Exp int `json:"exp,omitempty"`
9-
Iat int `json:"iat,omitempty"`
10-
Iss string `json:"iss,omitempty"`
11-
Jti string `json:"jti,omitempty"`
12-
Scope string `json:"scope,omitempty"`
13-
TokenType string `json:"token_type,omitempty"`
3+
type IntrospectTokenResult struct {
4+
Active bool `json:"active"`
5+
Sub string `json:"sub,omitempty"`
6+
ClientId string `json:"client_id,omitempty"`
7+
Exp int `json:"exp,omitempty"`
8+
Iat int `json:"iat,omitempty"`
9+
Iss string `json:"iss,omitempty"`
10+
Jti string `json:"jti,omitempty"`
11+
Scope string `json:"scope,omitempty"`
12+
TokenType string `json:"token_type,omitempty"`
1413
}
15-

0 commit comments

Comments
 (0)