2020-06-05 07:50:04 +02:00
|
|
|
package i18n
|
|
|
|
|
|
|
|
import (
|
2020-06-22 13:51:44 +02:00
|
|
|
"context"
|
2020-06-05 07:50:04 +02:00
|
|
|
"encoding/json"
|
|
|
|
"io/ioutil"
|
|
|
|
"net/http"
|
|
|
|
"os"
|
2021-07-09 09:45:31 +02:00
|
|
|
"strings"
|
2020-06-05 07:50:04 +02:00
|
|
|
|
2021-07-05 15:10:49 +02:00
|
|
|
"github.com/BurntSushi/toml"
|
2020-06-05 07:50:04 +02:00
|
|
|
"github.com/caos/logging"
|
2021-07-05 15:10:49 +02:00
|
|
|
"github.com/grpc-ecosystem/go-grpc-middleware/util/metautils"
|
2020-06-05 07:50:04 +02:00
|
|
|
"github.com/nicksnyder/go-i18n/v2/i18n"
|
|
|
|
"golang.org/x/text/language"
|
2021-12-08 16:26:12 +01:00
|
|
|
"sigs.k8s.io/yaml"
|
2021-07-05 15:10:49 +02:00
|
|
|
|
|
|
|
"github.com/caos/zitadel/internal/api/authz"
|
|
|
|
http_util "github.com/caos/zitadel/internal/api/http"
|
|
|
|
"github.com/caos/zitadel/internal/errors"
|
2020-06-05 07:50:04 +02:00
|
|
|
)
|
|
|
|
|
|
|
|
const (
|
|
|
|
i18nPath = "/i18n"
|
|
|
|
)
|
|
|
|
|
|
|
|
type Translator struct {
|
2021-07-09 09:45:31 +02:00
|
|
|
bundle *i18n.Bundle
|
|
|
|
cookieName string
|
|
|
|
cookieHandler *http_util.CookieHandler
|
|
|
|
preferredLanguages []string
|
2020-06-05 07:50:04 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
type TranslatorConfig struct {
|
|
|
|
DefaultLanguage language.Tag
|
|
|
|
CookieName string
|
|
|
|
}
|
|
|
|
|
2021-07-05 15:10:49 +02:00
|
|
|
type Message struct {
|
|
|
|
ID string
|
|
|
|
Text string
|
|
|
|
}
|
|
|
|
|
2020-06-05 07:50:04 +02:00
|
|
|
func NewTranslator(dir http.FileSystem, config TranslatorConfig) (*Translator, error) {
|
|
|
|
t := new(Translator)
|
|
|
|
var err error
|
|
|
|
t.bundle, err = newBundle(dir, config.DefaultLanguage)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
t.cookieHandler = http_util.NewCookieHandler()
|
|
|
|
t.cookieName = config.CookieName
|
|
|
|
return t, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func newBundle(dir http.FileSystem, defaultLanguage language.Tag) (*i18n.Bundle, error) {
|
|
|
|
bundle := i18n.NewBundle(defaultLanguage)
|
2021-12-08 16:26:12 +01:00
|
|
|
bundle.RegisterUnmarshalFunc("yaml", func(data []byte, v interface{}) error { return yaml.Unmarshal(data, v) })
|
2020-06-05 07:50:04 +02:00
|
|
|
bundle.RegisterUnmarshalFunc("json", json.Unmarshal)
|
2020-07-08 13:56:37 +02:00
|
|
|
bundle.RegisterUnmarshalFunc("toml", toml.Unmarshal)
|
2020-06-05 07:50:04 +02:00
|
|
|
i18nDir, err := dir.Open(i18nPath)
|
|
|
|
if err != nil {
|
|
|
|
return nil, errors.ThrowNotFound(err, "I18N-MnXRie", "path not found")
|
|
|
|
}
|
|
|
|
defer i18nDir.Close()
|
|
|
|
files, err := i18nDir.Readdir(0)
|
|
|
|
if err != nil {
|
|
|
|
return nil, errors.ThrowNotFound(err, "I18N-Gew23", "cannot read dir")
|
|
|
|
}
|
|
|
|
for _, file := range files {
|
2021-07-05 15:10:49 +02:00
|
|
|
if err := addFileFromFileSystemToBundle(dir, bundle, file); err != nil {
|
|
|
|
return nil, errors.ThrowNotFound(err, "I18N-ZS2AW", "cannot append file to Bundle")
|
2020-06-05 07:50:04 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return bundle, nil
|
|
|
|
}
|
|
|
|
|
2021-07-05 15:10:49 +02:00
|
|
|
func addFileFromFileSystemToBundle(dir http.FileSystem, bundle *i18n.Bundle, file os.FileInfo) error {
|
2020-06-05 07:50:04 +02:00
|
|
|
f, err := dir.Open("/i18n/" + file.Name())
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
defer f.Close()
|
|
|
|
content, err := ioutil.ReadAll(f)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
bundle.MustParseMessageFileBytes(content, file.Name())
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2021-07-09 09:45:31 +02:00
|
|
|
func SupportedLanguages(dir http.FileSystem) ([]language.Tag, error) {
|
|
|
|
i18nDir, err := dir.Open("/i18n")
|
|
|
|
if err != nil {
|
|
|
|
return nil, errors.ThrowNotFound(err, "I18N-Dbt42", "cannot open dir")
|
|
|
|
}
|
|
|
|
defer i18nDir.Close()
|
|
|
|
files, err := i18nDir.Readdir(0)
|
|
|
|
if err != nil {
|
|
|
|
return nil, errors.ThrowNotFound(err, "I18N-Gh4zk", "cannot read dir")
|
|
|
|
}
|
|
|
|
languages := make([]language.Tag, 0, len(files))
|
|
|
|
for _, file := range files {
|
|
|
|
lang := language.Make(strings.TrimSuffix(file.Name(), ".yaml"))
|
|
|
|
if lang != language.Und {
|
|
|
|
languages = append(languages, lang)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return languages, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *Translator) SupportedLanguages() []language.Tag {
|
|
|
|
return t.bundle.LanguageTags()
|
|
|
|
}
|
|
|
|
|
2021-07-05 15:10:49 +02:00
|
|
|
func (t *Translator) AddMessages(tag language.Tag, messages ...Message) error {
|
|
|
|
if len(messages) == 0 {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
i18nMessages := make([]*i18n.Message, len(messages))
|
|
|
|
for i, message := range messages {
|
|
|
|
i18nMessages[i] = &i18n.Message{
|
|
|
|
ID: message.ID,
|
|
|
|
Other: message.Text,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return t.bundle.AddMessages(tag, i18nMessages...)
|
|
|
|
}
|
|
|
|
|
2020-06-05 07:50:04 +02:00
|
|
|
func (t *Translator) LocalizeFromRequest(r *http.Request, id string, args map[string]interface{}) string {
|
2020-07-08 13:56:37 +02:00
|
|
|
return localize(t.localizerFromRequest(r), id, args)
|
2020-06-05 07:50:04 +02:00
|
|
|
}
|
|
|
|
|
2020-06-22 13:51:44 +02:00
|
|
|
func (t *Translator) LocalizeFromCtx(ctx context.Context, id string, args map[string]interface{}) string {
|
2020-07-08 13:56:37 +02:00
|
|
|
return localize(t.localizerFromCtx(ctx), id, args)
|
2020-06-22 13:51:44 +02:00
|
|
|
}
|
|
|
|
|
2020-06-09 15:11:42 +02:00
|
|
|
func (t *Translator) Localize(id string, args map[string]interface{}, langs ...string) string {
|
2020-07-08 13:56:37 +02:00
|
|
|
return localize(t.localizer(langs...), id, args)
|
2020-06-05 07:50:04 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (t *Translator) Lang(r *http.Request) language.Tag {
|
|
|
|
matcher := language.NewMatcher(t.bundle.LanguageTags())
|
|
|
|
tag, _ := language.MatchStrings(matcher, t.langsFromRequest(r)...)
|
|
|
|
return tag
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *Translator) SetLangCookie(w http.ResponseWriter, lang language.Tag) {
|
|
|
|
t.cookieHandler.SetCookie(w, t.cookieName, lang.String())
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *Translator) localizerFromRequest(r *http.Request) *i18n.Localizer {
|
|
|
|
return t.localizer(t.langsFromRequest(r)...)
|
|
|
|
}
|
|
|
|
|
2020-06-22 13:51:44 +02:00
|
|
|
func (t *Translator) localizerFromCtx(ctx context.Context) *i18n.Localizer {
|
|
|
|
return t.localizer(t.langsFromCtx(ctx)...)
|
|
|
|
}
|
|
|
|
|
2020-06-05 07:50:04 +02:00
|
|
|
func (t *Translator) localizer(langs ...string) *i18n.Localizer {
|
|
|
|
return i18n.NewLocalizer(t.bundle, langs...)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *Translator) langsFromRequest(r *http.Request) []string {
|
2021-07-09 09:45:31 +02:00
|
|
|
langs := t.preferredLanguages
|
2020-06-05 07:50:04 +02:00
|
|
|
if r != nil {
|
|
|
|
lang, err := t.cookieHandler.GetCookieValue(r, t.cookieName)
|
|
|
|
if err == nil {
|
|
|
|
langs = append(langs, lang)
|
|
|
|
}
|
|
|
|
langs = append(langs, r.Header.Get("Accept-Language"))
|
|
|
|
}
|
|
|
|
return langs
|
|
|
|
}
|
2020-06-22 13:51:44 +02:00
|
|
|
|
|
|
|
func (t *Translator) langsFromCtx(ctx context.Context) []string {
|
2021-07-09 09:45:31 +02:00
|
|
|
langs := t.preferredLanguages
|
2020-06-22 13:51:44 +02:00
|
|
|
if ctx != nil {
|
2020-08-28 09:44:43 +02:00
|
|
|
ctxData := authz.GetCtxData(ctx)
|
|
|
|
if ctxData.PreferredLanguage != "" {
|
|
|
|
langs = append(langs, authz.GetCtxData(ctx).PreferredLanguage)
|
|
|
|
}
|
2020-06-22 13:51:44 +02:00
|
|
|
langs = append(langs, getAcceptLanguageHeader(ctx))
|
|
|
|
}
|
|
|
|
return langs
|
|
|
|
}
|
|
|
|
|
2021-07-09 09:45:31 +02:00
|
|
|
func (t *Translator) SetPreferredLanguages(langs ...string) {
|
|
|
|
t.preferredLanguages = langs
|
|
|
|
}
|
|
|
|
|
2020-06-22 13:51:44 +02:00
|
|
|
func getAcceptLanguageHeader(ctx context.Context) string {
|
|
|
|
return metautils.ExtractIncoming(ctx).Get("grpcgateway-accept-language")
|
|
|
|
}
|
2020-07-08 13:56:37 +02:00
|
|
|
|
|
|
|
func localize(localizer *i18n.Localizer, id string, args map[string]interface{}) string {
|
|
|
|
s, err := localizer.Localize(&i18n.LocalizeConfig{
|
|
|
|
MessageID: id,
|
|
|
|
TemplateData: args,
|
|
|
|
})
|
|
|
|
if err != nil {
|
fix(queries): login policy projection (#2401)
* job queue
* wg improvements
* start handler
* statement
* statements
* imporve handler
* improve statement
* statement in seperate file
* move handlers
* move query/old to query
* handler
* read models
* bulk works
* cleanup
* contrib
* rename readmodel to projection
* rename read_models schema to projections
* rename read_models schema to projections
* search query as func,
bulk iterates as long as new events
* add event sequence less query
* update checks for events between current sequence and sequence of first statement if it has previous sequence 0
* cleanup crdb projection
* refactor projection handler
* start with testing
* tests for handler
* remove todo
* refactor statement: remove table name,
add tests
* improve projection handler shutdown,
no savepoint if noop stmt,
tests for stmt handler
* tests
* start failed events
* seperate branch for contrib
* move statement constructors to crdb pkg
* correct import
* Subscribe for eventtypes (#1800)
* fix: is default (#1737)
* fix: use email as username on global org (#1738)
* fix: use email as username on global org
* Update user_human.go
* Update register_handler.go
* chore(deps): update docusaurus (#1739)
* chore: remove PAT and use GH Token (#1716)
* chore: remove PAT and use GH Token
* fix env
* fix env
* fix env
* md lint
* trigger ci
* change user
* fix GH bug
* replace login part
* chore: add GH Token to sem rel (#1746)
* chore: add GH Token to sem rel
* try branch
* add GH Token
* remove test branch again
* docs: changes acme to acme-caos (#1744)
* changes acme to acme-caos
* Apply suggestions from code review
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: Maximilian Panne <maximilian.panne@gmail.com>
Co-authored-by: Florian Forster <florian@caos.ch>
* feat: add additional origins on applications (#1691)
* feat: add additional origins on applications
* app additional redirects
* chore(deps-dev): bump @angular/cli from 11.2.8 to 11.2.11 in /console (#1706)
* fix: show org with regex (#1688)
* fix: flag mapping (#1699)
* chore(deps-dev): bump @angular/cli from 11.2.8 to 11.2.11 in /console
Bumps [@angular/cli](https://github.com/angular/angular-cli) from 11.2.8 to 11.2.11.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/compare/v11.2.8...v11.2.11)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Silvan <silvan.reusser@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump stylelint from 13.10.0 to 13.13.1 in /console (#1703)
* fix: show org with regex (#1688)
* fix: flag mapping (#1699)
* chore(deps-dev): bump stylelint from 13.10.0 to 13.13.1 in /console
Bumps [stylelint](https://github.com/stylelint/stylelint) from 13.10.0 to 13.13.1.
- [Release notes](https://github.com/stylelint/stylelint/releases)
- [Changelog](https://github.com/stylelint/stylelint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stylelint/stylelint/compare/13.10.0...13.13.1)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Silvan <silvan.reusser@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump @types/node from 14.14.37 to 15.0.1 in /console (#1702)
* fix: show org with regex (#1688)
* fix: flag mapping (#1699)
* chore(deps-dev): bump @types/node from 14.14.37 to 15.0.1 in /console
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.14.37 to 15.0.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Silvan <silvan.reusser@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump ts-protoc-gen from 0.14.0 to 0.15.0 in /console (#1701)
* fix: show org with regex (#1688)
* fix: flag mapping (#1699)
* chore(deps): bump ts-protoc-gen from 0.14.0 to 0.15.0 in /console
Bumps [ts-protoc-gen](https://github.com/improbable-eng/ts-protoc-gen) from 0.14.0 to 0.15.0.
- [Release notes](https://github.com/improbable-eng/ts-protoc-gen/releases)
- [Changelog](https://github.com/improbable-eng/ts-protoc-gen/blob/master/CHANGELOG.md)
- [Commits](https://github.com/improbable-eng/ts-protoc-gen/compare/0.14.0...0.15.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Silvan <silvan.reusser@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump @types/jasmine from 3.6.9 to 3.6.10 in /console (#1682)
Bumps [@types/jasmine](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jasmine) from 3.6.9 to 3.6.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jasmine)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump @types/google-protobuf in /console (#1681)
Bumps [@types/google-protobuf](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/google-protobuf) from 3.7.4 to 3.15.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/google-protobuf)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump grpc from 1.24.5 to 1.24.7 in /console (#1666)
Bumps [grpc](https://github.com/grpc/grpc-node) from 1.24.5 to 1.24.7.
- [Release notes](https://github.com/grpc/grpc-node/releases)
- [Commits](https://github.com/grpc/grpc-node/compare/grpc@1.24.5...grpc@1.24.7)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* lock
* chore(deps-dev): bump @angular/language-service from 11.2.9 to 11.2.12 in /console (#1704)
* fix: show org with regex (#1688)
* fix: flag mapping (#1699)
* chore(deps-dev): bump @angular/language-service in /console
Bumps [@angular/language-service](https://github.com/angular/angular/tree/HEAD/packages/language-service) from 11.2.9 to 11.2.12.
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/master/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/11.2.12/packages/language-service)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Silvan <silvan.reusser@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* package lock
* downgrade grpc
* downgrade protobuf types
* revert npm packs 🥸
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* docs: update run and start section texts (#1745)
* update run and start section texts
* adds showcase
Co-authored-by: Maximilian Panne <maximilian.panne@gmail.com>
* fix: additional origin list (#1753)
* fix: handle api configs in authz handler (#1755)
* fix(console): add model for api keys, fix toast, binding (#1757)
* fix: add model for api keys, fix toast, binding
* show api clientid
* fix: missing patchvalue (#1758)
* feat: refresh token (#1728)
* begin refresh tokens
* refresh tokens
* list and revoke refresh tokens
* handle remove
* tests for refresh tokens
* uniqueness and default expiration
* rename oidc token methods
* cleanup
* migration version
* Update internal/static/i18n/en.yaml
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fixes
* feat: update oidc pkg for refresh tokens
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fix: correct json name of clientId in key.json (#1760)
* fix: migration version (#1767)
* start subscription
* eventtypes
* fix(login): links (#1778)
* fix(login): href for help
* fix(login): correct link to tos
* fix: access tokens for service users and refresh token infos (#1779)
* fix: access token for service user
* handle info from refresh request
* uniqueness
* postpone access token uniqueness change
* chore(coc): recommend code of conduct (#1782)
* subscribe for events
* feat(console): refresh toggle out of granttype context (#1785)
* refresh toggle
* disable if not code flow, lint
* lint
* fix: change oidc config order
* accept refresh option within flow
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
* fix: refresh token activation (#1795)
* fix: oidc grant type check
* docs: add offline_access scope
* docs: update refresh token status in supported grant types
* fix: update oidc pkg
* fix: check refresh token grant type (#1796)
* configuration structs
* org admins
* failed events
* fixes
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: mffap <mpa@caos.ch>
Co-authored-by: Maximilian Panne <maximilian.panne@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* remove comment
* aggregate reducer
* remove eventtypes
* add protoc-get-validate to mod
* fix transaltion
* upsert
* add gender on org admins,
allow to retry failed stmts after configurable time
* remove if
* sub queries
* fix: tests
* add builder to tests
* new search query
* rename searchquerybuilder to builder
* remove comment from code
* test with multiple queries
* add filters test
* current sequences
* make org and org_admins work again
* add aggregate type to current sequence
* fix(contibute): listing
* add validate module
* fix: search queries
* feat(eventstore): previous aggregate root sequence (#1810)
* feat(eventstore): previous aggregate root sequence
* fix tests
* fix: eventstore v1 test
* add col to all mocked rows
* next try
* fix mig
* rename aggregate root to aggregate type
* update comment
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
* small refactorings
* allow update multiple current sequences
* unique log id
* fix migrations
* rename org admin to org owner
* improve error handling and logging
* fix(migration): optimize prev agg root seq
* fix: projection handler test
* fix: sub queries
* small fixes
* additional event types
* correct org owner projection
* fix primary key
* feat(eventstore): jobs for projections (#2026)
* fix: template names in login (#1974)
* fix: template names in login
* fix: error.html
* fix: check for features on mgmt only (#1976)
* fix: add sentry in ui, http and projection handlers (#1977)
* fix: add sentry in ui, http and projection handlers
* fix test
* fix(eventstore): sub queries (#1805)
* sub queries
* fix: tests
* add builder to tests
* new search query
* rename searchquerybuilder to builder
* remove comment from code
* test with multiple queries
* add filters test
* fix(contibute): listing
* add validate module
* fix: search queries
* remove unused event type in query
* ignore query if error in marshal
* go mod tidy
* update privacy policy query
* update queries
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
* feat: Extend oidc idp with oauth endpoints (#1980)
* feat: add oauth attributes to oidc idp configuration
* feat: return idpconfig id on create idp
* feat: tests
* feat: descriptions
* feat: docs
* feat: tests
* docs: update to beta 3 (#1984)
* fix: role assertion (#1986)
* fix: enum to display access token role assertion
* improve assertion descriptions
* fix nil pointer
* docs: eventstore (#1982)
* docs: eventstore
* Apply suggestions from code review
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: Florian Forster <florian@caos.ch>
* fix(sentry): trigger sentry release (#1989)
* feat(send sentry release): send sentry release
* fix(moved step and added releasetag): moved step and added releasetag
* fix: set version for sentry release (#1990)
* feat(send sentry release): send sentry release
* fix(moved step and added releasetag): moved step and added releasetag
* fix(corrected var name): corrected var name
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
* fix: log error reason on terminate session (#1973)
* fix: return default language file, if requested lang does not exist for default login texts (#1988)
* fix: return default language file, if requested lang doesnt exists
* feat: read default translation file
* feat: docs
* fix: race condition in auth request unmarshalling (#1993)
* feat: handle ui_locales in login (#1994)
* fix: handle ui_locales in login
* move supportedlanguage func into i18n package
* update oidc pkg
* fix: handle closed channels on unsubscribe (#1995)
* fix: give restore more time (#1997)
* fix: translation file read (#2009)
* feat: translation file read
* feat: readme
* fix: enable idp add button for iam users (#2010)
* fix: filter event_data (#2011)
* feat: Custom message files (#1992)
* feat: add get custom message text to admin api
* feat: read custom message texts from files
* feat: get languages in apis
* feat: get languages in apis
* feat: get languages in apis
* feat: pr feedback
* feat: docs
* feat: merge main
* fix: sms notification (#2013)
* fix: phone verifications
* feat: fix password reset as sms
* fix: phone verification
* fix: grpc status in sentry and validation interceptors (#2012)
* fix: remove oauth endpoints from oidc config proto (#2014)
* try with view
* fix(console): disable sw (#2021)
* fix: disable sw
* angular.json disable sw
* project projections
* fix typos
* customize projections
* customizable projections,
add change date to projects
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: mffap <mpa@caos.ch>
Co-authored-by: Christian Jakob <47860090+thesephirot@users.noreply.github.com>
Co-authored-by: Elio Bischof <eliobischof@gmail.com>
* env file
* typo
* correct users
* correct migration
* fix: merge fail
* fix test
* fix(tests): unordered matcher
* improve currentSequenceMatcher
* correct certs
* correct certs
* add zitadel database on database list
* refctor switch in match
* enable all handlers
* Delete io.env
* cleanup
* add handlers
* rename view to projection
* rename view to projection
* fix type typo
* remove unnecessary logs
* refactor stmts
* simplify interval calculation
* fix tests
* fix unlock test
* fix migration
* migs
* fix(operator): update cockroach and flyway versions (#2138)
* chore(deps): bump k8s.io/apiextensions-apiserver from 0.19.2 to 0.21.3
Bumps [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) from 0.19.2 to 0.21.3.
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](https://github.com/kubernetes/apiextensions-apiserver/compare/v0.19.2...v0.21.3)
---
updated-dependencies:
- dependency-name: k8s.io/apiextensions-apiserver
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* chore(deps): bump google.golang.org/api from 0.34.0 to 0.52.0
Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.34.0 to 0.52.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/master/CHANGES.md)
- [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.34.0...v0.52.0)
---
updated-dependencies:
- dependency-name: google.golang.org/api
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* start update dependencies
* update mods and otlp
* fix(build): update to go 1.16
* old version for k8s mods
* update k8s versions
* update orbos
* fix(operator): update cockroach and flyway version
* Update images.go
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Benz <stefan@caos.ch>
* fix import
* fix typo
* fix(migration): add org projection
* fix(projection): correct table for org events in org owners
* better insert stmt
* fix typo
* fix typo
* set max connection lifetime
* set max conns and conn lifetime in eventstore v1
* configure sql connection settings
* add mig for agg type index
* fix replace tab in yaml
* handler interfaces
* subscription
* first try
* handler
* move sql client initialization
* first part implemented
* removed all occurencies of org by id and search orgs
* fix merge issues
* cleanup code
* fix: queries implements orgviewprovider
* cleanup
* refactor text comparison
* remove unused file
* remove unused code
* log
* remove unused code
* remove unused field
* remove unused file
* refactor
* tests for search query
* remove try
* simplify state change mappers
* projection tests
* query functions
* move reusable objects to separate files
* rename domain column to primar_domain
* fix tests
* add current sequence
* remove log prints
* fix tests
* fix: verifier
* fix test
* rename domain col migrations
* simplify search response
* move org domain to query
* cleanup code
* add org id as condition to projection
* begin projection
* add custom column constructors
* start query
* import
* initial implementation of login policy
* remove unused field
* tests
* factors
* simplify reducers
* fix: org projection table const
* fix: full column name
* feat: text query extension
* fix: tests for query
* number query
* add deprection message
* column in a single place (#2416)
* column in a single place
* use projection for columns
* query column with aliases
* rename methods
* remove unused code
* column
* column
* column for current sequences
* latest sequence
* global counter column
* fix is org unique
* remove col
* fix naming
* correct errors
* deprecate duplicated is_default in api's,
error messages,
migrations
* Update internal/query/policy_login.go
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* Update login_policy.go
* fix tests
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: mffap <mpa@caos.ch>
Co-authored-by: Maximilian Panne <maximilian.panne@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Christian Jakob <47860090+thesephirot@users.noreply.github.com>
Co-authored-by: Elio Bischof <eliobischof@gmail.com>
Co-authored-by: Stefan Benz <stefan@caos.ch>
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
2021-10-19 10:10:37 +02:00
|
|
|
logging.LogWithFields("I18N-MsF5sx", "id", id, "args", args).WithError(err).Warnf("missing translation")
|
2020-07-08 13:56:37 +02:00
|
|
|
return id
|
|
|
|
}
|
|
|
|
return s
|
|
|
|
}
|