Skip to content

fix: fetch enabled_clients from the dedicated endpoint #1532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ramya18101 merged 6 commits into from
Jun 6, 2026
+89 −48
Merged

fix: fetch enabled_clients from the dedicated endpoint #1532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0625dba
fix: treat nil enabled_clients as enabled for all apps
davidlovas May 27, 2026
649385b
fix: use ReadEnabledClients endpoint instead of deprecated enabled_cl…
davidlovas Jun 2, 2026
ee2dd8e
test: update mock expectations for ReadEnabledClients
davidlovas Jun 2, 2026
8a08572
Simplify: remove nil check, treat nil and empty the same as zero enab…
davidlovas Jun 5, 2026
d1a85c8
Fix godot lint: capitalize comment, add trailing period
davidlovas Jun 6, 2026
b40c385
Merge branch 'main' into fix/nil-enabled-clients-check
ramya18101 Jun 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions internal/auth0/connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,7 @@ type ConnectionAPI interface {

// List all connections.
List(ctx context.Context, opts ...management.RequestOption) (ul *management.ConnectionList, err error)

// ReadEnabledClients retrieves the enabled clients for a connection.
ReadEnabledClients(ctx context.Context, id string, opts ...management.RequestOption) (c *management.ConnectionEnabledClientList, err error)
}
20 changes: 20 additions & 0 deletions internal/auth0/mock/connection_mock.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 28 additions & 5 deletions internal/cli/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,11 @@ func createUserCmd(cli *cli) *cobra.Command {
return fmt.Errorf("failed to find connection with name %q: %w", inputs.connectionName, err)
}

if len(connection.GetEnabledClients()) == 0 {
hasClients, err := connectionHasEnabledClients(cmd.Context(), cli.api.Connection, connection.GetID())
if err != nil {
return fmt.Errorf("failed to check enabled clients for connection %q: %w", inputs.connectionName, err)
}
if !hasClients {
return fmt.Errorf(
"failed to continue due to the connection with name %q being disabled, enable an application on this connection and try again",
inputs.connectionName,
Expand Down Expand Up @@ -894,15 +898,19 @@ The file size limit for a bulk import is 500KB. You will need to start multiple
return fmt.Errorf("failed to read connection with name %q: %w", inputs.ConnectionName, err)
}

if len(connection.GetEnabledClients()) == 0 {
inputs.ConnectionID = connection.GetID()

hasClients, err := connectionHasEnabledClients(cmd.Context(), cli.api.Connection, inputs.ConnectionID)
if err != nil {
return fmt.Errorf("failed to check enabled clients for connection %q: %w", inputs.ConnectionName, err)
}
if !hasClients {
return fmt.Errorf(
"failed to continue due to the connection with name %q being disabled, enable an application on this connection and try again",
inputs.ConnectionName,
)
}

inputs.ConnectionID = connection.GetID()

pipedUsersBody := iostream.PipedInput()
if len(pipedUsersBody) > 0 && inputs.UsersBody == "" {
inputs.UsersBody = string(pipedUsersBody)
Expand Down Expand Up @@ -996,7 +1004,11 @@ func (c *cli) databaseAndPasswordlessConnectionOptions(ctx context.Context) ([]s

var connectionNames []string
for _, connection := range connectionList.Connections {
if len(connection.GetEnabledClients()) == 0 {
hasClients, err := connectionHasEnabledClients(ctx, c.api.Connection, connection.GetID())
if err != nil {
continue
}
if !hasClients {
continue
}

Expand All @@ -1010,6 +1022,17 @@ func (c *cli) databaseAndPasswordlessConnectionOptions(ctx context.Context) ([]s
return connectionNames, nil
}

// connectionHasEnabledClients checks if a connection has any enabled clients
// using the dedicated endpoint (replaces deprecated enabled_clients field).
func connectionHasEnabledClients(ctx context.Context, api auth0.ConnectionAPI, connectionID string) (bool, error) {
clients, err := api.ReadEnabledClients(ctx, connectionID)
if err != nil {
return false, err
}

return clients.Clients != nil && len(*clients.Clients) > 0, nil
}

func (c *cli) getUserConnection(users *management.User) []string {
var res []string
for _, i := range users.Identities {
Expand Down
81 changes: 38 additions & 43 deletions internal/cli/users_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,26 @@ import (

func TestConnectionsPickerOptions(t *testing.T) {
tests := []struct {
name string
connections []*management.Connection
apiError error
assertOutput func(t testing.TB, options []string)
assertError func(t testing.TB, err error)
name string
connections []*management.Connection
enabledClients map[string]*management.ConnectionEnabledClientList // Keyed by connection ID.
apiError error
assertOutput func(t testing.TB, options []string)
assertError func(t testing.TB, err error)
}{
{
name: "happy path",
connections: []*management.Connection{
{
Name: auth0.String("some-name-1"),
Strategy: auth0.String("auth0"),
EnabledClients: &[]string{"1"},
},
{
Name: auth0.String("some-name-2"),
Strategy: auth0.String("auth0"),
EnabledClients: &[]string{"1"},
},
{
Name: auth0.String("some-name-3"),
Strategy: auth0.String("sms"),
EnabledClients: &[]string{"1"},
},
{
Name: auth0.String("some-name-4"),
Strategy: auth0.String("email"),
EnabledClients: &[]string{"1"},
},
{ID: auth0.String("conn-1"), Name: auth0.String("some-name-1"), Strategy: auth0.String("auth0")},
{ID: auth0.String("conn-2"), Name: auth0.String("some-name-2"), Strategy: auth0.String("auth0")},
{ID: auth0.String("conn-3"), Name: auth0.String("some-name-3"), Strategy: auth0.String("sms")},
{ID: auth0.String("conn-4"), Name: auth0.String("some-name-4"), Strategy: auth0.String("email")},
},
enabledClients: map[string]*management.ConnectionEnabledClientList{
"conn-1": {Clients: &[]management.ConnectionEnabledClient{{ClientID: auth0.String("app-1")}}},
"conn-2": {Clients: &[]management.ConnectionEnabledClient{{ClientID: auth0.String("app-1")}}},
"conn-3": {Clients: &[]management.ConnectionEnabledClient{{ClientID: auth0.String("app-1")}}},
"conn-4": {Clients: &[]management.ConnectionEnabledClient{{ClientID: auth0.String("app-1")}}},
},
assertOutput: func(t testing.TB, options []string) {
assert.Len(t, options, 4)
Expand All @@ -60,24 +51,16 @@ func TestConnectionsPickerOptions(t *testing.T) {
{
name: "happy path: returning only active connections",
connections: []*management.Connection{
{
Name: auth0.String("some-name-1"),
Strategy: auth0.String("auth0"),
EnabledClients: &[]string{"1"},
},
{
Name: auth0.String("some-name-2"),
Strategy: auth0.String("auth0"),
EnabledClients: &[]string{"1"},
},
{
Name: auth0.String("some-name-3"),
Strategy: auth0.String("sms"),
},
{
Name: auth0.String("some-name-4"),
Strategy: auth0.String("email"),
},
{ID: auth0.String("conn-1"), Name: auth0.String("some-name-1"), Strategy: auth0.String("auth0")},
{ID: auth0.String("conn-2"), Name: auth0.String("some-name-2"), Strategy: auth0.String("auth0")},
{ID: auth0.String("conn-3"), Name: auth0.String("some-name-3"), Strategy: auth0.String("sms")},
{ID: auth0.String("conn-4"), Name: auth0.String("some-name-4"), Strategy: auth0.String("email")},
},
enabledClients: map[string]*management.ConnectionEnabledClientList{
"conn-1": {Clients: &[]management.ConnectionEnabledClient{{ClientID: auth0.String("app-1")}}},
"conn-2": {Clients: &[]management.ConnectionEnabledClient{{ClientID: auth0.String("app-1")}}},
"conn-3": {Clients: &[]management.ConnectionEnabledClient{}},
"conn-4": {Clients: &[]management.ConnectionEnabledClient{}},
},
assertOutput: func(t testing.TB, options []string) {
assert.Len(t, options, 2)
Expand Down Expand Up @@ -127,6 +110,18 @@ func TestConnectionsPickerOptions(t *testing.T) {
test.apiError,
)

// Set up ReadEnabledClients expectations for each connection.
if test.enabledClients != nil {
for _, conn := range test.connections {
id := conn.GetID()
if clients, ok := test.enabledClients[id]; ok {
connectionAPI.EXPECT().
ReadEnabledClients(ctx, id).
Return(clients, nil)
}
}
}

cli := &cli{
api: &auth0.API{
Connection: connectionAPI,
Expand Down
Loading