trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

providers/oauth2: fix old id_token being sent when using token endpoint with grant_type=refresh_token

This commit is contained in:
Jens Langhammer 2020-12-27 14:28:27 +01:00
parent 885fcff495
commit b747022bc1
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
authentik/providers/oauth2/views/provider.py
View File

@ -7,7 +7,12 @@ from django.views import View
from structlog import get_logger from structlog import get_logger
from authentik.core.models import Application from authentik.core.models import Application
from authentik.providers.oauth2.constants import ACR_AUTHENTIK_DEFAULT, SCOPE_OPENID from authentik.providers.oauth2.constants import (
ACR_AUTHENTIK_DEFAULT,
GRANT_TYPE_AUTHORIZATION_CODE,
GRANT_TYPE_REFRESH_TOKEN,
SCOPE_OPENID,
)
from authentik.providers.oauth2.models import GrantTypes, OAuth2Provider, ScopeMapping from authentik.providers.oauth2.models import GrantTypes, OAuth2Provider, ScopeMapping
LOGGER = get_logger() LOGGER = get_logger()
@ -56,9 +61,9 @@ class ProviderInfoView(View):
) )
), ),
"grant_types_supported": [ "grant_types_supported": [
GrantTypes.AUTHORIZATION_CODE, GRANT_TYPE_AUTHORIZATION_CODE,
GRANT_TYPE_REFRESH_TOKEN,
GrantTypes.IMPLICIT, GrantTypes.IMPLICIT,
GrantTypes.HYBRID,
], ],
"id_token_signing_alg_values_supported": [provider.jwt_alg], "id_token_signing_alg_values_supported": [provider.jwt_alg],
# See: http://openid.net/specs/openid-connect-core-1_0.html#SubjectIDTypes # See: http://openid.net/specs/openid-connect-core-1_0.html#SubjectIDTypes

4
authentik/providers/oauth2/views/token.py
View File

@ -248,9 +248,7 @@ class TokenView(View):
"expires_in": timedelta_from_string( "expires_in": timedelta_from_string(
refresh_token.provider.token_validity refresh_token.provider.token_validity
).seconds, ).seconds,
"id_token": self.params.provider.encode( "id_token": self.params.provider.encode(refresh_token.id_token.to_dict()),
self.params.refresh_token.id_token.to_dict()
),
} }
return dic return dic