feat: pass client in logout request (#2483)

Closes #2468 Co-authored-by: aeneasr <3372410+aeneasr@users.noreply.github.com>
ory · May 14, 2021 · 43b391d · 43b391d
1 parent 77d1000
commit 43b391d
Show file tree

Hide file tree

Showing 127 changed files with 1,232 additions and 2,836 deletions.
diff --git a/consent/handler.go b/consent/handler.go
@@ -767,6 +767,12 @@ func (h *Handler) GetLogoutRequest(w http.ResponseWriter, r *http.Request, ps ht
 		h.r.Writer().WriteError(w, r, err)
 		return
 	}
+
+	// We do not want to share the secret so remove it.
+	if request.Client != nil {
+		request.Client.Secret = ""
+	}
+
 	if request.WasHandled {
 		h.r.Writer().WriteCode(w, r, http.StatusGone, &RequestWasHandledResponse{
 			RedirectTo: request.RequestURL,

diff --git a/consent/types.go b/consent/types.go
@@ -448,7 +448,7 @@ type LogoutRequest struct {
 	Accepted              bool           `json:"-" db:"accepted"`
 	Rejected              bool           `db:"rejected" json:"-"`
 	ClientID              sql.NullString `json:"-" db:"client_id"`
-	Client                *client.Client `json:"-" db:"-"`
+	Client                *client.Client `json:"client" db:"-"`
 }
 
 func (_ LogoutRequest) TableName() string {

diff --git a/driver/config/serve.go b/driver/config/serve.go
@@ -5,8 +5,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/ory/x/configx"
 	"github.com/rs/cors"
+
+	"github.com/ory/x/configx"
 )
 
 const (

diff --git a/internal/httpclient/client/admin/accept_consent_request_parameters.go b/internal/httpclient/client/admin/accept_consent_request_parameters.go
diff --git a/internal/httpclient/client/admin/accept_consent_request_responses.go b/internal/httpclient/client/admin/accept_consent_request_responses.go
diff --git a/internal/httpclient/client/admin/accept_login_request_parameters.go b/internal/httpclient/client/admin/accept_login_request_parameters.go