Pass information via URL

ory · Aug 30, 2022 · 1f0468f · 1f0468f
1 parent 5367ee9
commit 1f0468f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/consent/strategy_default.go b/consent/strategy_default.go
@@ -230,15 +230,11 @@ func (s *DefaultStrategy) forwardAuthenticationRequest(w http.ResponseWriter, r
 
 	// Generate the request URL
 	iu := s.c.OAuth2AuthURL()
-	iu.RawQuery = r.URL.RawQuery
-
-	// Identify requester type
-	if _, ok := ar.(fosite.AuthorizeRequester); ok {
-		iu = s.c.OAuth2AuthURL()
-	} else if _, ok := ar.(*fosite.DeviceAuthorizeRequest); ok {
+	if _, ok := ar.(*fosite.DeviceAuthorizeRequest); ok {
 		iu = s.c.OAuth2DeviceAuthorisationURL()
 	}
-
+	iu.RawQuery = r.URL.RawQuery
+
 	var idTokenHintClaims jwtgo.MapClaims
 	if idTokenHint := ar.GetRequestForm().Get("id_token_hint"); len(idTokenHint) > 0 {
 		claims, err := s.getIDTokenHintClaims(r.Context(), idTokenHint)

diff --git a/oauth2/handler.go b/oauth2/handler.go
@@ -851,7 +851,7 @@ func (h *Handler) DeviceAuthHandler(w http.ResponseWriter, r *http.Request, _ ht
 
 		// Generate the request URL
 		reqURL := h.c.OAuth2DeviceAuthorisationURL()
-		reqURL.RawQuery = r.URL.RawQuery
+		reqURL.RawQuery = deviceAuthorizeRequest.GetRequestForm().Encode()
 
 		csrf := strings.Replace(uuid.New(), "-", "", -1)
 

diff --git a/persistence/sql/migrations/20220728111500000000_device_authorization_flow.sqlite.up.sql b/persistence/sql/migrations/20220728111500000000_device_authorization_flow.sqlite.up.sql
@@ -11,7 +11,6 @@ CREATE TABLE IF NOT EXISTS hydra_oauth2_device_link_request
     oidc_context              TEXT         NOT NULL,
     login_challenge           VARCHAR(40)  NULL REFERENCES hydra_oauth2_authentication_request (challenge) ON DELETE SET NULL,
     requested_at_audience     TEXT         NOT NULL DEFAULT '',
-    context                   TEXT         NOT NULL DEFAULT '{}',
     UNIQUE (challenge)
 );
 
@@ -35,7 +34,7 @@ CREATE TABLE IF NOT EXISTS hydra_oauth2_device_code
     active              INTEGER      NOT NULL DEFAULT true,
     requested_audience  TEXT         NULL     DEFAULT '',
     granted_audience    TEXT         NULL     DEFAULT '',
-    challenge_id        VARCHAR(40)  NULL     REFERENCES hydra_oauth2_device_link_request (challenge) ON DELETE CASCADE,
+    challenge_id        VARCHAR(40)  NULL     REFERENCES hydra_oauth2_consent_request (challenge) ON DELETE CASCADE,
     UNIQUE (request_id)
 );