TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 21:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: translate error messages (#254)

Browse Source 
* feat: translate error messages in error interceptor

* fix: add statik import

* feat: user error msgs

* feat: add translations

* feat: add translations

* feat: add translations

* feat: add translations

* feat: add translations

* feat: add translations

* some fixes and improved error messages

Co-authored-by: Livio Amstutz <livio.a@gmail.com>
This commit is contained in:
Fabi
2020-06-22 13:51:44 +02:00
committed by GitHub
parent f68a5e63b5
commit 6556d053b2
52 changed files with 570 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/admin/admin.go
View File

@@ -20,5 +20,5 @@ func Start(ctx context.Context, config Config, authZRepo *authz_repo.EsRepositor
repo, err := eventsourcing.Start(ctx, config.Repository, systemDefaults)
logging.Log("MAIN-9uBxp").OnError(err).Panic("unable to start app")
api.Start(ctx, config.API, authZRepo, authZ, repo)
api.Start(ctx, config.API, authZRepo, authZ, systemDefaults, repo)
}

5
pkg/admin/api/api.go
View File

@@ -3,6 +3,7 @@ package api
import (
"context"
authz_repo "github.com/caos/zitadel/internal/authz/repository/eventsourcing"
"github.com/caos/zitadel/internal/config/systemdefaults"
"github.com/caos/zitadel/internal/admin/repository"
"github.com/caos/zitadel/internal/api/auth"
@@ -15,10 +16,10 @@ type Config struct {
GRPC grpc_util.Config
}
func Start(ctx context.Context, conf Config, authZRepo *authz_repo.EsRepository, authZ auth.Config, repo repository.Repository) {
func Start(ctx context.Context, conf Config, authZRepo *authz_repo.EsRepository, authZ auth.Config, defaults systemdefaults.SystemDefaults, repo repository.Repository) {
grpcServer := grpc.StartServer(conf.GRPC.ToServerConfig(), authZRepo, authZ, repo)
grpcGateway := grpc.StartGateway(conf.GRPC.ToGatewayConfig())
server.StartServer(ctx, grpcServer)
server.StartServer(ctx, grpcServer, defaults)
server.StartGateway(ctx, grpcGateway)
}

2
pkg/admin/api/grpc/gateway.go
View File

@@ -41,7 +41,7 @@ func (gw *Gateway) GatewayServeMuxOptions() []runtime.ServeMuxOption {
return header, true
}
}
return header, false
return runtime.DefaultHeaderMatcher(header)
}),
}
}

5
pkg/admin/api/grpc/server.go
View File

@@ -7,6 +7,7 @@ import (
grpc_util "github.com/caos/zitadel/internal/api/grpc"
"github.com/caos/zitadel/internal/api/grpc/server/middleware"
authz_repo "github.com/caos/zitadel/internal/authz/repository/eventsourcing"
"github.com/caos/zitadel/internal/config/systemdefaults"
grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
"google.golang.org/grpc"
)
@@ -35,12 +36,12 @@ func (s *Server) GRPCPort() string {
return s.port
}
func (s *Server) GRPCServer() (*grpc.Server, error) {
func (s *Server) GRPCServer(defaults systemdefaults.SystemDefaults) (*grpc.Server, error) {
gs := grpc.NewServer(
middleware.TracingStatsServer("/Healthz", "/Ready", "/Validate"),
grpc.UnaryInterceptor(
grpc_middleware.ChainUnaryServer(
middleware.ErrorHandler(),
middleware.ErrorHandler(defaults.DefaultLanguage),
AdminService_Authorization_Interceptor(s.verifier, &s.authZ),
),
),

5
pkg/auth/api/api.go
View File

@@ -3,6 +3,7 @@ package api
import (
"context"
authz_repo "github.com/caos/zitadel/internal/authz/repository/eventsourcing"
"github.com/caos/zitadel/internal/config/systemdefaults"
"github.com/caos/oidc/pkg/op"
@@ -19,12 +20,12 @@ type Config struct {
OIDC oidc.OPHandlerConfig
}
func Start(ctx context.Context, conf Config, authZRepo *authz_repo.EsRepository, authZ auth_util.Config, authRepo repository.Repository) {
func Start(ctx context.Context, conf Config, authZRepo *authz_repo.EsRepository, authZ auth_util.Config, defaults systemdefaults.SystemDefaults, authRepo repository.Repository) {
grpcServer := grpc.StartServer(conf.GRPC.ToServerConfig(), authZRepo, authZ, authRepo)
grpcGateway := grpc.StartGateway(conf.GRPC.ToGatewayConfig())
oidcHandler := oidc.NewProvider(ctx, conf.OIDC, authRepo)
server.StartServer(ctx, grpcServer)
server.StartServer(ctx, grpcServer, defaults)
server.StartGateway(ctx, grpcGateway)
op.Start(ctx, oidcHandler)
}

2
pkg/auth/api/grpc/gateway.go
View File

@@ -43,7 +43,7 @@ func (gw *Gateway) GatewayServeMuxOptions() []runtime.ServeMuxOption {
return header, true
}
}
return header, false
return runtime.DefaultHeaderMatcher(header)
}),
}
}

5
pkg/auth/api/grpc/server.go
View File

@@ -2,6 +2,7 @@ package grpc
import (
authz_repo "github.com/caos/zitadel/internal/authz/repository/eventsourcing"
"github.com/caos/zitadel/internal/config/systemdefaults"
grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
"google.golang.org/grpc"
@@ -34,12 +35,12 @@ func (s *Server) GRPCPort() string {
return s.port
}
func (s *Server) GRPCServer() (*grpc.Server, error) {
func (s *Server) GRPCServer(defaults systemdefaults.SystemDefaults) (*grpc.Server, error) {
gs := grpc.NewServer(
middleware.TracingStatsServer("/Healthz", "/Ready", "/Validate"),
grpc.UnaryInterceptor(
grpc_middleware.ChainUnaryServer(
middleware.ErrorHandler(),
middleware.ErrorHandler(defaults.DefaultLanguage),
AuthService_Authorization_Interceptor(s.verifier, &s.authZ),
),
),

2
pkg/auth/auth.go
View File

@@ -16,5 +16,5 @@ type Config struct {
}
func Start(ctx context.Context, config Config, authZRepo *authz_repo.EsRepository, authZ auth.Config, systemDefaults sd.SystemDefaults, authRepo *eventsourcing.EsRepository) {
api.Start(ctx, config.API, authZRepo, authZ, authRepo)
api.Start(ctx, config.API, authZRepo, authZ, systemDefaults, authRepo)
}

6
pkg/management/api/api.go
View File

@@ -16,10 +16,10 @@ type Config struct {
GRPC grpc_util.Config
}
func Start(ctx context.Context, conf Config, authZRepo *authz_repo.EsRepository, authZ auth.Config, sd systemdefaults.SystemDefaults, repo repository.Repository) {
grpcServer := grpc.StartServer(conf.GRPC.ToServerConfig(), authZRepo, authZ, sd, repo)
func Start(ctx context.Context, conf Config, authZRepo *authz_repo.EsRepository, authZ auth.Config, defaults systemdefaults.SystemDefaults, repo repository.Repository) {
grpcServer := grpc.StartServer(conf.GRPC.ToServerConfig(), authZRepo, authZ, defaults, repo)
grpcGateway := grpc.StartGateway(conf.GRPC.ToGatewayConfig())
server.StartServer(ctx, grpcServer)
server.StartServer(ctx, grpcServer, defaults)
server.StartGateway(ctx, grpcGateway)
}

2
pkg/management/api/grpc/gateway.go
View File

@@ -41,7 +41,7 @@ func (gw *Gateway) GatewayServeMuxOptions() []runtime.ServeMuxOption {
return header, true
}
}
return header, false
return runtime.DefaultHeaderMatcher(header)
}),
}
}

4
pkg/management/api/grpc/server.go
View File

@@ -46,12 +46,12 @@ func (s *Server) GRPCPort() string {
return s.port
}
func (s *Server) GRPCServer() (*grpc.Server, error) {
func (s *Server) GRPCServer(defaults systemdefaults.SystemDefaults) (*grpc.Server, error) {
gs := grpc.NewServer(
middleware.TracingStatsServer("/Healthz", "/Ready", "/Validate"),
grpc.UnaryInterceptor(
grpc_middleware.ChainUnaryServer(
middleware.ErrorHandler(),
middleware.ErrorHandler(defaults.DefaultLanguage),
ManagementService_Authorization_Interceptor(s.verifier, &s.authZ),
),
),