-
Notifications
You must be signed in to change notification settings - Fork 437
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(api): new settings service (#5775)
* feat: add v2alpha policies service * feat: add v2alpha policies service * fix: rename of attributes and messages in v2alpha api * fix: rename of attributes and messages in v2alpha api * fix: linter corrections * fix: review corrections * fix: review corrections * fix: review corrections * fix: review corrections * fix grpc * refactor: rename to settings and more * Apply suggestions from code review Co-authored-by: Fabi <fabienne.gerschwiler@gmail.com> * add service to docs and rename legal settings * unit tests for converters * go mod tidy * ensure idp name and return list details * fix: use correct resource owner for active idps * change query to join --------- Co-authored-by: Livio Spring <livio.a@gmail.com> Co-authored-by: Fabi <fabienne.gerschwiler@gmail.com> Co-authored-by: Tim Möhlmann <tim+github@zitadel.com>
- Loading branch information
1 parent
c07411e
commit 8d13f17
Showing
22 changed files
with
1,720 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
package settings | ||
|
||
import ( | ||
"context" | ||
|
||
"google.golang.org/grpc" | ||
|
||
"github.com/zitadel/zitadel/internal/api/assets" | ||
"github.com/zitadel/zitadel/internal/api/authz" | ||
"github.com/zitadel/zitadel/internal/api/grpc/server" | ||
"github.com/zitadel/zitadel/internal/command" | ||
"github.com/zitadel/zitadel/internal/query" | ||
settings "github.com/zitadel/zitadel/pkg/grpc/settings/v2alpha" | ||
) | ||
|
||
var _ settings.SettingsServiceServer = (*Server)(nil) | ||
|
||
type Server struct { | ||
settings.UnimplementedSettingsServiceServer | ||
command *command.Commands | ||
query *query.Queries | ||
assetsAPIDomain func(context.Context) string | ||
} | ||
|
||
type Config struct{} | ||
|
||
func CreateServer( | ||
command *command.Commands, | ||
query *query.Queries, | ||
externalSecure bool, | ||
) *Server { | ||
return &Server{ | ||
command: command, | ||
query: query, | ||
assetsAPIDomain: assets.AssetAPI(externalSecure), | ||
} | ||
} | ||
|
||
func (s *Server) RegisterServer(grpcServer *grpc.Server) { | ||
settings.RegisterSettingsServiceServer(grpcServer, s) | ||
} | ||
|
||
func (s *Server) AppName() string { | ||
return settings.SettingsService_ServiceDesc.ServiceName | ||
} | ||
|
||
func (s *Server) MethodPrefix() string { | ||
return settings.SettingsService_ServiceDesc.ServiceName | ||
} | ||
|
||
func (s *Server) AuthMethods() authz.MethodMapping { | ||
return settings.SettingsService_AuthMethods | ||
} | ||
|
||
func (s *Server) RegisterGateway() server.RegisterGatewayFunc { | ||
return settings.RegisterSettingsServiceHandler | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,129 @@ | ||
package settings | ||
|
||
import ( | ||
"context" | ||
|
||
"google.golang.org/protobuf/types/known/timestamppb" | ||
|
||
"github.com/zitadel/zitadel/internal/api/authz" | ||
"github.com/zitadel/zitadel/internal/api/grpc/object/v2" | ||
"github.com/zitadel/zitadel/internal/api/grpc/text" | ||
"github.com/zitadel/zitadel/internal/query" | ||
object_pb "github.com/zitadel/zitadel/pkg/grpc/object/v2alpha" | ||
"github.com/zitadel/zitadel/pkg/grpc/settings/v2alpha" | ||
) | ||
|
||
func (s *Server) GetLoginSettings(ctx context.Context, req *settings.GetLoginSettingsRequest) (*settings.GetLoginSettingsResponse, error) { | ||
current, err := s.query.LoginPolicyByID(ctx, true, object.ResourceOwnerFromReq(ctx, req.GetCtx()), false) | ||
if err != nil { | ||
return nil, err | ||
} | ||
return &settings.GetLoginSettingsResponse{ | ||
Settings: loginSettingsToPb(current), | ||
Details: &object_pb.Details{ | ||
Sequence: current.Sequence, | ||
ChangeDate: timestamppb.New(current.ChangeDate), | ||
ResourceOwner: current.OrgID, | ||
}, | ||
}, nil | ||
} | ||
|
||
func (s *Server) GetPasswordComplexitySettings(ctx context.Context, req *settings.GetPasswordComplexitySettingsRequest) (*settings.GetPasswordComplexitySettingsResponse, error) { | ||
current, err := s.query.PasswordComplexityPolicyByOrg(ctx, true, object.ResourceOwnerFromReq(ctx, req.GetCtx()), false) | ||
if err != nil { | ||
return nil, err | ||
} | ||
return &settings.GetPasswordComplexitySettingsResponse{ | ||
Settings: passwordSettingsToPb(current), | ||
Details: &object_pb.Details{ | ||
Sequence: current.Sequence, | ||
ChangeDate: timestamppb.New(current.ChangeDate), | ||
ResourceOwner: current.ResourceOwner, | ||
}, | ||
}, nil | ||
} | ||
|
||
func (s *Server) GetBrandingSettings(ctx context.Context, req *settings.GetBrandingSettingsRequest) (*settings.GetBrandingSettingsResponse, error) { | ||
current, err := s.query.ActiveLabelPolicyByOrg(ctx, object.ResourceOwnerFromReq(ctx, req.GetCtx()), false) | ||
if err != nil { | ||
return nil, err | ||
} | ||
return &settings.GetBrandingSettingsResponse{ | ||
Settings: brandingSettingsToPb(current, s.assetsAPIDomain(ctx)), | ||
Details: &object_pb.Details{ | ||
Sequence: current.Sequence, | ||
ChangeDate: timestamppb.New(current.ChangeDate), | ||
ResourceOwner: current.ResourceOwner, | ||
}, | ||
}, nil | ||
} | ||
|
||
func (s *Server) GetDomainSettings(ctx context.Context, req *settings.GetDomainSettingsRequest) (*settings.GetDomainSettingsResponse, error) { | ||
current, err := s.query.DomainPolicyByOrg(ctx, true, object.ResourceOwnerFromReq(ctx, req.GetCtx()), false) | ||
if err != nil { | ||
return nil, err | ||
} | ||
return &settings.GetDomainSettingsResponse{ | ||
Settings: domainSettingsToPb(current), | ||
Details: &object_pb.Details{ | ||
Sequence: current.Sequence, | ||
ChangeDate: timestamppb.New(current.ChangeDate), | ||
ResourceOwner: current.ResourceOwner, | ||
}, | ||
}, nil | ||
} | ||
|
||
func (s *Server) GetLegalAndSupportSettings(ctx context.Context, req *settings.GetLegalAndSupportSettingsRequest) (*settings.GetLegalAndSupportSettingsResponse, error) { | ||
current, err := s.query.PrivacyPolicyByOrg(ctx, true, object.ResourceOwnerFromReq(ctx, req.GetCtx()), false) | ||
if err != nil { | ||
return nil, err | ||
} | ||
return &settings.GetLegalAndSupportSettingsResponse{ | ||
Settings: legalAndSupportSettingsToPb(current), | ||
Details: &object_pb.Details{ | ||
Sequence: current.Sequence, | ||
ChangeDate: timestamppb.New(current.ChangeDate), | ||
ResourceOwner: current.ResourceOwner, | ||
}, | ||
}, nil | ||
} | ||
|
||
func (s *Server) GetLockoutSettings(ctx context.Context, req *settings.GetLockoutSettingsRequest) (*settings.GetLockoutSettingsResponse, error) { | ||
current, err := s.query.LockoutPolicyByOrg(ctx, true, object.ResourceOwnerFromReq(ctx, req.GetCtx()), false) | ||
if err != nil { | ||
return nil, err | ||
} | ||
return &settings.GetLockoutSettingsResponse{ | ||
Settings: lockoutSettingsToPb(current), | ||
Details: &object_pb.Details{ | ||
Sequence: current.Sequence, | ||
ChangeDate: timestamppb.New(current.ChangeDate), | ||
ResourceOwner: current.ResourceOwner, | ||
}, | ||
}, nil | ||
} | ||
|
||
func (s *Server) GetActiveIdentityProviders(ctx context.Context, req *settings.GetActiveIdentityProvidersRequest) (*settings.GetActiveIdentityProvidersResponse, error) { | ||
links, err := s.query.IDPLoginPolicyLinks(ctx, object.ResourceOwnerFromReq(ctx, req.GetCtx()), &query.IDPLoginPolicyLinksSearchQuery{}, false) | ||
if err != nil { | ||
return nil, err | ||
} | ||
|
||
return &settings.GetActiveIdentityProvidersResponse{ | ||
Details: object.ToListDetails(links.SearchResponse), | ||
IdentityProviders: identityProvidersToPb(links.Links), | ||
}, nil | ||
} | ||
|
||
func (s *Server) GetGeneralSettings(ctx context.Context, _ *settings.GetGeneralSettingsRequest) (*settings.GetGeneralSettingsResponse, error) { | ||
langs, err := s.query.Languages(ctx) | ||
if err != nil { | ||
return nil, err | ||
} | ||
instance := authz.GetInstance(ctx) | ||
return &settings.GetGeneralSettingsResponse{ | ||
SupportedLanguages: text.LanguageTagsToStrings(langs), | ||
DefaultOrgId: instance.DefaultOrganisationID(), | ||
DefaultLanguage: instance.DefaultLanguage().String(), | ||
}, nil | ||
} |
Oops, something went wrong.
8d13f17
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Successfully deployed to the following URLs:
docs – ./
zitadel-docs.vercel.app
docs-zitadel.vercel.app
docs-git-main-zitadel.vercel.app