TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-10-18 09:03:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: reactivate/deactivate idp, remove idp provider (#1348)

Browse Source 
* fix: reactivate/deactivate idp, remove idp provider

* fix build

* fix(console): add jwt to selection, idp deactivate reactivate (#1347)

* fix: log error on idp change

* add jwt to method selection

Co-authored-by: Max Peintner <max@caos.ch>
This commit is contained in:
Fabi
2021-02-26 14:48:22 +01:00
committed by GitHub
parent 5333ef10c1
commit c8b9888427
10 changed files with 61 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/api/grpc/management/login_policy.go
View File

@@ -2,6 +2,7 @@ package management
import (
"context"
"github.com/caos/zitadel/internal/api/authz"
"github.com/caos/zitadel/pkg/grpc/management"
"github.com/golang/protobuf/ptypes/empty"
)
@@ -60,7 +61,7 @@ func (s *Server) AddIdpProviderToLoginPolicy(ctx context.Context, provider *mana
}
func (s *Server) RemoveIdpProviderFromLoginPolicy(ctx context.Context, provider *management.IdpProviderID) (*empty.Empty, error) {
err := s.org.RemoveIDPProviderFromLoginPolicy(ctx, idpProviderToModel(provider))
err := s.org.RemoveIDPProviderFromLoginPolicy(ctx, idpProviderToModel(authz.GetCtxData(ctx).OrgID, provider))
return &empty.Empty{}, err
}

9
internal/api/grpc/management/login_policy_converter.go
View File

@@ -2,6 +2,7 @@ package management
import (
"github.com/caos/logging"
"github.com/caos/zitadel/internal/eventstore/models"
iam_model "github.com/caos/zitadel/internal/iam/model"
"github.com/caos/zitadel/pkg/grpc/management"
"github.com/golang/protobuf/ptypes"
@@ -70,10 +71,12 @@ func idpProviderSearchResponseFromModel(response *iam_model.IDPProviderSearchRes
}
}
func idpProviderToModel(provider *management.IdpProviderID) *iam_model.IDPProvider {
func idpProviderToModel(orgID string, provider *management.IdpProviderID) *iam_model.IDPProvider {
return &iam_model.IDPProvider{
ObjectRoot: models.ObjectRoot{
AggregateID: orgID,
},
IdpConfigID: provider.IdpConfigId,
Type: iam_model.IDPProviderTypeSystem,
}
}
@@ -110,7 +113,7 @@ func idpProviderViewFromModel(provider *iam_model.IDPProviderView) *management.I
return &management.IdpProviderView{
IdpConfigId: provider.IDPConfigID,
Name: provider.Name,
Type: idpConfigTypeToModel(provider.IDPConfigType),
Type: idpProviderTypeFromModel(provider.IDPProviderType),
}
}