a5259fc978
Three follow-ups from review of the registry consolidation:
- Build Vercel's authorization URL with net/url instead of a
hand-rolled "{integration_slug}" placeholder resolved by
strings.ReplaceAll. The slug is escaped via url.PathEscape in a
per-provider Registration.BuildAuthURL closure, and the unused
AuthURLParams plumbing on Registration and OAuth2Connector is
removed (OAuth2Connector now carries a typed IntegrationSlug).
- Drop the SettingsInput union type and the per-provider
MarshalSettings closures. The create resolvers now build the typed
coredata.*ConnectorSettings directly from the gqlgen input, the
same way the OAuth callback path already does, so there is no
shared catch-all DTO and no stringly-typed boundary.
- Restore ConnectorProviders() to a plain ordered slice literal; the
intermediate map + slices.Sort added nondeterminism and a sort for
no benefit.
Signed-off-by: Aurélien Sibiril <81782+aureliensibiril@users.noreply.github.com>
101 lines
3.4 KiB
Go
101 lines
3.4 KiB
Go
// 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 provider_test
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"go.probo.inc/probo/pkg/connector"
|
|
"go.probo.inc/probo/pkg/connector/provider"
|
|
)
|
|
|
|
// TestApplyOAuth2Defaults_AuthURLFromSlug verifies that providers whose
|
|
// authorization URL embeds an operator-supplied slug (Vercel) build it
|
|
// from c.IntegrationSlug via Registration.BuildAuthURL, with the slug
|
|
// percent-escaped. Providers without a BuildAuthURL are unaffected.
|
|
func TestApplyOAuth2Defaults_AuthURLFromSlug(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
t.Run("auth URL is built when an integration slug is supplied", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
r := provider.NewBuiltinRegistry()
|
|
c := &connector.OAuth2Connector{
|
|
ClientID: "id",
|
|
ClientSecret: "secret",
|
|
IntegrationSlug: "acme",
|
|
}
|
|
|
|
require.NoError(t, r.ApplyOAuth2Defaults("VERCEL", "https://example.com/cb", c))
|
|
|
|
assert.Equal(t, "https://vercel.com/integrations/acme/new", c.AuthURL)
|
|
assert.Equal(t, "https://api.vercel.com/v2/oauth/access_token", c.TokenURL)
|
|
})
|
|
|
|
t.Run("slug with reserved characters is percent-escaped", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
r := provider.NewBuiltinRegistry()
|
|
c := &connector.OAuth2Connector{
|
|
ClientID: "id",
|
|
ClientSecret: "secret",
|
|
IntegrationSlug: "a/b c",
|
|
}
|
|
|
|
require.NoError(t, r.ApplyOAuth2Defaults("VERCEL", "https://example.com/cb", c))
|
|
|
|
assert.Equal(t, "https://vercel.com/integrations/a%2Fb%20c/new", c.AuthURL)
|
|
})
|
|
|
|
t.Run("auth URL is empty when no integration slug is supplied", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
r := provider.NewBuiltinRegistry()
|
|
c := &connector.OAuth2Connector{
|
|
ClientID: "id",
|
|
ClientSecret: "secret",
|
|
}
|
|
|
|
require.NoError(t, r.ApplyOAuth2Defaults("VERCEL", "https://example.com/cb", c))
|
|
|
|
// Vercel has no static AuthURL; without a slug there is nothing
|
|
// to build, so the misconfiguration surfaces at the
|
|
// authorization step rather than being silently masked.
|
|
assert.Empty(t, c.AuthURL)
|
|
})
|
|
}
|
|
|
|
// TestApplyOAuth2Defaults_PKCEDefaults asserts that the registered
|
|
// PAGERDUTY provider defaults flip RequiresPKCE on so the downstream
|
|
// Initiate/Complete flow generates a verifier and replays it.
|
|
func TestApplyOAuth2Defaults_PKCEDefaults(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
for _, p := range []string{"PAGERDUTY"} {
|
|
t.Run(p, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
r := provider.NewBuiltinRegistry()
|
|
c := &connector.OAuth2Connector{ClientID: "id", ClientSecret: "secret"}
|
|
require.NoError(t, r.ApplyOAuth2Defaults(p, "https://example.com/cb", c))
|
|
assert.True(t, c.RequiresPKCE,
|
|
"provider %s must enable PKCE so Initiate generates a verifier", p)
|
|
})
|
|
}
|
|
}
|