chore!: use buf v2 generators

packages/zitadel-client/package.json

@@ -45,8 +45,8 @@
   },
   "dependencies": {
     "@zitadel/proto": "workspace:*",
-    "@bufbuild/protobuf": "^1.10.0",
+    "@bufbuild/protobuf": "^2.0.0",
-    "@connectrpc/connect": "^1.4.0"
+    "@connectrpc/connect": "2.0.0-alpha.1"
   },
   "devDependencies": {
     "@zitadel/tsconfig": "workspace:*",

packages/zitadel-client/src/helpers.ts

@@ -1,8 +1,11 @@
+import type { DescService } from "@bufbuild/protobuf";
+import { Timestamp, timestampDate } from "@bufbuild/protobuf/wkt";
 import { createPromiseClient, Transport } from "@connectrpc/connect";
-import type { ServiceType } from "@bufbuild/protobuf";
 
-export function createClientFor<TService extends ServiceType>(
+export function createClientFor<TService extends DescService>(service: TService) {
-  service: TService,
-) {
   return (transport: Transport) => createPromiseClient(service, transport);
 }
+
+export function toDate(timestamp: Timestamp | undefined): Date | undefined {
+  return timestamp ? timestampDate(timestamp) : undefined;
+}

packages/zitadel-client/src/index.ts

@@ -1,2 +1,7 @@
+export { toDate } from "./helpers";
 export { NewAuthorizationBearerInterceptor } from "./interceptors";
-export type { PartialMessage, PlainMessage } from "@bufbuild/protobuf";
+
+// TODO: Move this to `./protobuf.ts` and export it from there
+export { create as createMessage, fromJson, toJson } from "@bufbuild/protobuf";
+export { TimestampSchema, timestampDate } from "@bufbuild/protobuf/wkt";
+export type { Timestamp } from "@bufbuild/protobuf/wkt";

packages/zitadel-client/src/interceptors.test.ts

@@ -1,6 +1,6 @@
-import { describe, expect, test, vitest } from "vitest";
 import { Int32Value, MethodKind, StringValue } from "@bufbuild/protobuf";
 import { createRouterTransport, HandlerContext } from "@connectrpc/connect";
+import { describe, expect, test, vitest } from "vitest";
 import { NewAuthorizationBearerInterceptor } from "./interceptors";
 
 const TestService = {
@@ -21,11 +21,9 @@ describe("NewAuthorizationBearerInterceptor", () => {
   };
 
   test("injects the authorization token", async () => {
-    const handler = vitest.fn(
+    const handler = vitest.fn((request: Int32Value, context: HandlerContext) => {
-      (request: Int32Value, context: HandlerContext) => {
+      return { value: request.value.toString() };
-        return { value: request.value.toString() };
+    });
-      },
-    );
 
     const service = createRouterTransport(
       ({ service }) => {
@@ -34,27 +32,16 @@ describe("NewAuthorizationBearerInterceptor", () => {
       { transport },
     );
 
-    await service.unary(
+    await service.unary(TestService, TestService.methods.unary, undefined, undefined, {}, { value: 9001 });
-      TestService,
-      TestService.methods.unary,
-      undefined,
-      undefined,
-      {},
-      { value: 9001 },
-    );
 
     expect(handler).toBeCalled();
-    expect(handler.mock.calls[0][1].requestHeader.get("Authorization")).toBe(
+    expect(handler.mock.calls[0][1].requestHeader.get("Authorization")).toBe("Bearer mytoken");
-      "Bearer mytoken",
-    );
   });
 
   test("do not overwrite the previous authorization token", async () => {
-    const handler = vitest.fn(
+    const handler = vitest.fn((request: Int32Value, context: HandlerContext) => {
-      (request: Int32Value, context: HandlerContext) => {
+      return { value: request.value.toString() };
-        return { value: request.value.toString() };
+    });
-      },
-    );
 
     const service = createRouterTransport(
       ({ service }) => {
@@ -73,8 +60,6 @@ describe("NewAuthorizationBearerInterceptor", () => {
     );
 
     expect(handler).toBeCalled();
-    expect(handler.mock.calls[0][1].requestHeader.get("Authorization")).toBe(
+    expect(handler.mock.calls[0][1].requestHeader.get("Authorization")).toBe("Bearer somethingelse");
-      "Bearer somethingelse",
-    );
   });
 });

packages/zitadel-client/src/v1.ts

@@ -1,9 +1,9 @@
 import { createClientFor } from "./helpers";
 
-import { AdminService } from "@zitadel/proto/zitadel/admin_connect";
+import { AdminService } from "@zitadel/proto/zitadel/admin_pb";
-import { AuthService } from "@zitadel/proto/zitadel/auth_connect";
+import { AuthService } from "@zitadel/proto/zitadel/auth_pb";
-import { ManagementService } from "@zitadel/proto/zitadel/management_connect";
+import { ManagementService } from "@zitadel/proto/zitadel/management_pb";
-import { SystemService } from "@zitadel/proto/zitadel/system_connect";
+import { SystemService } from "@zitadel/proto/zitadel/system_pb";
 
 export const createAdminServiceClient = createClientFor(AdminService);
 export const createAuthServiceClient = createClientFor(AuthService);

packages/zitadel-client/src/v2.ts

@@ -1,11 +1,11 @@
-import { FeatureService } from "@zitadel/proto/zitadel/feature/v2/feature_service_connect";
+import { FeatureService } from "@zitadel/proto/zitadel/feature/v2/feature_service_pb";
-import { IdentityProviderService } from "@zitadel/proto/zitadel/idp/v2/idp_service_connect";
+import { IdentityProviderService } from "@zitadel/proto/zitadel/idp/v2/idp_service_pb";
 import { RequestContext } from "@zitadel/proto/zitadel/object/v2/object_pb";
-import { OIDCService } from "@zitadel/proto/zitadel/oidc/v2/oidc_service_connect";
+import { OIDCService } from "@zitadel/proto/zitadel/oidc/v2/oidc_service_pb";
-import { OrganizationService } from "@zitadel/proto/zitadel/org/v2/org_service_connect";
+import { OrganizationService } from "@zitadel/proto/zitadel/org/v2/org_service_pb";
-import { SessionService } from "@zitadel/proto/zitadel/session/v2/session_service_connect";
+import { SessionService } from "@zitadel/proto/zitadel/session/v2/session_service_pb";
-import { SettingsService } from "@zitadel/proto/zitadel/settings/v2/settings_service_connect";
+import { SettingsService } from "@zitadel/proto/zitadel/settings/v2/settings_service_pb";
-import { UserService } from "@zitadel/proto/zitadel/user/v2/user_service_connect";
+import { UserService } from "@zitadel/proto/zitadel/user/v2/user_service_pb";
 
 import { createClientFor } from "./helpers";
 

packages/zitadel-client/src/v3alpha.ts

@@ -1,5 +1,5 @@
-import { UserSchemaService } from "@zitadel/proto/zitadel/user/schema/v3alpha/user_schema_service_connect";
+import { UserSchemaService } from "@zitadel/proto/zitadel/user/schema/v3alpha/user_schema_service_pb";
-import { UserService } from "@zitadel/proto/zitadel/user/v3alpha/user_service_connect";
+import { UserService } from "@zitadel/proto/zitadel/user/v3alpha/user_service_pb";
 import { createClientFor } from "./helpers";
 
 export const createUserSchemaServiceClient = createClientFor(UserSchemaService);

packages/zitadel-node/package.json

@@ -31,8 +31,8 @@
     "@zitadel/client": "workspace:*"
   },
   "dependencies": {
-    "@connectrpc/connect-node": "^1.4.0",
+    "@connectrpc/connect-node": "^2.0.0-alpha.1",
-    "@connectrpc/connect-web": "^1.4.0",
+    "@connectrpc/connect-web": "^2.0.0-alpha.1",
     "jose": "^5.3.0"
   },
   "devDependencies": {

packages/zitadel-proto/.gitignore

@@ -1 +1,4 @@
-zitadel
+zitadel
+google
+protoc-gen-openapiv2
+validate

packages/zitadel-proto/buf.gen.yaml

@@ -2,7 +2,6 @@ version: v2
 managed:
   enabled: true
 plugins:
-  - remote: buf.build/connectrpc/es:v1.4.0
+  - remote: buf.build/bufbuild/es:v2.0.0
-    out: .
-  - remote: buf.build/bufbuild/es:v1.7.2
     out: .
+    include_imports: true

packages/zitadel-proto/package.json

@@ -15,7 +15,7 @@
     "clean": "rm -rf zitadel && rm -rf .turbo && rm -rf node_modules"
   },
   "dependencies": {
-    "@bufbuild/protobuf": "^1.10.0"
+    "@bufbuild/protobuf": "^2.0.0"
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.36.0"