feat(connector): support OAuth2 scope preservation and incremental auth

Extend the OAuth2 connector so a reconnect can request the union of
previously granted and newly requested scopes without losing either.
Four related changes:

- Connection gains Scopes() []string so callers no longer need a type
  switch to reach the scope set. OAuth2Connection and APIKeyConnection
  implement it; SlackConnection inherits via embedding.
- OAuth2State carries RequestedScopes and CompleteWithState falls
  back to it when the provider omits the scope field (RFC 6749 §5.1
  allows this when granted equals requested). Without the fallback
  the stored Scope would be empty and the next reconnect would have
  no diff base.
- providerDefinition gains SupportsIncrementalAuth, set only for
  Google Workspace. When the flag is true and the caller passes
  InitiateOptions.IncludeGrantedScopes, the auth URL carries
  include_granted_scopes=true and the prompt=consent param is
  dropped so reuse flows see only the delta consent screen.
- InitiateOptions gains ConnectorID so the reconnect case is passed
  explicitly instead of relying on the caller to mutate r.URL.Query.

Signed-off-by: Aurélien Sibiril <81782+aureliensibiril@users.noreply.github.com>
This commit is contained in:
Aurélien Sibiril
2026-04-09 01:02:49 +02:00
parent 62bab0f732
commit 71f6364df0
5 changed files with 304 additions and 22 deletions

View File

@@ -32,6 +32,13 @@ type (
// a different set of scopes (e.g. SCIM bridge vs access review).
InitiateOptions struct {
Scopes []string
// IncludeGrantedScopes is honored only when the provider has
// SupportsIncrementalAuth=true.
IncludeGrantedScopes bool
// ConnectorID, when set, marks this flow as a reconnect of an
// existing connector: the callback updates the row in place
// instead of creating a new one.
ConnectorID string
}
Connector interface {
@@ -42,6 +49,7 @@ type (
Connection interface {
Type() ProtocolType
Client(ctx context.Context) (*http.Client, error)
Scopes() []string
json.Unmarshaler
json.Marshaler