Merge pull request #95 from zitadel/v2beta-v2

change paths from v2beta to v2

apps/login/cypress/integration/login.cy.ts

@@ -2,7 +2,7 @@ import { stub } from "../support/mock";
 
 describe("login", () => {
   beforeEach(() => {
-    stub("zitadel.session.v2beta.SessionService", "CreateSession", {
+    stub("zitadel.session.v2.SessionService", "CreateSession", {
       data: {
         details: {
           sequence: 859,
@@ -16,7 +16,7 @@ describe("login", () => {
       },
     });
 
-    stub("zitadel.session.v2beta.SessionService", "GetSession", {
+    stub("zitadel.session.v2.SessionService", "GetSession", {
       data: {
         session: {
           id: "221394658884845598",
@@ -37,7 +37,7 @@ describe("login", () => {
       },
     });
 
-    stub("zitadel.settings.v2beta.SettingsService", "GetLoginSettings", {
+    stub("zitadel.settings.v2.SettingsService", "GetLoginSettings", {
       data: {
         settings: {
           passkeysType: 1,
@@ -47,7 +47,7 @@ describe("login", () => {
   });
   describe("password login", () => {
     beforeEach(() => {
-      stub("zitadel.user.v2beta.UserService", "ListUsers", {
+      stub("zitadel.user.v2.UserService", "ListUsers", {
         data: {
           details: {
             totalResult: 1,
@@ -79,7 +79,7 @@ describe("login", () => {
           ],
         },
       });
-      stub("zitadel.user.v2beta.UserService", "ListAuthenticationMethodTypes", {
+      stub("zitadel.user.v2.UserService", "ListAuthenticationMethodTypes", {
         data: {
           authMethodTypes: [1], // 1 for password authentication
         },
@@ -91,7 +91,7 @@ describe("login", () => {
     });
     describe("with passkey prompt", () => {
       beforeEach(() => {
-        stub("zitadel.session.v2beta.SessionService", "SetSession", {
+        stub("zitadel.session.v2.SessionService", "SetSession", {
           data: {
             details: {
               sequence: 859,
@@ -118,7 +118,7 @@ describe("login", () => {
   });
   describe("passkey login", () => {
     beforeEach(() => {
-      stub("zitadel.user.v2beta.UserService", "ListUsers", {
+      stub("zitadel.user.v2.UserService", "ListUsers", {
         data: {
           details: {
             totalResult: 1,
@@ -150,7 +150,7 @@ describe("login", () => {
           ],
         },
       });
-      stub("zitadel.user.v2beta.UserService", "ListAuthenticationMethodTypes", {
+      stub("zitadel.user.v2.UserService", "ListAuthenticationMethodTypes", {
         data: {
           authMethodTypes: [2], // 2 for passwordless authentication
         },

apps/login/cypress/integration/register-idp.cy.ts

@@ -4,7 +4,7 @@ const IDP_URL = "https://example.com/idp/url";
 
 describe("register idps", () => {
   beforeEach(() => {
-    stub("zitadel.user.v2beta.UserService", "StartIdentityProviderIntent", {
+    stub("zitadel.user.v2.UserService", "StartIdentityProviderIntent", {
       data: {
         authUrl: IDP_URL,
       },

apps/login/cypress/integration/register.cy.ts

@@ -2,7 +2,7 @@ import { stub } from "../support/mock";
 
 describe("register", () => {
   beforeEach(() => {
-    stub("zitadel.user.v2beta.UserService", "AddHumanUser", {
+    stub("zitadel.user.v2.UserService", "AddHumanUser", {
       data: {
         userId: "123",
       },

apps/login/cypress/integration/verify.cy.ts

@@ -2,12 +2,12 @@ import { stub } from "../support/mock";
 
 describe("/verify", () => {
   it("redirects after successful email verification", () => {
-    stub("zitadel.user.v2beta.UserService", "VerifyEmail");
+    stub("zitadel.user.v2.UserService", "VerifyEmail");
     cy.visit("/verify?userId=123&code=abc&submit=true");
     cy.location("pathname", { timeout: 10_000 }).should("eq", "/loginname");
   });
   it("shows an error if validation failed", () => {
-    stub("zitadel.user.v2beta.UserService", "VerifyEmail", {
+    stub("zitadel.user.v2.UserService", "VerifyEmail", {
       code: 3,
       error: "error validating code",
     });

apps/login/mock/initial-stubs/zitadel.settings.v2beta.SettingsService.json

@@ -1,11 +1,11 @@
 [
   {
-    "service": "zitadel.settings.v2beta.SettingsService",
+    "service": "zitadel.settings.v2.SettingsService",
     "method": "GetBrandingSettings",
     "out": {}
   },
   {
-    "service": "zitadel.settings.v2beta.SettingsService",
+    "service": "zitadel.settings.v2.SettingsService",
     "method": "GetLegalAndSupportSettings",
     "out": {
       "data": {
@@ -18,7 +18,7 @@
     }
   },
   {
-    "service": "zitadel.settings.v2beta.SettingsService",
+    "service": "zitadel.settings.v2.SettingsService",
     "method": "GetActiveIdentityProviders",
     "out": {
       "data": {
@@ -33,7 +33,7 @@
     }
   },
   {
-    "service": "zitadel.settings.v2beta.SettingsService",
+    "service": "zitadel.settings.v2.SettingsService",
     "method": "GetPasswordComplexitySettings",
     "out": {
       "data": {

apps/login/mock/mocked-services.cfg

@@ -1,6 +1,6 @@
-zitadel/user/v2beta/user_service.proto
+zitadel/user/v2/user_service.proto
-zitadel/session/v2beta/session_service.proto
+zitadel/session/v2/session_service.proto
-zitadel/settings/v2beta/settings_service.proto
+zitadel/settings/v2/settings_service.proto
 zitadel/management.proto
 zitadel/auth.proto
 zitadel/admin.proto

apps/login/src/app/(login)/idp/[provider]/success/page.tsx

@@ -3,11 +3,8 @@ import { getBrandingSettings, userService } from "@/lib/zitadel";
 import Alert, { AlertType } from "@/ui/Alert";
 import DynamicTheme from "@/ui/DynamicTheme";
 import IdpSignin from "@/ui/IdpSignin";
-import { AddHumanUserRequest } from "@zitadel/proto/zitadel/user/v2beta/user_service_pb";
+import { AddHumanUserRequest } from "@zitadel/proto/zitadel/user/v2/user_service_pb";
-import {
+import { IDPInformation, IDPLink } from "@zitadel/proto/zitadel/user/v2/idp_pb";
-  IDPInformation,
-  IDPLink,
-} from "@zitadel/proto/zitadel/user/v2beta/idp_pb";
 import { PartialMessage } from "@zitadel/client";
 
 const PROVIDER_MAPPING: {

apps/login/src/app/(login)/idp/page.tsx

@@ -5,7 +5,7 @@ import {
 } from "@/lib/zitadel";
 import DynamicTheme from "@/ui/DynamicTheme";
 import { SignInWithIDP } from "@/ui/SignInWithIDP";
-import { makeReqCtx } from "@zitadel/client/v2beta";
+import { makeReqCtx } from "@zitadel/client/v2";
 
 function getIdentityProviders(orgId?: string) {
   return settingsService

apps/login/src/app/(login)/loginname/page.tsx

@@ -7,7 +7,7 @@ import {
 import DynamicTheme from "@/ui/DynamicTheme";
 import { SignInWithIDP } from "@/ui/SignInWithIDP";
 import UsernameForm from "@/ui/UsernameForm";
-import { makeReqCtx } from "@zitadel/client/v2beta";
+import { makeReqCtx } from "@zitadel/client/v2";
 
 function getIdentityProviders(orgId?: string) {
   return settingsService

apps/login/src/app/(login)/otp/[method]/set/page.tsx

@@ -14,7 +14,7 @@ import TOTPRegister from "@/ui/TOTPRegister";
 import UserAvatar from "@/ui/UserAvatar";
 import { getMostRecentCookieWithLoginname } from "@/utils/cookies";
 import Link from "next/link";
-import { RegisterTOTPResponse } from "@zitadel/proto/zitadel/user/v2beta/user_service_pb";
+import { RegisterTOTPResponse } from "@zitadel/proto/zitadel/user/v2/user_service_pb";
 
 export default async function Page({
   searchParams,

apps/login/src/app/api/loginname/route.ts

@@ -8,7 +8,7 @@ import {
   startIdentityProviderFlow,
 } from "@/lib/zitadel";
 import { createSessionForUserIdAndUpdateCookie } from "@/utils/session";
-import { IdentityProviderType } from "@zitadel/proto/zitadel/settings/v2beta/login_settings_pb";
+import { IdentityProviderType } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb";
 import { NextRequest, NextResponse } from "next/server";
 
 export async function POST(request: NextRequest) {

apps/login/src/app/api/otp/set/route.ts

@@ -6,7 +6,7 @@ import {
 } from "@/utils/cookies";
 import { setSessionAndUpdateCookie } from "@/utils/session";
 import { NextRequest, NextResponse, userAgent } from "next/server";
-import { Checks } from "@zitadel/proto/zitadel/session/v2beta/session_service_pb";
+import { Checks } from "@zitadel/proto/zitadel/session/v2/session_service_pb";
 import { PlainMessage } from "@zitadel/client";
 
 export async function POST(request: NextRequest) {

apps/login/src/app/api/u2f/verify/route.ts

@@ -1,7 +1,7 @@
 import { getSession, verifyU2FRegistration } from "@/lib/zitadel";
 import { getSessionCookieById } from "@/utils/cookies";
 import { NextRequest, NextResponse, userAgent } from "next/server";
-import { VerifyU2FRegistrationRequest } from "@zitadel/proto/zitadel/user/v2beta/user_service_pb";
+import { VerifyU2FRegistrationRequest } from "@zitadel/proto/zitadel/user/v2/user_service_pb";
 import { PlainMessage } from "@zitadel/client";
 
 export async function POST(request: NextRequest) {

apps/login/src/app/login/route.ts

@@ -8,12 +8,12 @@ import {
 } from "@/lib/zitadel";
 import { SessionCookie, getAllSessions } from "@/utils/cookies";
 import { NextRequest, NextResponse } from "next/server";
-import { Session } from "@zitadel/proto/zitadel/session/v2beta/session_pb";
+import { Session } from "@zitadel/proto/zitadel/session/v2/session_pb";
 import {
   AuthRequest,
   Prompt,
-} from "@zitadel/proto/zitadel/oidc/v2beta/authorization_pb";
+} from "@zitadel/proto/zitadel/oidc/v2/authorization_pb";
-import { IdentityProviderType } from "@zitadel/proto/zitadel/settings/v2beta/login_settings_pb";
+import { IdentityProviderType } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb";
 
 async function loadSessions(ids: string[]): Promise<Session[]> {
   const response = await listSessions(

apps/login/src/app/sessions/route.ts

@@ -1,6 +1,6 @@
 import { listSessions } from "@/lib/zitadel";
 import { SessionCookie, getAllSessions } from "@/utils/cookies";
-import { Session } from "@zitadel/proto/zitadel/session/v2beta/session_pb";
+import { Session } from "@zitadel/proto/zitadel/session/v2/session_pb";
 import { NextRequest, NextResponse } from "next/server";
 
 async function loadSessions(ids: string[]): Promise<Session[]> {

apps/login/src/lib/zitadel.ts

@@ -4,20 +4,20 @@ import {
   createSettingsServiceClient,
   createUserServiceClient,
   makeReqCtx,
-} from "@zitadel/client/v2beta";
+} from "@zitadel/client/v2";
 import { createManagementServiceClient } from "@zitadel/client/v1";
 import { createServerTransport } from "@zitadel/node";
-import { GetActiveIdentityProvidersRequest } from "@zitadel/proto/zitadel/settings/v2beta/settings_service_pb";
+import { GetActiveIdentityProvidersRequest } from "@zitadel/proto/zitadel/settings/v2/settings_service_pb";
-import { Checks } from "@zitadel/proto/zitadel/session/v2beta/session_service_pb";
+import { Checks } from "@zitadel/proto/zitadel/session/v2/session_service_pb";
-import { RequestChallenges } from "@zitadel/proto/zitadel/session/v2beta/challenge_pb";
+import { RequestChallenges } from "@zitadel/proto/zitadel/session/v2/challenge_pb";
 import {
   RetrieveIdentityProviderIntentRequest,
   VerifyU2FRegistrationRequest,
-} from "@zitadel/proto/zitadel/user/v2beta/user_service_pb";
+} from "@zitadel/proto/zitadel/user/v2/user_service_pb";
 
-import { CreateCallbackRequest } from "@zitadel/proto/zitadel/oidc/v2beta/oidc_service_pb";
+import { CreateCallbackRequest } from "@zitadel/proto/zitadel/oidc/v2/oidc_service_pb";
-import { TextQueryMethod } from "@zitadel/proto/zitadel/object/v2beta/object_pb";
+import { TextQueryMethod } from "@zitadel/proto/zitadel/object/v2/object_pb";
-import type { RedirectURLs } from "@zitadel/proto/zitadel/user/v2beta/idp_pb";
+import type { RedirectURLs } from "@zitadel/proto/zitadel/user/v2/idp_pb";
 import { ProviderSlug } from "./demos";
 import { PlainMessage } from "@zitadel/client";
 

apps/login/src/ui/ChooseSecondFactor.tsx

@@ -5,7 +5,7 @@ import { BadgeState, StateBadge } from "./StateBadge";
 import clsx from "clsx";
 import { CheckIcon } from "@heroicons/react/24/outline";
 import { EMAIL, SMS, TOTP, U2F } from "./AuthMethods";
-import { AuthenticationMethodType } from "@zitadel/proto/zitadel/user/v2beta/user_service_pb";
+import { AuthenticationMethodType } from "@zitadel/proto/zitadel/user/v2/user_service_pb";
 
 type Props = {
   loginName?: string;

apps/login/src/ui/ChooseSecondFactorToSetup.tsx

@@ -1,8 +1,8 @@
 "use client";
 
 import { EMAIL, SMS, TOTP, U2F } from "./AuthMethods";
-import { LoginSettings } from "@zitadel/proto/zitadel/settings/v2beta/login_settings_pb";
+import { LoginSettings } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb";
-import { AuthenticationMethodType } from "@zitadel/proto/zitadel/user/v2beta/user_service_pb";
+import { AuthenticationMethodType } from "@zitadel/proto/zitadel/user/v2/user_service_pb";
 
 type Props = {
   loginName?: string;

apps/login/src/ui/DynamicTheme.tsx

@@ -4,7 +4,7 @@ import React from "react";
 import { Logo } from "@/ui/Logo";
 import ThemeWrapper from "./ThemeWrapper";
 import { LayoutProviders } from "./LayoutProviders";
-import { BrandingSettings } from "@zitadel/proto/zitadel/settings/v2beta/branding_settings_pb";
+import { BrandingSettings } from "@zitadel/proto/zitadel/settings/v2/branding_settings_pb";
 
 export default function DynamicTheme({
   branding,

apps/login/src/ui/LoginOTP.tsx

@@ -8,9 +8,9 @@ import { Spinner } from "./Spinner";
 import { useForm } from "react-hook-form";
 import { TextInput } from "./Input";
 import BackButton from "./BackButton";
-import { Checks } from "@zitadel/proto/zitadel/session/v2beta/session_service_pb";
+import { Checks } from "@zitadel/proto/zitadel/session/v2/session_service_pb";
 import { PlainMessage } from "@zitadel/client";
-import { Challenges } from "@zitadel/proto/zitadel/session/v2beta/challenge_pb";
+import { Challenges } from "@zitadel/proto/zitadel/session/v2/challenge_pb";
 
 // either loginName or sessionId must be provided
 type Props = {

apps/login/src/ui/LoginPasskey.tsx

@@ -7,7 +7,7 @@ import { Button, ButtonVariants } from "./Button";
 import Alert from "./Alert";
 import { Spinner } from "./Spinner";
 import BackButton from "./BackButton";
-import { Checks } from "@zitadel/proto/zitadel/session/v2beta/session_service_pb";
+import { Checks } from "@zitadel/proto/zitadel/session/v2/session_service_pb";
 
 // either loginName or sessionId must be provided
 type Props = {

apps/login/src/ui/PasswordComplexity.tsx

@@ -4,7 +4,7 @@ import {
   symbolValidator,
   upperCaseValidator,
 } from "@/utils/validators";
-import { PasswordComplexitySettings } from "@zitadel/proto/zitadel/settings/v2beta/password_settings_pb";
+import { PasswordComplexitySettings } from "@zitadel/proto/zitadel/settings/v2/password_settings_pb";
 
 type Props = {
   passwordComplexitySettings: PasswordComplexitySettings;

apps/login/src/ui/PasswordForm.tsx

@@ -8,9 +8,9 @@ import { useRouter } from "next/navigation";
 import { Spinner } from "./Spinner";
 import Alert from "./Alert";
 import BackButton from "./BackButton";
-import { LoginSettings } from "@zitadel/proto/zitadel/settings/v2beta/login_settings_pb";
+import { LoginSettings } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb";
-import { Checks } from "@zitadel/proto/zitadel/session/v2beta/session_service_pb";
+import { Checks } from "@zitadel/proto/zitadel/session/v2/session_service_pb";
-import { AuthenticationMethodType } from "@zitadel/proto/zitadel/user/v2beta/user_service_pb";
+import { AuthenticationMethodType } from "@zitadel/proto/zitadel/user/v2/user_service_pb";
 
 type Inputs = {
   password: string;

apps/login/src/ui/PrivacyPolicyCheckboxes.tsx

@@ -2,7 +2,7 @@
 import React, { useState } from "react";
 import Link from "next/link";
 import { Checkbox } from "./Checkbox";
-import { LegalAndSupportSettings } from "@zitadel/proto/zitadel/settings/v2beta/legal_settings_pb";
+import { LegalAndSupportSettings } from "@zitadel/proto/zitadel/settings/v2/legal_settings_pb";
 
 type Props = {
   legal: LegalAndSupportSettings;

apps/login/src/ui/RegisterFormWithoutPassword.tsx

@@ -12,7 +12,7 @@ import AuthenticationMethodRadio, {
 } from "./AuthenticationMethodRadio";
 import Alert from "./Alert";
 import BackButton from "./BackButton";
-import { LegalAndSupportSettings } from "@zitadel/proto/zitadel/settings/v2beta/legal_settings_pb";
+import { LegalAndSupportSettings } from "@zitadel/proto/zitadel/settings/v2/legal_settings_pb";
 import { first } from "node_modules/cypress/types/lodash";
 
 type Inputs =

apps/login/src/ui/RegisterPasskey.tsx

@@ -8,7 +8,7 @@ import { Spinner } from "./Spinner";
 import Alert from "./Alert";
 import { coerceToArrayBuffer, coerceToBase64Url } from "@/utils/base64";
 import BackButton from "./BackButton";
-import { RegisterPasskeyResponse } from "@zitadel/proto/zitadel/user/v2beta/user_service_pb";
+import { RegisterPasskeyResponse } from "@zitadel/proto/zitadel/user/v2/user_service_pb";
 
 type Inputs = {};
 

apps/login/src/ui/RegisterU2F.tsx

@@ -8,7 +8,7 @@ import { Spinner } from "./Spinner";
 import Alert from "./Alert";
 import { coerceToArrayBuffer, coerceToBase64Url } from "@/utils/base64";
 import BackButton from "./BackButton";
-import { RegisterU2FResponse } from "@zitadel/proto/zitadel/user/v2beta/user_service_pb";
+import { RegisterU2FResponse } from "@zitadel/proto/zitadel/user/v2/user_service_pb";
 
 type Inputs = {};
 

apps/login/src/ui/SessionItem.tsx

@@ -5,7 +5,7 @@ import { useState } from "react";
 import { Avatar } from "./Avatar";
 import moment from "moment";
 import { XCircleIcon } from "@heroicons/react/24/outline";
-import { Session } from "@zitadel/proto/zitadel/session/v2beta/session_pb";
+import { Session } from "@zitadel/proto/zitadel/session/v2/session_pb";
 
 export default function SessionItem({
   session,

apps/login/src/ui/SessionsList.tsx

@@ -3,7 +3,7 @@
 import SessionItem from "./SessionItem";
 import Alert from "./Alert";
 import { useEffect, useState } from "react";
-import { Session } from "@zitadel/proto/zitadel/session/v2beta/session_pb";
+import { Session } from "@zitadel/proto/zitadel/session/v2/session_pb";
 
 type Props = {
   sessions: Session[];

apps/login/src/ui/SetPasswordForm.tsx

@@ -14,7 +14,7 @@ import {
 import { useRouter } from "next/navigation";
 import { Spinner } from "./Spinner";
 import Alert from "./Alert";
-import { PasswordComplexitySettings } from "@zitadel/proto/zitadel/settings/v2beta/password_settings_pb";
+import { PasswordComplexitySettings } from "@zitadel/proto/zitadel/settings/v2/password_settings_pb";
 
 type Inputs =
   | {

apps/login/src/ui/SignInWithIDP.tsx

@@ -11,7 +11,7 @@ import { useRouter } from "next/navigation";
 import { ProviderSlug } from "@/lib/demos";
 import Alert from "./Alert";
 import BackButton from "./BackButton";
-import { IdentityProvider } from "@zitadel/proto/zitadel/settings/v2beta/login_settings_pb";
+import { IdentityProvider } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb";
 
 export interface SignInWithIDPProps {
   children?: ReactNode;

apps/login/src/ui/ThemeWrapper.tsx

@@ -2,7 +2,7 @@
 
 import { setTheme } from "@/utils/colors";
 import { useEffect } from "react";
-import { BrandingSettings } from "@zitadel/proto/zitadel/settings/v2beta/branding_settings_pb";
+import { BrandingSettings } from "@zitadel/proto/zitadel/settings/v2/branding_settings_pb";
 import { PartialMessage } from "@zitadel/client";
 
 type Props = {

apps/login/src/ui/UsernameForm.tsx

@@ -10,7 +10,7 @@ import Alert from "./Alert";
 import {
   LoginSettings,
   PasskeysType,
-} from "@zitadel/proto/zitadel/settings/v2beta/login_settings_pb";
+} from "@zitadel/proto/zitadel/settings/v2/login_settings_pb";
 
 type Inputs = {
   loginName: string;

apps/login/src/utils/colors.ts

@@ -1,5 +1,5 @@
 import tinycolor from "tinycolor2";
-import { BrandingSettings } from "@zitadel/proto/zitadel/settings/v2beta/branding_settings_pb";
+import { BrandingSettings } from "@zitadel/proto/zitadel/settings/v2/branding_settings_pb";
 import { PartialMessage } from "@zitadel/client";
 
 export interface Color {

apps/login/src/utils/session.ts

@@ -14,9 +14,9 @@ import {
 import {
   Challenges,
   RequestChallenges,
-} from "@zitadel/proto/zitadel/session/v2beta/challenge_pb";
+} from "@zitadel/proto/zitadel/session/v2/challenge_pb";
-import { Session } from "@zitadel/proto/zitadel/session/v2beta/session_pb";
+import { Session } from "@zitadel/proto/zitadel/session/v2/session_pb";
-import { Checks } from "@zitadel/proto/zitadel/session/v2beta/session_service_pb";
+import { Checks } from "@zitadel/proto/zitadel/session/v2/session_service_pb";
 import { PlainMessage } from "@zitadel/client";
 
 export async function createSessionAndUpdateCookie(

packages/zitadel-client/package.json

@@ -23,11 +23,6 @@
       "require": "./dist/v2.cjs",
       "types": "./dist/v2.d.ts"
     },
-    "./v2beta": {
-      "import": "./dist/v2.js",
-      "require": "./dist/v2.cjs",
-      "types": "./dist/v2.d.ts"
-    },
     "./v3alpha": {
       "import": "./dist/v3alpha.js",
       "require": "./dist/v3alpha.cjs",