From a023c5c57bc7cf2099ab1ea530a1c23f37206414 Mon Sep 17 00:00:00 2001
From: Max Peintner <peintnerm@gmail.com>
Date: Tue, 22 Apr 2025 14:59:26 +0200
Subject: [PATCH] v2 utils, v3 protos

---
 packages/zitadel-client/src/v2.ts   | 29 ++++++++++++++++-------------
 packages/zitadel-proto/package.json |  4 ++--
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/packages/zitadel-client/src/v2.ts b/packages/zitadel-client/src/v2.ts
index 49cf901734..28b7cd1721 100644
--- a/packages/zitadel-client/src/v2.ts
+++ b/packages/zitadel-client/src/v2.ts
@@ -1,4 +1,4 @@
-import { create } from "@bufbuild/protobuf";
+import { MessageInitShape } from "@bufbuild/protobuf";
 import { FeatureService } from "@zitadel/proto/zitadel/feature/v2/feature_service_pb.js";
 import { IdentityProviderService } from "@zitadel/proto/zitadel/idp/v2/idp_service_pb.js";
 import { RequestContextSchema } from "@zitadel/proto/zitadel/object/v2/object_pb.js";
@@ -11,17 +11,20 @@ import { UserService } from "@zitadel/proto/zitadel/user/v2/user_service_pb.js";
 
 import { createClientFor } from "./helpers.js";
 
-export const createUserServiceClient = createClientFor(UserService);
-export const createSettingsServiceClient = createClientFor(SettingsService);
-export const createSessionServiceClient = createClientFor(SessionService);
-export const createOIDCServiceClient = createClientFor(OIDCService);
-export const createSAMLServiceClient = createClientFor(SAMLService);
-export const createOrganizationServiceClient = createClientFor(OrganizationService);
-export const createFeatureServiceClient = createClientFor(FeatureService);
-export const createIdpServiceClient = createClientFor(IdentityProviderService);
+export const createUserServiceClient: ReturnType<typeof createClientFor<typeof UserService>> = createClientFor(UserService);
+export const createSettingsServiceClient: ReturnType<typeof createClientFor<typeof SettingsService>> =
+  createClientFor(SettingsService);
+export const createSessionServiceClient: ReturnType<typeof createClientFor<typeof SessionService>> =
+  createClientFor(SessionService);
+export const createOIDCServiceClient: ReturnType<typeof createClientFor<typeof OIDCService>> = createClientFor(OIDCService);
+export const createSAMLServiceClient: ReturnType<typeof createClientFor<typeof SAMLService>> = createClientFor(SAMLService);
+export const createOrganizationServiceClient: ReturnType<typeof createClientFor<typeof OrganizationService>> =
+  createClientFor(OrganizationService);
+export const createFeatureServiceClient: ReturnType<typeof createClientFor<typeof FeatureService>> =
+  createClientFor(FeatureService);
+export const createIdpServiceClient: ReturnType<typeof createClientFor<typeof IdentityProviderService>> =
+  createClientFor(IdentityProviderService);
 
-export function makeReqCtx(orgId: string | undefined) {
-  return create(RequestContextSchema, {
-    resourceOwner: orgId ? { case: "orgId", value: orgId } : { case: "instance", value: true },
-  });
+export function makeReqCtx(orgId: string | undefined): MessageInitShape<typeof RequestContextSchema> {
+  return { resourceOwner: orgId ? { case: "orgId", value: orgId } : { case: "instance", value: true } };
 }
diff --git a/packages/zitadel-proto/package.json b/packages/zitadel-proto/package.json
index b738a0a63b..75f487b618 100644
--- a/packages/zitadel-proto/package.json
+++ b/packages/zitadel-proto/package.json
@@ -49,7 +49,7 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "generate": "buf generate https://github.com/zitadel/zitadel.git#tag=v2.71.7 --path ./proto/zitadel",
+    "generate": "buf generate https://github.com/zitadel/zitadel.git#tag=v3.0.0-rc.1 --path ./proto/zitadel",
     "clean": "rm -rf zitadel .turbo node_modules google protoc-gen-openapiv2 validate",
     "build": "tsup",
     "test:cjs": "node test/cjs-test.cjs",
@@ -66,4 +66,4 @@
     "ts-node": "^10.9.2",
     "@zitadel/tsconfig": "workspace:*"
   }
-}
\ No newline at end of file
+}