Rename access-review migration with random time → Validate PagerDuty subdomain on OAuth callback

- Rename access-review migration with random time
- Move PagerDuty token-response handling to its own file
- Strip OAuth error_description from log and redirect
- Validate PagerDuty subdomain on OAuth callback

Signed-off-by: Aurélien Sibiril <81782+aureliensibiril@users.noreply.github.com>

pkg/connector/oauth2.go

@@ -331,29 +331,11 @@ func (c *OAuth2Connector) CompleteWithState(ctx context.Context, r *http.Request
 		return conn, &payload.Data, err
 	}
 
-	// PagerDuty Scoped OAuth includes the customer's subdomain in the
-	// token response body. We parse it here so the OAuth callback
-	// handler can write it to PagerDutyConnectorSettings without
-	// having to issue a second decode against a now-closed body.
-	if payload.Data.Provider == PagerDutyProvider {
-		var pd struct {
-			Subdomain string `json:"subdomain"`
-		}
-		if err := json.Unmarshal(body, &pd); err == nil && pd.Subdomain != "" {
-			if payload.Data.ProviderMetadata == nil {
-				payload.Data.ProviderMetadata = map[string]string{}
-			}
-			payload.Data.ProviderMetadata["subdomain"] = pd.Subdomain
-		}
-	}
+	AbsorbPagerDutyTokenResponse(&payload.Data, body)
 
 	return &oauth2Conn, &payload.Data, nil
 }
 
-// PagerDutyProvider is the canonical string used by PagerDuty in the
-// state token's `provider` field.
-const PagerDutyProvider = "PAGERDUTY"
-
 func basicAuthHeader(clientID, clientSecret string) string {
 	credentials := clientID + ":" + clientSecret
 	return "Basic " + base64.StdEncoding.EncodeToString([]byte(credentials))
@@ -425,6 +407,12 @@ func (c *OAuth2Connector) buildTokenRequest(ctx context.Context, code, redirectU
 		req.Header.Set("Accept", "application/json")
 		req.Header.Set("User-Agent", "Probo Connector")
 		req.Header.Set("Authorization", basicAuthHeader(c.ClientID, c.ClientSecret))
+		// Deel rejects token-exchange requests that omit the x-client-id
+		// header even when the credentials are correctly Base64-encoded
+		// in the Authorization header. Sending it for every basic-form
+		// provider is harmless — providers that don't expect it ignore
+		// the header.
+		req.Header.Set("x-client-id", c.ClientID)
 		return req, nil
 
 	default:

pkg/connector/pagerduty.go

@@ -0,0 +1,42 @@
+// Copyright (c) 2026 Probo Inc <hello@getprobo.com>.
+//
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+// PERFORMANCE OF THIS SOFTWARE.
+
+package connector
+
+import "encoding/json"
+
+const (
+	PagerDutyProvider = "PAGERDUTY"
+)
+
+// AbsorbPagerDutyTokenResponse extracts the customer subdomain that
+// PagerDuty's Scoped OAuth surfaces in the token-exchange response body
+// and stuffs it into state.ProviderMetadata. The OAuth callback handler
+// later writes that value to PagerDutyConnectorSettings. No-op when the
+// state's provider is not PagerDuty or when the body has no subdomain.
+func AbsorbPagerDutyTokenResponse(state *OAuth2State, body []byte) {
+	if state == nil || state.Provider != PagerDutyProvider {
+		return
+	}
+	var pd struct {
+		Subdomain string `json:"subdomain"`
+	}
+	if err := json.Unmarshal(body, &pd); err != nil || pd.Subdomain == "" {
+		return
+	}
+	if state.ProviderMetadata == nil {
+		state.ProviderMetadata = map[string]string{}
+	}
+	state.ProviderMetadata["subdomain"] = pd.Subdomain
+}