From c68e9650c42d77e62db023a2d7dedea82f41869a Mon Sep 17 00:00:00 2001 From: Andrew Martinez Date: Tue, 16 Jul 2024 09:59:59 -0400 Subject: [PATCH 1/2] fixes #593 wrong id value from api session --- edge-apis/authwrapper.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/edge-apis/authwrapper.go b/edge-apis/authwrapper.go index b9f12f18..30eb832d 100644 --- a/edge-apis/authwrapper.go +++ b/edge-apis/authwrapper.go @@ -161,7 +161,8 @@ func (a *ApiSessionOidc) RequiresRouterTokenUpdate() bool { func (a *ApiSessionOidc) GetAccessClaims() (*ApiAccessClaims, error) { claims := &ApiAccessClaims{} - err := json.Unmarshal([]byte(a.OidcTokens.AccessToken), claims) + parser := jwt.NewParser() + _, _, err := parser.ParseUnverified(a.OidcTokens.AccessToken, claims) if err != nil { return nil, err @@ -177,7 +178,7 @@ func (a *ApiSessionOidc) GetId() string { return "" } - return claims.ID + return claims.ApiSessionId } func (a *ApiSessionOidc) GetIdentityName() string { From be85f0c64322f0e7af7b3fb911f49218ce658915 Mon Sep 17 00:00:00 2001 From: Andrew Martinez Date: Tue, 16 Jul 2024 10:05:57 -0400 Subject: [PATCH 2/2] bump version --- ziti/sdkinfo/build_info.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ziti/sdkinfo/build_info.go b/ziti/sdkinfo/build_info.go index a46d702a..dbc73a00 100644 --- a/ziti/sdkinfo/build_info.go +++ b/ziti/sdkinfo/build_info.go @@ -20,5 +20,5 @@ package sdkinfo const ( - Version = "v0.23.38" + Version = "v0.23.39" )