From 98bf8359c5b52a9b60b1e47946335f71a7fed1a5 Mon Sep 17 00:00:00 2001
From: Livio Spring <livio.a@gmail.com>
Date: Thu, 4 Sep 2025 09:56:10 +0200
Subject: [PATCH] fix: enable ConsoleUseV2UserApi feature by default (#10631)

# Which Problems Are Solved

Starting with Zitadel v4, the new login UI is enabled by default (for
new instances) through the corresponding feature flag.
There's an additional flag to use the V2 API in console, which is mostly
required to use the login V2 without problems, but was not yet activated
by default (for new instances).

# How the Problems Are Solved

- Enabled the `ConsoleUseV2UserApi` feature flag on the
`defaultInstance`

# Additional Changes

- Cleaned up removed flags on the `defaultInstance`

# Additional Context

- noticed internally
- backport to v4.x
---
 cmd/defaults.yaml                   | 5 +----
 e2e/cypress/e2e/humans/humans.cy.ts | 9 +++------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/cmd/defaults.yaml b/cmd/defaults.yaml
index e0467af41..846e0caaf 100644
--- a/cmd/defaults.yaml
+++ b/cmd/defaults.yaml
@@ -1132,8 +1132,6 @@ DefaultInstance:
   # will be ignored until instance level features are reset.
   Features:
     LoginDefaultOrg: true # ZITADEL_DEFAULTINSTANCE_FEATURES_LOGINDEFAULTORG
-    # TriggerIntrospectionProjections: false # ZITADEL_DEFAULTINSTANCE_FEATURES_TRIGGERINTROSPECTIONPROJECTIONS
-    # LegacyIntrospection: false # ZITADEL_DEFAULTINSTANCE_FEATURES_LEGACYINTROSPECTION
     # UserSchema: false # ZITADEL_DEFAULTINSTANCE_FEATURES_USERSCHEMA
     # TokenExchange: false # ZITADEL_DEFAULTINSTANCE_FEATURES_TOKENEXCHANGE
     ImprovedPerformance: # ZITADEL_DEFAULTINSTANCE_FEATURES_IMPROVEDPERFORMANCE
@@ -1143,7 +1141,6 @@ DefaultInstance:
     #   - 3 # Project
     #   - 4 # UserGrant
     #   - 5 # OrgDomainVerified
-    # WebKey: false # ZITADEL_DEFAULTINSTANCE_FEATURES_WEBKEY
     # DebugOIDCParentError: false # ZITADEL_DEFAULTINSTANCE_FEATURES_DEBUGOIDCPARENTERROR
     # OIDCSingleV1SessionTermination: false # ZITADEL_DEFAULTINSTANCE_FEATURES_OIDCSINGLEV1SESSIONTERMINATION
     # EnableBackChannelLogout: false # ZITADEL_DEFAULTINSTANCE_FEATURES_ENABLEBACKCHANNELLOGOUT
@@ -1151,7 +1148,7 @@ DefaultInstance:
       Required: true # ZITADEL_DEFAULTINSTANCE_FEATURES_LOGINV2_REQUIRED
     #  BaseURI: "" # ZITADEL_DEFAULTINSTANCE_FEATURES_LOGINV2_BASEURI
     # PermissionCheckV2: false # ZITADEL_DEFAULTINSTANCE_FEATURES_PERMISSIONCHECKV2
-    # ConsoleUseV2UserApi: false # ZITADEL_DEFAULTINSTANCE_FEATURES_CONSOLEUSEV2USERAPI
+    ConsoleUseV2UserApi: true # ZITADEL_DEFAULTINSTANCE_FEATURES_CONSOLEUSEV2USERAPI
     # EnableRelationalTables: false # ZITADEL_DEFAULTINSTANCE_FEATURES_ENABLERELATIONALTABLES
 
   Limits:
diff --git a/e2e/cypress/e2e/humans/humans.cy.ts b/e2e/cypress/e2e/humans/humans.cy.ts
index a018db60c..f599d7da8 100644
--- a/e2e/cypress/e2e/humans/humans.cy.ts
+++ b/e2e/cypress/e2e/humans/humans.cy.ts
@@ -30,12 +30,9 @@ describe('humans', () => {
         cy.url().should('contain', 'users/create');
         cy.get('[formcontrolname="email"]').should('be.enabled').type('dummy@dummy.com');
         //force needed due to the prefilled username prefix
-        cy.get('[formcontrolname="userName"]').should('be.enabled').type(user.addName);
-        cy.get('[formcontrolname="firstName"]').should('be.enabled').type('e2ehumanfirstname');
-        cy.get('[formcontrolname="lastName"]').should('be.enabled').type('e2ehumanlastname');
-        cy.get('mat-select[data-cy="country-calling-code"]').click();
-        cy.contains('mat-option', 'Switzerland').scrollIntoView().click();
-        cy.get('[formcontrolname="phone"]').should('be.enabled').type('123456789');
+        cy.get('[formcontrolname="username"]').should('be.enabled').type(user.addName);
+        cy.get('[formcontrolname="givenName"]').should('be.enabled').type('e2ehumanfirstname');
+        cy.get('[formcontrolname="familyName"]').should('be.enabled').type('e2ehumanlastname');
         cy.get('[data-e2e="create-button"]').click({ force: true });
         cy.shouldConfirmSuccess();
         let loginName = user.addName;