Skip to content

Use correct client config to run token cmd #735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danmcp merged 1 commit into from
Jan 23, 2015
Merged

Use correct client config to run token cmd #735

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions pkg/cmd/util/tokencmd/request_token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
kclient "github.com/GoogleCloudPlatform/kubernetes/pkg/client"

"github.com/openshift/origin/pkg/auth/server/tokenrequest"
"github.com/openshift/origin/pkg/client"
"github.com/openshift/origin/pkg/cmd/util/clientcmd"
)

Expand All @@ -31,28 +32,28 @@ type tokenGetterInfo struct {
func RequestToken(clientCfg *clientcmd.Config, reader io.Reader) (string, error) {
tokenGetter := &tokenGetterInfo{}

kubeCfg := clientCfg.KubeConfig()
kubeClient, err := kclient.New(kubeCfg)
osCfg := clientCfg.OpenShiftConfig()
osClient, err := client.New(osCfg)
if err != nil {
return "", err
}

// get the transport, so that we can use it to build our own client that wraps it
// our client understands certain challenges and can respond to them
clientTransport, err := kclient.TransportFor(kubeCfg)
clientTransport, err := kclient.TransportFor(osCfg)
if err != nil {
return "", err
}
httpClient := &http.Client{
Transport: clientTransport,
CheckRedirect: tokenGetter.checkRedirect,
}
kubeClient.Client = &challengingClient{httpClient, reader}
osClient.Client = &challengingClient{httpClient, reader}

_ = kubeClient.Get().AbsPath("oauth").Resource("authorize").Param("response_type", "token").Param("client_id", "openshift-challenging-client").Do()
_ = osClient.Get().AbsPath("oauth").Resource("authorize").Param("response_type", "token").Param("client_id", "openshift-challenging-client").Do()

if len(tokenGetter.accessToken) == 0 {
requestTokenURL := kubeCfg.Host + "/oauth" /* clean up after auth.go dies */ + tokenrequest.RequestTokenEndpoint
requestTokenURL := osCfg.Host + "/oauth" /* clean up after auth.go dies */ + tokenrequest.RequestTokenEndpoint
return "", errors.New("Unable to get token. Try visiting " + requestTokenURL + " for a new token.")
}

Expand Down