andwati/zitadel
1
0
Fork 0
mirror of https://github.com/andwati/zitadel.git synced 2026-11-06 22:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: management console naming inconsistency (#11390)

Browse Source 
# Which Problems Are Solved

The following terms have all been renamed to management console:

- Customer Portal (when used to mean the console)
- Console
- Admin Console

# How the Problems Are Solved

- Search & Replace smartly
- Use Copilot for translation files

Changes done to: backend + frontend codebase, docs, translations and
protobufs (descriptions only)

# Additional Context

- Partially Closes #11279
This commit is contained in:
Marco A.
2026-01-26 14:52:15 +00:00
committed by GitHub
parent bd6279153a
commit 96bbd6a65c
323 changed files with 3431 additions and 2685 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/command/instance.go
+27 -27
View File
@@ -31,11 +31,11 @@ import (
)
const (
zitadelProjectName = "ZITADEL"
mgmtAppName = "Management-API"
adminAppName = "Admin-API"
authAppName = "Auth-API"
consoleAppName = "Console"
zitadelProjectName = "ZITADEL"
mgmtAppName = "Management-API"
adminAppName = "Admin-API"
authAppName = "Auth-API"
managementConsoleAppName = "Management Console"
)
type InstanceSetup struct {
@@ -140,7 +140,7 @@ type InstanceSetupFeatures struct {
EnableBackChannelLogout *bool
LoginV2 *InstanceSetupFeatureLoginV2
PermissionCheckV2 *bool
ConsoleUseV2UserApi *bool
ManagementConsoleUseV2UserApi *bool
EnableRelationalTables *bool
}
@@ -174,7 +174,7 @@ func (f *InstanceSetupFeatures) ToInstanceFeatures() (_ *InstanceFeatures, err e
EnableBackChannelLogout: f.EnableBackChannelLogout,
LoginV2: loginV2,
PermissionCheckV2: f.PermissionCheckV2,
ConsoleUseV2UserApi: f.ConsoleUseV2UserApi,
ManagementConsoleUseV2UserApi: f.ManagementConsoleUseV2UserApi,
EnableRelationalTables: f.EnableRelationalTables,
}, nil
}
@@ -214,15 +214,15 @@ type SecretGenerators struct {
}
type ZitadelConfig struct {
instanceID string
orgID string
projectID string
mgmtAppID string
adminAppID string
authAppID string
consoleAppID string
limitsID string
restrictionsID string
instanceID string
orgID string
projectID string
mgmtAppID string
adminAppID string
authAppID string
managementConsoleAppID string
limitsID string
restrictionsID string
}
func (s *InstanceSetup) generateIDs(idGenerator id.Generator) (err error) {
@@ -256,7 +256,7 @@ func (s *InstanceSetup) generateIDs(idGenerator id.Generator) (err error) {
return err
}
s.zitadel.consoleAppID, err = idGenerator.Next()
s.zitadel.managementConsoleAppID, err = idGenerator.Next()
if err != nil {
return err
}
@@ -272,7 +272,7 @@ func (c *Commands) SetUpInstance(ctx context.Context, setup *InstanceSetup) (str
if err := setup.generateIDs(c.idGenerator); err != nil {
return "", "", nil, "", nil, err
}
ctx = contextWithInstanceSetupInfo(ctx, setup.zitadel.instanceID, setup.zitadel.projectID, setup.zitadel.consoleAppID, c.externalDomain, setup.DefaultLanguage)
ctx = contextWithInstanceSetupInfo(ctx, setup.zitadel.instanceID, setup.zitadel.projectID, setup.zitadel.managementConsoleAppID, c.externalDomain, setup.DefaultLanguage)
validations, pat, machineKey, loginClientPat, err := setUpInstance(ctx, c, setup)
if err != nil {
@@ -310,9 +310,9 @@ func (c *Commands) SetUpInstance(ctx context.Context, setup *InstanceSetup) (str
return setup.zitadel.instanceID, token, machineKey, loginClientToken, details, nil
}
func contextWithInstanceSetupInfo(ctx context.Context, instanceID, projectID, consoleAppID, externalDomain string, defaultLanguage language.Tag) context.Context {
func contextWithInstanceSetupInfo(ctx context.Context, instanceID, projectID, managementConsoleAppID, externalDomain string, defaultLanguage language.Tag) context.Context {
return authz.WithDefaultLanguage(
authz.WithConsole(
authz.WithManagementConsole(
authz.SetCtxData(
http.WithRequestedHost(
authz.WithInstanceID(
@@ -323,7 +323,7 @@ func contextWithInstanceSetupInfo(ctx context.Context, instanceID, projectID, co
authz.CtxData{ResourceOwner: instanceID},
),
projectID,
consoleAppID,
managementConsoleAppID,
),
defaultLanguage,
)
@@ -560,8 +560,8 @@ func setupMinimalInterfaces(commands *Commands, validations *[]preparation.Valid
cnsl := &addOIDCApp{
AddApp: AddApp{
Aggregate: *projectAgg,
ID: ids.consoleAppID,
Name: consoleAppName,
ID: ids.managementConsoleAppID,
Name: managementConsoleAppName,
},
Version: domain.OIDCVersionV1,
RedirectUris: []string{},
@@ -616,7 +616,7 @@ func setupMinimalInterfaces(commands *Commands, validations *[]preparation.Valid
),
commands.AddOIDCAppCommand(cnsl),
SetIAMConsoleID(instanceAgg, &cnsl.ClientID, &ids.consoleAppID),
SetIAMConsoleID(instanceAgg, &cnsl.ClientID, &ids.managementConsoleAppID),
)
}
@@ -811,7 +811,7 @@ func (c *Commands) ChangeSystemConfig(ctx context.Context, externalDomain string
if len(instanceValidations.Validations) == 0 {
continue
}
ctx := authz.WithConsole(authz.WithInstanceID(ctx, instanceID), instanceValidations.ProjectID, instanceValidations.ConsoleAppID)
ctx := authz.WithManagementConsole(authz.WithInstanceID(ctx, instanceID), instanceValidations.ProjectID, instanceValidations.ManagementConsoleAppID)
cmds, err := preparation.PrepareCommands(ctx, c.eventstore.Filter, instanceValidations.Validations...)
if err != nil {
return err
@@ -862,12 +862,12 @@ func SetIAMProject(a *instance.Aggregate, projectID string) preparation.Validati
}
}
// SetIAMConsoleID defines the command to set the clientID of the Console App onto the instance
// SetIAMConsoleID defines the command to set the clientID of the Management Console App onto the instance
func SetIAMConsoleID(a *instance.Aggregate, clientID, appID *string) preparation.Validation {
return func() (preparation.CreateCommands, error) {
return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) {
return []eventstore.Command{
instance.NewIAMConsoleSetEvent(ctx, &a.Aggregate, clientID, appID),
instance.NewIAMManagementConsoleSetEvent(ctx, &a.Aggregate, clientID, appID),
}, nil
}, nil
}