update error message

Emyrk · Emyrk · commit 11f4bccfc33b · 2025-02-10T15:34:16.000-06:00
diff --git a/cli/server.go b/cli/server.go
@@ -174,7 +174,7 @@ func createOIDCConfig(ctx context.Context, logger slog.Logger, vals *codersdk.De
 
 	secondaryClaimsSrc := coderd.MergedClaimsSourceUserInfo
 	if !vals.OIDC.IgnoreUserInfo && vals.OIDC.UserInfoFromAccessToken {
-		return nil, xerrors.Errorf("cannot specify both 'oidc-access-token-claims' and 'oidc-ignore-userinfo'")
+		return nil, xerrors.Errorf("to use 'oidc-access-token-claims', 'oidc-ignore-userinfo' must be set to 'false'")
 	}
 	if vals.OIDC.IgnoreUserInfo {
 		secondaryClaimsSrc = coderd.MergedClaimsSourceNone
diff --git a/scripts/testidp/main.go b/scripts/testidp/main.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/golang-jwt/jwt/v4"
+	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 
 	"cdr.dev/slog"
@@ -88,6 +89,7 @@ func RunIDP() func(t *testing.T) {
 				// This is a static set of auth fields. Might be beneficial to make flags
 				// to allow different values here. This is only required for using the
 				// testIDP as primary auth. External auth does not ever fetch these fields.
+				"sub":                uuid.MustParse("26c6a19c-b9b8-493b-a991-88a4c3310314"),
 				"email":              "oidc_member@coder.com",
 				"preferred_username": "oidc_member",
 				"email_verified":     true,

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ func createOIDCConfig(ctx context.Context, logger slog.Logger, vals *codersdk.De`
`174`	`174`
`175`	`175`	`secondaryClaimsSrc := coderd.MergedClaimsSourceUserInfo`
`176`	`176`	`if !vals.OIDC.IgnoreUserInfo && vals.OIDC.UserInfoFromAccessToken {`
`177`		`- return nil, xerrors.Errorf("cannot specify both 'oidc-access-token-claims' and 'oidc-ignore-userinfo'")`
	`177`	`+ return nil, xerrors.Errorf("to use 'oidc-access-token-claims', 'oidc-ignore-userinfo' must be set to 'false'")`
`178`	`178`	`}`
`179`	`179`	`if vals.OIDC.IgnoreUserInfo {`
`180`	`180`	`secondaryClaimsSrc = coderd.MergedClaimsSourceNone`