mirror of
https://github.com/andwati/zitadel.git
synced 2026-11-07 06:42:15 +00:00
chore: management console naming inconsistency (#11390)
# 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:
@@ -34,17 +34,17 @@ import (
|
||||
|
||||
func instanceSetupZitadelIDs() ZitadelConfig {
|
||||
return ZitadelConfig{
|
||||
instanceID: "INSTANCE",
|
||||
orgID: "ORG",
|
||||
projectID: "PROJECT",
|
||||
consoleAppID: "console-id",
|
||||
authAppID: "auth-id",
|
||||
mgmtAppID: "mgmt-id",
|
||||
adminAppID: "admin-id",
|
||||
instanceID: "INSTANCE",
|
||||
orgID: "ORG",
|
||||
projectID: "PROJECT",
|
||||
managementConsoleAppID: "console-id",
|
||||
authAppID: "auth-id",
|
||||
mgmtAppID: "mgmt-id",
|
||||
adminAppID: "admin-id",
|
||||
}
|
||||
}
|
||||
|
||||
func projectAddedEvents(ctx context.Context, instanceID, orgID, id, owner string, externalSecure bool) []eventstore.Command {
|
||||
func projectAddedEvents(ctx context.Context, instanceID, orgID, id string, externalSecure bool) []eventstore.Command {
|
||||
events := []eventstore.Command{
|
||||
project.NewProjectAddedEvent(ctx,
|
||||
&project.NewAggregate(id, orgID).Aggregate,
|
||||
@@ -63,14 +63,14 @@ func projectAddedEvents(ctx context.Context, instanceID, orgID, id, owner string
|
||||
events = append(events, apiAppEvents(ctx, orgID, id, "admin-id", "Admin-API")...)
|
||||
events = append(events, apiAppEvents(ctx, orgID, id, "auth-id", "Auth-API")...)
|
||||
|
||||
consoleAppID := "console-id"
|
||||
consoleClientID := "clientID"
|
||||
events = append(events, oidcAppEvents(ctx, orgID, id, consoleAppID, "Console", consoleClientID, externalSecure)...)
|
||||
managementConsoleAppID := "console-id"
|
||||
managementConsoleClientID := "clientID"
|
||||
events = append(events, oidcAppEvents(ctx, orgID, id, managementConsoleAppID, "Management Console", managementConsoleClientID, externalSecure)...)
|
||||
events = append(events,
|
||||
instance.NewIAMConsoleSetEvent(ctx,
|
||||
instance.NewIAMManagementConsoleSetEvent(ctx,
|
||||
&instance.NewAggregate(instanceID).Aggregate,
|
||||
&consoleClientID,
|
||||
&consoleAppID,
|
||||
&managementConsoleClientID,
|
||||
&managementConsoleAppID,
|
||||
),
|
||||
)
|
||||
return events
|
||||
@@ -170,23 +170,20 @@ func orgEvents(ctx context.Context, instanceID, orgID, name, projectID, defaultD
|
||||
instance.NewDefaultOrgSetEventEvent(ctx, &instanceAgg.Aggregate, orgID),
|
||||
}
|
||||
|
||||
owner := ""
|
||||
if machine {
|
||||
machineID := "USER-MACHINE"
|
||||
events = append(events, machineEvents(ctx, instanceID, orgID, machineID, "PAT")...)
|
||||
owner = machineID
|
||||
}
|
||||
if human {
|
||||
userID := "USER"
|
||||
events = append(events, humanEvents(ctx, instanceID, orgID, userID)...)
|
||||
owner = userID
|
||||
}
|
||||
if loginClient {
|
||||
userID := "USER-LOGIN-CLIENT"
|
||||
events = append(events, loginClientEvents(ctx, instanceID, orgID, userID, "LOGIN-CLIENT-PAT")...)
|
||||
}
|
||||
|
||||
events = append(events, projectAddedEvents(ctx, instanceID, orgID, projectID, owner, externalSecure)...)
|
||||
events = append(events, projectAddedEvents(ctx, instanceID, orgID, projectID, externalSecure)...)
|
||||
return events
|
||||
}
|
||||
|
||||
@@ -194,7 +191,7 @@ func orgIDs() []string {
|
||||
return slices.Concat([]string{"USER-MACHINE", "PAT", "USER", "USER-LOGIN-CLIENT", "LOGIN-CLIENT-PAT"}, projectClientIDs())
|
||||
}
|
||||
|
||||
func instancePoliciesFilters(instanceID string) []expect {
|
||||
func instancePoliciesFilters(_ string) []expect {
|
||||
return []expect{
|
||||
expectFilter(),
|
||||
expectFilter(),
|
||||
@@ -774,7 +771,6 @@ func TestCommandSide_setupMinimalInterfaces(t *testing.T) {
|
||||
"INSTANCE",
|
||||
"ORG",
|
||||
"PROJECT",
|
||||
"owner",
|
||||
false,
|
||||
)...,
|
||||
),
|
||||
@@ -1180,13 +1176,13 @@ func TestCommandSide_setupDefaultOrg(t *testing.T) {
|
||||
},
|
||||
},
|
||||
ids: ZitadelConfig{
|
||||
instanceID: "INSTANCE",
|
||||
orgID: "ORG",
|
||||
projectID: "PROJECT",
|
||||
consoleAppID: "console-id",
|
||||
authAppID: "auth-id",
|
||||
mgmtAppID: "mgmt-id",
|
||||
adminAppID: "admin-id",
|
||||
instanceID: "INSTANCE",
|
||||
orgID: "ORG",
|
||||
projectID: "PROJECT",
|
||||
managementConsoleAppID: "console-id",
|
||||
authAppID: "auth-id",
|
||||
mgmtAppID: "mgmt-id",
|
||||
adminAppID: "admin-id",
|
||||
},
|
||||
},
|
||||
res: res{
|
||||
@@ -1787,7 +1783,7 @@ func TestInstanceSetupFeatures_ToInstanceFeatures(t *testing.T) {
|
||||
EnableBackChannelLogout *bool
|
||||
LoginV2 *InstanceSetupFeatureLoginV2
|
||||
PermissionCheckV2 *bool
|
||||
ConsoleUseV2UserApi *bool
|
||||
ManagementConsoleUseV2UserApi *bool
|
||||
EnableRelationalTables *bool
|
||||
}
|
||||
|
||||
@@ -1816,7 +1812,7 @@ func TestInstanceSetupFeatures_ToInstanceFeatures(t *testing.T) {
|
||||
OIDCSingleV1SessionTermination: gu.Ptr(false),
|
||||
EnableBackChannelLogout: gu.Ptr(true),
|
||||
PermissionCheckV2: gu.Ptr(true),
|
||||
ConsoleUseV2UserApi: gu.Ptr(false),
|
||||
ManagementConsoleUseV2UserApi: gu.Ptr(false),
|
||||
EnableRelationalTables: gu.Ptr(true),
|
||||
},
|
||||
want: &InstanceFeatures{
|
||||
@@ -1829,7 +1825,7 @@ func TestInstanceSetupFeatures_ToInstanceFeatures(t *testing.T) {
|
||||
EnableBackChannelLogout: gu.Ptr(true),
|
||||
LoginV2: nil,
|
||||
PermissionCheckV2: gu.Ptr(true),
|
||||
ConsoleUseV2UserApi: gu.Ptr(false),
|
||||
ManagementConsoleUseV2UserApi: gu.Ptr(false),
|
||||
EnableRelationalTables: gu.Ptr(true),
|
||||
},
|
||||
},
|
||||
@@ -1886,7 +1882,7 @@ func TestInstanceSetupFeatures_ToInstanceFeatures(t *testing.T) {
|
||||
EnableBackChannelLogout: tc.fields.EnableBackChannelLogout,
|
||||
LoginV2: tc.fields.LoginV2,
|
||||
PermissionCheckV2: tc.fields.PermissionCheckV2,
|
||||
ConsoleUseV2UserApi: tc.fields.ConsoleUseV2UserApi,
|
||||
ManagementConsoleUseV2UserApi: tc.fields.ManagementConsoleUseV2UserApi,
|
||||
EnableRelationalTables: tc.fields.EnableRelationalTables,
|
||||
}
|
||||
got, err := f.ToInstanceFeatures()
|
||||
|
||||
Reference in New Issue
Block a user