admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: upgrade servicemesh version (#5792)

Browse Source 
feat: upgrade servicemesh version. (#516)

Signed-off-by: hongzhouzi <hongzhouzi@kubesphere.io>
This commit is contained in:
hongzhouzi
2023-06-27 14:57:42 +08:00
committed by GitHub
parent 528294f843
commit b6ee8c8569
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/simple/client/kiali/client.go
View File

@@ -119,6 +119,9 @@ func (c *Client) authenticate() (*TokenResponse, error) {
if err != nil {
return nil, err
}
// token strategy in kiali:v1.46 writes the token in the cookie
// Related issue: https://github.com/kiali/kiali/issues/4682
token.Token = resp.Header.Get("Set-Cookie")
return &token, nil
}
@@ -156,7 +159,7 @@ func (c *Client) SetToken(req *http.Request) error {
if c.cache != nil {
token, err := c.cache.Get(KialiTokenCacheKey)
if err == nil {
req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token))
req.Header.Set("Cookie", token)
return nil
}
}
@@ -165,7 +168,9 @@ func (c *Client) SetToken(req *http.Request) error {
if err != nil {
return err
}
req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token.Token))
// token strategy in kiali:v1.46 writes the token in the cookie.
// https://github.com/kiali/kiali-operator/blob/v1.50.1/molecule/asserts/token-test/assert-token-access.yml#L47-L56
req.Header.Set("Cookie", token.Token)
if c.cache != nil {
c.cache.Set(KialiTokenCacheKey, token.Token, time.Hour)