chore: upgrade buf connect v2

This commit is contained in:
Yordis Prieto
2024-11-19 15:55:14 -05:00
parent 699abeb91c
commit e279b3422d
11 changed files with 269 additions and 227 deletions

View File

@@ -9,7 +9,7 @@ Login UI.
The scope of functionality of this repo and packages is under active development. The scope of functionality of this repo and packages is under active development.
The `@zitadel/client` and `@zitadel/node` packages are using [@connectrpc/connect](https://github.com/connectrpc/connect-es#readme) and its [2.0.0-alpha](https://github.com/connectrpc/connect-es/releases/tag/v2.0.0-alpha.1) release which might still change. The `@zitadel/client` and `@zitadel/node` packages are using [@connectrpc/connect](https://github.com/connectrpc/connect-es#readme).
You can read the [contribution guide](/CONTRIBUTING.md) on how to contribute. You can read the [contribution guide](/CONTRIBUTING.md) on how to contribute.
Questions can be raised in our [Discord channel](https://discord.gg/erh5Brh7jE) or as Questions can be raised in our [Discord channel](https://discord.gg/erh5Brh7jE) or as

View File

@@ -11,7 +11,6 @@ import { getSession } from "./zitadel";
const transport = (token: string) => const transport = (token: string) =>
createServerTransport(token, { createServerTransport(token, {
baseUrl: process.env.ZITADEL_API_URL!, baseUrl: process.env.ZITADEL_API_URL!,
httpVersion: "2",
}); });
const sessionService = (sessionId: string) => { const sessionService = (sessionId: string) => {

View File

@@ -54,10 +54,7 @@ const CACHE_REVALIDATION_INTERVAL_IN_SECONDS = process.env
const transport = createServerTransport( const transport = createServerTransport(
process.env.ZITADEL_SERVICE_USER_TOKEN!, process.env.ZITADEL_SERVICE_USER_TOKEN!,
{ { baseUrl: process.env.ZITADEL_API_URL! },
baseUrl: process.env.ZITADEL_API_URL!,
httpVersion: "2",
},
); );
export const sessionService = createSessionServiceClient(transport); export const sessionService = createSessionServiceClient(transport);
@@ -652,7 +649,6 @@ export async function createPasskeyRegistrationLink(
) { ) {
// const transport = createServerTransport(token, { // const transport = createServerTransport(token, {
// baseUrl: process.env.ZITADEL_API_URL!, // baseUrl: process.env.ZITADEL_API_URL!,
// httpVersion: "2",
// }); // });
// const service = createUserServiceClient(transport); // const service = createUserServiceClient(transport);
@@ -680,7 +676,6 @@ export async function registerU2F(
) { ) {
// const transport = createServerTransport(token, { // const transport = createServerTransport(token, {
// baseUrl: process.env.ZITADEL_API_URL!, // baseUrl: process.env.ZITADEL_API_URL!,
// httpVersion: "2",
// }); // });
// const service = createUserServiceClient(transport); // const service = createUserServiceClient(transport);

View File

@@ -5,6 +5,8 @@
"scripts": { "scripts": {
"generate": "turbo run generate", "generate": "turbo run generate",
"build": "turbo run build", "build": "turbo run build",
"build:packages": "turbo run build --filter=./packages/*",
"build:apps": "turbo run build --filter=./apps/*",
"test": "turbo run test", "test": "turbo run test",
"start": "turbo run start", "start": "turbo run start",
"start:built": "turbo run start:built", "start:built": "turbo run start:built",

View File

@@ -44,8 +44,8 @@
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist" "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"
}, },
"dependencies": { "dependencies": {
"@bufbuild/protobuf": "^2.0.0", "@bufbuild/protobuf": "^2.2.2",
"@connectrpc/connect": "2.0.0-alpha.1", "@connectrpc/connect": "^2.0.0",
"@zitadel/proto": "workspace:*" "@zitadel/proto": "workspace:*"
}, },
"devDependencies": { "devDependencies": {

View File

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

View File

@@ -1,6 +1,7 @@
import { create } from "@bufbuild/protobuf";
import { FeatureService } from "@zitadel/proto/zitadel/feature/v2/feature_service_pb"; import { FeatureService } from "@zitadel/proto/zitadel/feature/v2/feature_service_pb";
import { IdentityProviderService } from "@zitadel/proto/zitadel/idp/v2/idp_service_pb"; import { IdentityProviderService } from "@zitadel/proto/zitadel/idp/v2/idp_service_pb";
import { RequestContext } from "@zitadel/proto/zitadel/object/v2/object_pb"; import { RequestContextSchema } from "@zitadel/proto/zitadel/object/v2/object_pb";
import { OIDCService } from "@zitadel/proto/zitadel/oidc/v2/oidc_service_pb"; import { OIDCService } from "@zitadel/proto/zitadel/oidc/v2/oidc_service_pb";
import { OrganizationService } from "@zitadel/proto/zitadel/org/v2/org_service_pb"; import { OrganizationService } from "@zitadel/proto/zitadel/org/v2/org_service_pb";
import { SessionService } from "@zitadel/proto/zitadel/session/v2/session_service_pb"; import { SessionService } from "@zitadel/proto/zitadel/session/v2/session_service_pb";
@@ -17,8 +18,8 @@ export const createOrganizationServiceClient = createClientFor(OrganizationServi
export const createFeatureServiceClient = createClientFor(FeatureService); export const createFeatureServiceClient = createClientFor(FeatureService);
export const createIdpServiceClient = createClientFor(IdentityProviderService); export const createIdpServiceClient = createClientFor(IdentityProviderService);
export function makeReqCtx(orgId: string | undefined): Partial<RequestContext> { export function makeReqCtx(orgId: string | undefined) {
return { return create(RequestContextSchema, {
resourceOwner: orgId ? { case: "orgId", value: orgId } : { case: "instance", value: true }, resourceOwner: orgId ? { case: "orgId", value: orgId } : { case: "instance", value: true },
}; });
} }

View File

@@ -29,15 +29,15 @@
}, },
"peerDependencies": { "peerDependencies": {
"@zitadel/client": "workspace:*", "@zitadel/client": "workspace:*",
"@connectrpc/connect": "^2.0.0-alpha.1" "@connectrpc/connect": "^2.0.0"
}, },
"dependencies": { "dependencies": {
"@connectrpc/connect-node": "^2.0.0-alpha.1", "@connectrpc/connect-node": "^2.0.0",
"@connectrpc/connect-web": "^2.0.0-alpha.1", "@connectrpc/connect-web": "^2.0.0",
"jose": "^5.3.0" "jose": "^5.3.0"
}, },
"devDependencies": { "devDependencies": {
"@connectrpc/connect": "^2.0.0-alpha.1", "@connectrpc/connect": "^2.0.0",
"@types/node": "^22.9.0", "@types/node": "^22.9.0",
"@zitadel/client": "workspace:*", "@zitadel/client": "workspace:*",
"@zitadel/tsconfig": "workspace:*", "@zitadel/tsconfig": "workspace:*",

View File

@@ -2,7 +2,7 @@ version: v2
managed: managed:
enabled: true enabled: true
plugins: plugins:
- remote: buf.build/bufbuild/es:v2.0.0 - remote: buf.build/bufbuild/es:v2.2.0
out: . out: .
include_imports: true include_imports: true
opt: opt:

View File

@@ -12,12 +12,12 @@
"sideEffects": false, "sideEffects": false,
"scripts": { "scripts": {
"generate": "buf generate https://github.com/zitadel/zitadel.git --path ./proto/zitadel", "generate": "buf generate https://github.com/zitadel/zitadel.git --path ./proto/zitadel",
"clean": "rm -rf zitadel && rm -rf .turbo && rm -rf node_modules" "clean": "rm -rf zitadel .turbo node_modules google protoc-gen-openapiv2 validate"
}, },
"dependencies": { "dependencies": {
"@bufbuild/protobuf": "^2.0.0" "@bufbuild/protobuf": "^2.2.2"
}, },
"devDependencies": { "devDependencies": {
"@bufbuild/buf": "^1.46.0" "@bufbuild/buf": "^1.47.2"
} }
} }

451
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff