From 341b5b4186384378ed2d423b939057d14189c9f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Tue, 29 Aug 2023 17:04:17 +0200 Subject: [PATCH] drop unnecessary else Co-authored-by: kobergj (cherry picked from commit a4b634cb67a42dd64528b32b55ea5483c40b5c8b) --- ocis-pkg/oidc/client.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ocis-pkg/oidc/client.go b/ocis-pkg/oidc/client.go index bb964a443..5e16d2724 100644 --- a/ocis-pkg/oidc/client.go +++ b/ocis-pkg/oidc/client.go @@ -308,15 +308,14 @@ func (c *oidcClient) verifyAccessTokenJWT(token string) (RegClaimsWithSID, jwt.M return claims, mapClaims, err } - validIssuer := false + issuer := c.issuer if c.provider.AccessTokenIssuer != "" { // AD FS .well-known/openid-configuration has an optional `access_token_issuer` which takes precedence over `issuer` // See https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-oidce/586de7dd-3385-47c7-93a2-935d9e90441c - validIssuer = claims.VerifyIssuer(c.provider.AccessTokenIssuer, true) - } else { - validIssuer = claims.VerifyIssuer(c.issuer, true) + issuer = c.provider.AccessTokenIssuer } - if !validIssuer { + + if !claims.VerifyIssuer(issuer, true) { vErr := jwt.ValidationError{} vErr.Inner = jwt.ErrTokenInvalidIssuer vErr.Errors |= jwt.ValidationErrorIssuer