Skip to content

K
k3s
Commit 08a465bd authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #53001 from ericchiang/oidc-refresh-token-error-message

Automatic merge from submit-queue (batch tested with PRs 51759, 53001, 52806). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.. oidc client auth: better error when refresh response is missing id_token /kind cleanup @kubernetes/sig-auth-pr-reviews Updates https://github.com/kubernetes/kubernetes/issues/36847 ```release-notes NONE ```
parents c3b443b4 a8914b73
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
staging/src/k8s.io/client-go/plugin/pkg/client/auth/oidc/oidc.go
View file @ 08a465bd
...@@ -258,7 +258,11 @@ func (p *oidcAuthProvider) idToken() (string, error) { ...@@ -258,7 +258,11 @@ func (p *oidcAuthProvider) idToken() (string, error) {
idToken, ok := token.Extra("id_token").(string) idToken, ok := token.Extra("id_token").(string)
if !ok { if !ok {
return "", fmt.Errorf("token response did not contain an id_token") // id_token isn't a required part of a refresh token response, so some
// providers (Okta) don't return this value.
//
// See https://github.com/kubernetes/kubernetes/issues/36847
return "", fmt.Errorf("token response did not contain an id_token, either the scope \"openid\" wasn't requested upon login, or the provider doesn't support id_tokens as part of the refresh response.")
} }
// Create a new config to persist. // Create a new config to persist.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment