TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-01-05 22:52:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
Livio Spring 2024-09-18 07:48:20 +02:00
parent c315de7ef3
commit e02bfd09e9
No known key found for this signature in database
GPG Key ID: 26BB1C2FA5952CF0
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/oidc/token_client_credentials_integration_test.go
View File

@ -22,7 +22,7 @@ func TestServer_ClientCredentialsExchange(t *testing.T) {
machine, name, clientID, clientSecret, err := Tester.CreateOIDCCredentialsClient(CTX)
require.NoError(t, err)
_, _, clientIDInactive, clientSecretInactive, err := Instance.CreateOIDCCredentialsClientInactive(CTX)
_, _, clientIDInactive, clientSecretInactive, err := Tester.CreateOIDCCredentialsClientInactive(CTX)
require.NoError(t, err)
type claims struct {

2
internal/api/oidc/userinfo.go
View File

@ -69,7 +69,7 @@ func (s *Server) UserInfo(ctx context.Context, r *op.Request[oidc.UserInfoReques
if !zerrors.IsNotFound(err) {
return nil, err
}
return nil, op.NewStatusError(oidc.ErrAccessDenied().WithDescription("no active user").WithParent(err).WithReturnParentToClient(authz.GetFeatures(ctx).DebugOIDCParentError), http.StatusUnauthorized)
return nil, op.NewStatusError(oidc.ErrAccessDenied().WithDescription("no active user").WithParent(err), http.StatusUnauthorized)
}
return op.NewResponse(userInfo), nil
}

1
internal/command/device_auth_test.go
View File

@ -607,7 +607,6 @@ func TestCommands_CreateOIDCSessionFromDeviceAuth(t *testing.T) {
Description: gu.Ptr("firefox"),
Header: http.Header{"foo": []string{"bar"}},
},
"sessionID",
),
),
),

1
internal/integration/oidc.go
View File

@ -21,7 +21,6 @@ import (
"github.com/zitadel/zitadel/pkg/grpc/authn"
"github.com/zitadel/zitadel/pkg/grpc/management"
"github.com/zitadel/zitadel/pkg/grpc/user"
user_v2 "github.com/zitadel/zitadel/pkg/grpc/user/v2"
)
func (s *Tester) CreateOIDCClient(ctx context.Context, redirectURI, logoutRedirectURI, projectID string, appType app.OIDCAppType, authMethod app.OIDCAuthMethodType, devMode bool, grantTypes ...app.OIDCGrantType) (*management.AddOIDCAppResponse, error) {