Merge pull request #436 from cnvergence/fix-client-side-redirect

move client-side-redirect into web app part of kube-bind backend

Author: cnvergence

backend/auth/handler.go

@@ -77,12 +77,11 @@ func (ah *AuthHandler) HandleAuthorize(w http.ResponseWriter, r *http.Request) {
 		}
 	} else {
 		authReq = AuthorizeRequest{
-			RedirectURL:           params.RedirectURL,
-			ClientSideRedirectURL: params.ClientSideRedirectURL,
-			SessionID:             params.SessionID,
-			ClusterID:             params.ClusterID,
-			ClientType:            ClientType(params.ClientType),
-			ConsumerID:            params.ConsumerID,
+			RedirectURL: params.RedirectURL,
+			SessionID:   params.SessionID,
+			ClusterID:   params.ClusterID,
+			ClientType:  ClientType(params.ClientType),
+			ConsumerID:  params.ConsumerID,
 		}
 	}
 
@@ -249,10 +248,9 @@ func (ah *AuthHandler) HandleCallback(w http.ResponseWriter, r *http.Request) {
 	http.SetCookie(w, session.MakeCookie(r, cookieName, encoded, secure, 1*time.Hour))
 
 	clientParams := &client.ClientParameters{
-		ClusterID:             authCode.ClusterID,
-		ClientSideRedirectURL: authCode.ClientSideRedirectURL,
-		RedirectURL:           authCode.RedirectURL,
-		SessionID:             authCode.SessionID,
+		ClusterID:   authCode.ClusterID,
+		RedirectURL: authCode.RedirectURL,
+		SessionID:   authCode.SessionID,
 	}
 	url := clientParams.WithParams(authCode.RedirectURL)
 

backend/auth/types.go

@@ -45,16 +45,12 @@ type TokenResponse struct {
 	ClusterID string `json:"cluster_id,omitempty"`
 }
 
-// TODO: We should remove client_side_redirect_url.
-// https://github.com/kube-bind/kube-bind/issues/362
-
 type AuthorizeRequest struct {
-	RedirectURL           string     `json:"redirect_url" form:"redirect_url"`
-	ClientSideRedirectURL string     `json:"client_side_redirect_url" form:"client_side_redirect_url"`
-	SessionID             string     `json:"session_id" form:"session_id"`
-	ClusterID             string     `json:"cluster_id" form:"cluster_id"`
-	ClientType            ClientType `json:"client_type" form:"client_type"`
-	ConsumerID            string     `json:"consumer_id" form:"consumer_id"`
+	RedirectURL string     `json:"redirect_url" form:"redirect_url"`
+	SessionID   string     `json:"session_id" form:"session_id"`
+	ClusterID   string     `json:"cluster_id" form:"cluster_id"`
+	ClientType  ClientType `json:"client_type" form:"client_type"`
+	ConsumerID  string     `json:"consumer_id" form:"consumer_id"`
 }
 
 type CallbackRequest struct {

backend/client/client.go

@@ -24,24 +24,21 @@ import (
 type ClientParameters struct {
 	ClusterID   string
 	RedirectURL string
-	// This is clients side redirect, in example used for CLI via UI.
-	ClientSideRedirectURL string
-	SessionID             string
-	ClientType            string
-	ConsumerID            string
+	SessionID   string
+	ClientType  string
+	ConsumerID  string
 
 	IsClusterScoped bool
 }
 
 // GetQueryParams extracts the client parameters from the given HTTP request.
 func GetQueryParams(r *http.Request) *ClientParameters {
 	p := &ClientParameters{
-		ClusterID:             r.URL.Query().Get("cluster_id"),
-		RedirectURL:           r.URL.Query().Get("redirect_url"),
-		ClientSideRedirectURL: r.URL.Query().Get("client_side_redirect_url"),
-		SessionID:             r.URL.Query().Get("session_id"),
-		ClientType:            r.URL.Query().Get("client_type"),
-		ConsumerID:            r.URL.Query().Get("consumer_id"),
+		ClusterID:   r.URL.Query().Get("cluster_id"),
+		RedirectURL: r.URL.Query().Get("redirect_url"),
+		SessionID:   r.URL.Query().Get("session_id"),
+		ClientType:  r.URL.Query().Get("client_type"),
+		ConsumerID:  r.URL.Query().Get("consumer_id"),
 	}
 	p.IsClusterScoped = p.ClusterID != ""
 	return p
@@ -61,9 +58,6 @@ func (r *ClientParameters) WithParams(urlStr string) string {
 	if r.ClusterID != "" {
 		query.Set("cluster_id", r.ClusterID)
 	}
-	if r.ClientSideRedirectURL != "" {
-		query.Set("redirect_url", r.ClientSideRedirectURL)
-	}
 	if r.SessionID != "" {
 		query.Set("session_id", r.SessionID)
 	}