fix: remove old zitadel client

.gitignore

@@ -14,7 +14,6 @@ server/dist
 public/dist
 .turbo
 packages/zitadel-server/src/app/proto
-packages/zitadel-client/src/app/proto
 .vscode
 .idea
 .vercel

.prettierignore

@@ -1,2 +1,3 @@
 .next/
 dist/
+packages/zitadel-proto/zitadel

apps/login/package.json

@@ -37,7 +37,7 @@
     "@tailwindcss/forms": "0.5.7",
     "@vercel/analytics": "^1.2.2",
     "@zitadel/proto": "workspace:*",
-    "@zitadel/client2": "workspace:*",
+    "@zitadel/client": "workspace:*",
     "@zitadel/react": "workspace:*",
     "@zitadel/node": "workspace:*",
     "clsx": "1.2.1",

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

@@ -8,7 +8,7 @@ import {
   IDPInformation,
   IDPLink,
 } from "@zitadel/proto/zitadel/user/v2beta/idp_pb";
-import { PartialMessage } from "@zitadel/client2";
+import { PartialMessage } from "@zitadel/client";
 
 const PROVIDER_MAPPING: {
   [provider: string]: (

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/client2/v2beta";
+import { makeReqCtx } from "@zitadel/client/v2beta";
 
 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/client2/v2beta";
+import { makeReqCtx } from "@zitadel/client/v2beta";
 
 function getIdentityProviders(orgId?: string) {
   return settingsService

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

@@ -7,7 +7,7 @@ import {
 import { setSessionAndUpdateCookie } from "@/utils/session";
 import { NextRequest, NextResponse, userAgent } from "next/server";
 import { Checks } from "@zitadel/proto/zitadel/session/v2beta/session_service_pb";
-import { PlainMessage } from "@zitadel/client2";
+import { PlainMessage } from "@zitadel/client";
 
 export async function POST(request: NextRequest) {
   const body = await request.json();

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

@@ -2,7 +2,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 { PlainMessage } from "@zitadel/client2";
+import { PlainMessage } from "@zitadel/client";
 
 export async function POST(request: NextRequest) {
   const body = await request.json();

apps/login/src/lib/zitadel.ts

@@ -4,8 +4,8 @@ import {
   createSettingsServiceClient,
   createUserServiceClient,
   makeReqCtx,
-} from "@zitadel/client2/v2beta";
-import { createManagementServiceClient } from "@zitadel/client2/v1";
+} from "@zitadel/client/v2beta";
+import { createManagementServiceClient } from "@zitadel/client/v1";
 import { createServerTransport } from "@zitadel/node";
 import { Checks } from "@zitadel/proto/zitadel/session/v2beta/session_service_pb";
 import { RequestChallenges } from "@zitadel/proto/zitadel/session/v2beta/challenge_pb";
@@ -16,7 +16,7 @@ import {
 import { CreateCallbackRequest } from "@zitadel/proto/zitadel/oidc/v2beta/oidc_service_pb";
 import { TextQueryMethod } from "@zitadel/proto/zitadel/object/v2beta/object_pb";
 import type { RedirectURLs } from "@zitadel/proto/zitadel/user/v2beta/idp_pb";
-import { PlainMessage } from "@zitadel/client2";
+import { PlainMessage } from "@zitadel/client";
 
 const SESSION_LIFETIME_S = 3000;
 

apps/login/src/ui/LoginOTP.tsx

@@ -9,7 +9,7 @@ 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 { PlainMessage } from "@zitadel/client2";
+import { PlainMessage } from "@zitadel/client";
 import { Challenges } from "@zitadel/proto/zitadel/session/v2beta/challenge_pb";
 
 // either loginName or sessionId must be provided

apps/login/src/ui/ThemeWrapper.tsx

@@ -3,7 +3,7 @@
 import { setTheme } from "@/utils/colors";
 import { useEffect } from "react";
 import { BrandingSettings } from "@zitadel/proto/zitadel/settings/v2beta/branding_settings_pb";
-import { PartialMessage } from "@zitadel/client2";
+import { PartialMessage } from "@zitadel/client";
 
 type Props = {
   branding: PartialMessage<BrandingSettings> | undefined;

apps/login/src/utils/colors.ts

@@ -1,6 +1,6 @@
 import tinycolor from "tinycolor2";
 import { BrandingSettings } from "@zitadel/proto/zitadel/settings/v2beta/branding_settings_pb";
-import { PartialMessage } from "@zitadel/client2";
+import { PartialMessage } from "@zitadel/client";
 
 export interface Color {
   name: string;

apps/login/src/utils/session.ts

@@ -17,7 +17,7 @@ import {
 } from "@zitadel/proto/zitadel/session/v2beta/challenge_pb";
 import { Session } from "@zitadel/proto/zitadel/session/v2beta/session_pb";
 import { Checks } from "@zitadel/proto/zitadel/session/v2beta/session_service_pb";
-import { PlainMessage } from "@zitadel/client2";
+import { PlainMessage } from "@zitadel/client";
 
 export async function createSessionAndUpdateCookie(
   loginName: string,

apps/login/turbo.json

@@ -1,35 +1,35 @@
 {
   "extends": ["//"],
-  "pipeline": {
+  "tasks": {
     "build": {
       "outputs": ["dist/**", ".next/**", "!.next/cache/**"],
       "dependsOn": ["^build"]
     },
     "test": {
       "dependsOn": [
         "@zitadel/node#build",
-        "@zitadel/client2#build",
+        "@zitadel/client#build",
         "@zitadel/react#build"
       ]
     },
     "test:integration": {
       "dependsOn": [
         "@zitadel/node#build",
-        "@zitadel/client2#build",
+        "@zitadel/client#build",
         "@zitadel/react#build"
       ]
     },
     "test:unit": {
       "dependsOn": [
         "@zitadel/node#build",
-        "@zitadel/client2#build",
+        "@zitadel/client#build",
         "@zitadel/react#build"
       ]
     },
     "test:watch": {
       "dependsOn": [
         "@zitadel/node#build",
-        "@zitadel/client2#build",
+        "@zitadel/client#build",
         "@zitadel/react#build"
       ]
     }

package.json

@@ -1,6 +1,7 @@
 {
   "packageManager": "[email protected]+sha256.19c17528f9ca20bd442e4ca42f00f1b9808a9cb419383cd04ba32ef19322aba7",
   "private": true,
+  "name": "typescript-monorepo",
   "scripts": {
     "generate": "turbo run generate",
     "build": "turbo run build",
@@ -29,7 +30,7 @@
     "eslint-config-zitadel": "workspace:*",
     "prettier": "^3.2.5",
     "tsup": "^8.0.2",
-    "turbo": "^1.13.3",
+    "turbo": "2.0.9",
     "typescript": "^5.4.5",
     "vite-tsconfig-paths": "^4.3.2",
     "vitest": "^1.6.0"

packages/eslint-config-zitadel/package.json

@@ -11,6 +11,6 @@
     "@typescript-eslint/parser": "^7.9.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-react": "^7.34.1",
-    "eslint-config-turbo": "^1.13.3"
+    "eslint-config-turbo": "^2.0.9"
   }
 }

packages/zitadel-client/package.json

@@ -1,37 +1,55 @@
 {
   "name": "@zitadel/client",
   "version": "0.0.0",
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
-  "sideEffects": false,
   "license": "MIT",
+  "private": true,
+  "publishConfig": {
+    "access": "public"
+  },
+  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts"
+    },
+    "./v1": {
+      "import": "./dist/v1.js",
+      "require": "./dist/v1.cjs",
+      "types": "./dist/v1.d.ts"
+    },
+    "./v2beta": {
+      "import": "./dist/v2beta.js",
+      "require": "./dist/v2beta.cjs",
+      "types": "./dist/v2beta.d.ts"
+    },
+    "./v3alpha": {
+      "import": "./dist/v3alpha.js",
+      "require": "./dist/v3alpha.cjs",
+      "types": "./dist/v3alpha.d.ts"
+    }
+  },
   "files": [
     "dist/**"
   ],
+  "sideEffects": false,
   "scripts": {
-    "generate": "buf generate https://github.com/zitadel/zitadel.git --path ./proto/zitadel",
-    "build": "tsup --dts",
+    "build": "tsup",
     "test": "pnpm test:unit",
     "test:watch": "pnpm test:unit:watch",
     "test:unit": "vitest",
     "test:unit:watch": "vitest --watch",
     "dev": "tsup --watch --dts",
     "lint": "eslint \"src/**/*.ts*\"",
-    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist && rm -rf src/proto"
+    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"
+  },
+  "dependencies": {
+    "@zitadel/proto": "workspace:*",
+    "@bufbuild/protobuf": "^1.10.0",
+    "@connectrpc/connect": "^1.4.0"
   },
   "devDependencies": {
-    "@bufbuild/buf": "^1.14.0",
     "@zitadel/tsconfig": "workspace:*",
-    "eslint-config-zitadel": "workspace:*",
-    "ts-proto": "^1.139.0"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "dependencies": {
-    "jose": "^4.13.1",
-    "nice-grpc-web": "^3.2.3",
-    "protobufjs": "^7.2.3"
+    "eslint-config-zitadel": "workspace:*"
   }
 }

packages/zitadel-client/src/index.ts

@@ -1,5 +1,2 @@
-export { initializeApp, getApps } from "./app";
-
-export { getAuth } from "./auth";
-
-export type { ZitadelOptions } from "./app";
+export { NewAuthorizationBearerInterceptor } from "./interceptors";
+export type { PartialMessage, PlainMessage } from "@bufbuild/protobuf";