feat: async backchannel logout (#2849)

Co-authored-by: aeneasr <[email protected]>
ory · Apr 28, 2022 · 22e1ebb · 22e1ebb
1 parent 152bddd
commit 22e1ebb
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/consent/strategy_default.go b/consent/strategy_default.go
@@ -26,7 +26,6 @@ import (
 	"net/url"
 	"strconv"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/ory/hydra/driver/config"
@@ -696,12 +695,9 @@ func (s *DefaultStrategy) executeBackChannelLogout(ctx context.Context, r *http.
 		tasks = append(tasks, task{url: c.BackChannelLogoutURI, clientID: c.OutfacingID, token: t})
 	}
 
-	var wg sync.WaitGroup
 	hc := httpx.NewResilientClient()
-	wg.Add(len(tasks))
 
 	var execute = func(t task) {
-		defer wg.Done()
 		log := s.r.Logger().WithRequest(r).
 			WithField("client_id", t.clientID).
 			WithField("backchannel_logout_url", t.url)
@@ -726,8 +722,6 @@ func (s *DefaultStrategy) executeBackChannelLogout(ctx context.Context, r *http.
 		go execute(t)
 	}
 
-	wg.Wait()
-
 	return nil
 }
 

diff --git a/internal/httpclient-next/api/openapi.yaml b/internal/httpclient-next/api/openapi.yaml
@@ -1653,6 +1653,8 @@ paths:
 
         https://openid.net/specs/openid-connect-frontchannel-1_0.html
         https://openid.net/specs/openid-connect-backchannel-1_0.html
+
+        Back-channel logout is performed asynchronously and does not affect logout flow.
       operationId: disconnectUser
       responses:
         "302":

diff --git a/internal/httpclient-next/api_public.go b/internal/httpclient-next/api_public.go
diff --git a/internal/httpclient/client/public/public_client.go b/internal/httpclient/client/public/public_client.go
diff --git a/oauth2/handler.go b/oauth2/handler.go
@@ -121,6 +121,8 @@ func (h *Handler) SetRoutes(admin *x.RouterAdmin, public *x.RouterPublic, corsMi
 // - https://openid.net/specs/openid-connect-frontchannel-1_0.html
 // - https://openid.net/specs/openid-connect-backchannel-1_0.html
 //
+// Back-channel logout is performed asynchronously and does not affect logout flow.
+//
 //     Schemes: http, https
 //
 //     Responses:

diff --git a/spec/api.json b/spec/api.json
@@ -3411,7 +3411,7 @@
     },
     "/oauth2/sessions/logout": {
       "get": {
-        "description": "This endpoint initiates and completes user logout at Ory Hydra and initiates OpenID Connect Front-/Back-channel logout:\n\nhttps://openid.net/specs/openid-connect-frontchannel-1_0.html\nhttps://openid.net/specs/openid-connect-backchannel-1_0.html",
+        "description": "This endpoint initiates and completes user logout at Ory Hydra and initiates OpenID Connect Front-/Back-channel logout:\n\nhttps://openid.net/specs/openid-connect-frontchannel-1_0.html\nhttps://openid.net/specs/openid-connect-backchannel-1_0.html\n\nBack-channel logout is performed asynchronously and does not affect logout flow.",
         "operationId": "disconnectUser",
         "responses": {
           "302": {

diff --git a/spec/swagger.json b/spec/swagger.json
@@ -1846,7 +1846,7 @@
     },
     "/oauth2/sessions/logout": {
       "get": {
-        "description": "This endpoint initiates and completes user logout at Ory Hydra and initiates OpenID Connect Front-/Back-channel logout:\n\nhttps://openid.net/specs/openid-connect-frontchannel-1_0.html\nhttps://openid.net/specs/openid-connect-backchannel-1_0.html",
+        "description": "This endpoint initiates and completes user logout at Ory Hydra and initiates OpenID Connect Front-/Back-channel logout:\n\nhttps://openid.net/specs/openid-connect-frontchannel-1_0.html\nhttps://openid.net/specs/openid-connect-backchannel-1_0.html\n\nBack-channel logout is performed asynchronously and does not affect logout flow.",
         "schemes": [
           "http",
           "https"