diff --git a/README.md b/README.md index 3c47b35f3b..b08fbba545 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Login UI. 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). +The `@zitadel/client` package is using [@connectrpc/connect](https://github.com/connectrpc/connect-es#readme). 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 @@ -30,8 +30,7 @@ We think the easiest path of getting up and running, is the following: ## Included Apps And Packages - `login`: The login UI used by ZITADEL Cloud, powered by Next.js -- `@zitadel/node`: core components for establishing node client connection -- `@zitadel/client`: shared client utilities +- `@zitadel/client`: shared client utilities for node and browser environments - `@zitadel/proto`: shared protobuf types - `@zitadel/tsconfig`: shared `tsconfig.json`s used throughout the monorepo - `eslint-config-zitadel`: ESLint preset diff --git a/apps/login/package.json b/apps/login/package.json index f8f3b89a3f..e07d1601f8 100644 --- a/apps/login/package.json +++ b/apps/login/package.json @@ -39,7 +39,6 @@ "@tailwindcss/forms": "0.5.7", "@vercel/analytics": "^1.2.2", "@zitadel/client": "workspace:*", - "@zitadel/node": "workspace:*", "@zitadel/proto": "workspace:*", "clsx": "1.2.1", "copy-to-clipboard": "^3.3.3", diff --git a/apps/login/src/lib/self.ts b/apps/login/src/lib/self.ts index 6eea8206c9..c67005a346 100644 --- a/apps/login/src/lib/self.ts +++ b/apps/login/src/lib/self.ts @@ -1,7 +1,7 @@ "use server"; +import { createServerTransport } from "@zitadel/client"; import { createUserServiceClient } from "@zitadel/client/v2"; -import { createServerTransport } from "@zitadel/node"; import { getSessionCookieById } from "./cookies"; import { getSession } from "./zitadel"; diff --git a/apps/login/src/lib/server/password.ts b/apps/login/src/lib/server/password.ts index 47bf260eaa..2a1b646c27 100644 --- a/apps/login/src/lib/server/password.ts +++ b/apps/login/src/lib/server/password.ts @@ -14,9 +14,8 @@ import { setPassword, setUserPassword, } from "@/lib/zitadel"; -import { create } from "@zitadel/client"; +import { create, createServerTransport } from "@zitadel/client"; import { createUserServiceClient } from "@zitadel/client/v2"; -import { createServerTransport } from "@zitadel/node"; import { Checks, ChecksSchema, diff --git a/apps/login/src/lib/zitadel.ts b/apps/login/src/lib/zitadel.ts index 849f36de11..4ab0377847 100644 --- a/apps/login/src/lib/zitadel.ts +++ b/apps/login/src/lib/zitadel.ts @@ -1,3 +1,4 @@ +import { createServerTransport } from "@zitadel/client"; import { createIdpServiceClient, createOIDCServiceClient, @@ -7,7 +8,6 @@ import { createUserServiceClient, makeReqCtx, } from "@zitadel/client/v2"; -import { createServerTransport } from "@zitadel/node"; import { RequestChallenges } from "@zitadel/proto/zitadel/session/v2/challenge_pb"; import { Checks } from "@zitadel/proto/zitadel/session/v2/session_service_pb"; import { diff --git a/apps/login/turbo.json b/apps/login/turbo.json index 8d03cac2be..e8a243feaf 100644 --- a/apps/login/turbo.json +++ b/apps/login/turbo.json @@ -6,16 +6,16 @@ "dependsOn": ["^build"] }, "test": { - "dependsOn": ["@zitadel/node#build", "@zitadel/client#build"] + "dependsOn": ["@zitadel/client#build"] }, "test:integration": { - "dependsOn": ["@zitadel/node#build", "@zitadel/client#build"] + "dependsOn": ["@zitadel/client#build"] }, "test:unit": { - "dependsOn": ["@zitadel/node#build", "@zitadel/client#build"] + "dependsOn": ["@zitadel/client#build"] }, "test:watch": { - "dependsOn": ["@zitadel/node#build", "@zitadel/client#build"] + "dependsOn": ["@zitadel/client#build"] } } } diff --git a/packages/zitadel-client/package.json b/packages/zitadel-client/package.json index c9c127a5bf..fac78870ca 100644 --- a/packages/zitadel-client/package.json +++ b/packages/zitadel-client/package.json @@ -46,6 +46,9 @@ "dependencies": { "@bufbuild/protobuf": "^2.2.2", "@connectrpc/connect": "^2.0.0", + "@connectrpc/connect-node": "^2.0.0", + "@connectrpc/connect-web": "^2.0.0", + "jose": "^5.3.0", "@zitadel/proto": "workspace:*" }, "devDependencies": { diff --git a/packages/zitadel-node/src/index.ts b/packages/zitadel-client/src/grpc.ts similarity index 92% rename from packages/zitadel-node/src/index.ts rename to packages/zitadel-client/src/grpc.ts index e614d0447a..c5900bb592 100644 --- a/packages/zitadel-node/src/index.ts +++ b/packages/zitadel-client/src/grpc.ts @@ -1,6 +1,6 @@ import { createGrpcTransport, GrpcTransportOptions } from "@connectrpc/connect-node"; -import { NewAuthorizationBearerInterceptor } from "@zitadel/client"; import { importPKCS8, SignJWT } from "jose"; +import { NewAuthorizationBearerInterceptor } from "./interceptors"; /** * Create a server transport with the given token and configuration options. diff --git a/packages/zitadel-client/src/index.ts b/packages/zitadel-client/src/index.ts index 7cf14163bf..978279cb53 100644 --- a/packages/zitadel-client/src/index.ts +++ b/packages/zitadel-client/src/index.ts @@ -5,3 +5,5 @@ export { NewAuthorizationBearerInterceptor } from "./interceptors"; export { create, fromJson, toJson } from "@bufbuild/protobuf"; export { TimestampSchema, timestampDate, timestampFromDate, timestampFromMs, timestampMs } from "@bufbuild/protobuf/wkt"; export type { Duration, Timestamp } from "@bufbuild/protobuf/wkt"; + +export { createServerTransport, newSystemToken } from "./grpc"; diff --git a/packages/zitadel-node/.eslintrc.cjs b/packages/zitadel-node/.eslintrc.cjs deleted file mode 100644 index 51720b7c3a..0000000000 --- a/packages/zitadel-node/.eslintrc.cjs +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - root: true, - // TODO: React is not used in the server package - extends: ["zitadel"], -}; diff --git a/packages/zitadel-node/package.json b/packages/zitadel-node/package.json deleted file mode 100644 index 6bd00b6e0b..0000000000 --- a/packages/zitadel-node/package.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "name": "@zitadel/node", - "version": "0.0.0", - "type": "module", - "sideEffects": false, - "license": "MIT", - "exports": { - ".": { - "types": "./dist/index.d.ts", - "import": "./dist/index.js", - "require": "./dist/index.cjs" - } - }, - "files": [ - "dist/**" - ], - "publishConfig": { - "access": "public" - }, - "scripts": { - "build": "tsup", - "test": "pnpm test:unit", - "test:watch": "pnpm test:unit:watch", - "test:unit": "vitest", - "test:unit:watch": "vitest --watch", - "dev": "tsup --watch", - "lint": "eslint \"src/**/*.ts*\"", - "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist && rm -rf src/proto" - }, - "peerDependencies": { - "@zitadel/client": "workspace:*", - "@connectrpc/connect": "^2.0.0" - }, - "dependencies": { - "@connectrpc/connect-node": "^2.0.0", - "@connectrpc/connect-web": "^2.0.0", - "jose": "^5.3.0" - }, - "devDependencies": { - "@connectrpc/connect": "^2.0.0", - "@types/node": "^22.9.0", - "@zitadel/client": "workspace:*", - "@zitadel/tsconfig": "workspace:*", - "eslint-config-zitadel": "workspace:*" - } -} diff --git a/packages/zitadel-node/tsconfig.json b/packages/zitadel-node/tsconfig.json deleted file mode 100644 index 5f0ea69110..0000000000 --- a/packages/zitadel-node/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "@zitadel/tsconfig/tsup.json", - "include": ["./src/**/*"], - "exclude": ["dist", "build", "node_modules"] -} diff --git a/packages/zitadel-node/tsup.config.ts b/packages/zitadel-node/tsup.config.ts deleted file mode 100644 index b978211b1e..0000000000 --- a/packages/zitadel-node/tsup.config.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { defineConfig, Options } from "tsup"; - -export default defineConfig((options: Options) => ({ - treeshake: false, - splitting: true, - entry: ["src/index.ts"], - format: ["esm", "cjs"], - dts: true, - minify: false, - clean: true, - sourcemap: true, - ...options, -})); diff --git a/packages/zitadel-node/turbo.json b/packages/zitadel-node/turbo.json deleted file mode 100644 index ba7648a89d..0000000000 --- a/packages/zitadel-node/turbo.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "extends": [ - "//" - ], - "tasks": { - "build": { - "outputs": [ - "dist/**" - ], - "dependsOn": [ - "@zitadel/client#build" - ] - } - } -} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 217a7b6897..7e617f8e78 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -91,9 +91,6 @@ importers: '@zitadel/client': specifier: workspace:* version: link:../../packages/zitadel-client - '@zitadel/node': - specifier: workspace:* - version: link:../../packages/zitadel-node '@zitadel/proto': specifier: workspace:* version: link:../../packages/zitadel-proto @@ -263,41 +260,22 @@ importers: '@connectrpc/connect': specifier: ^2.0.0 version: 2.0.0(@bufbuild/protobuf@2.2.2) - '@zitadel/proto': - specifier: workspace:* - version: link:../zitadel-proto - devDependencies: - '@bufbuild/protocompile': - specifier: ^0.0.1 - version: 0.0.1(@bufbuild/buf@1.47.2) - '@zitadel/tsconfig': - specifier: workspace:* - version: link:../zitadel-tsconfig - eslint-config-zitadel: - specifier: workspace:* - version: link:../eslint-config-zitadel - - packages/zitadel-node: - dependencies: '@connectrpc/connect-node': specifier: ^2.0.0 version: 2.0.0(@bufbuild/protobuf@2.2.2)(@connectrpc/connect@2.0.0(@bufbuild/protobuf@2.2.2)) '@connectrpc/connect-web': specifier: ^2.0.0 version: 2.0.0(@bufbuild/protobuf@2.2.2)(@connectrpc/connect@2.0.0(@bufbuild/protobuf@2.2.2)) + '@zitadel/proto': + specifier: workspace:* + version: link:../zitadel-proto jose: specifier: ^5.3.0 version: 5.8.0 devDependencies: - '@connectrpc/connect': - specifier: ^2.0.0 - version: 2.0.0(@bufbuild/protobuf@2.2.2) - '@types/node': - specifier: ^22.9.0 - version: 22.9.0 - '@zitadel/client': - specifier: workspace:* - version: link:../zitadel-client + '@bufbuild/protocompile': + specifier: ^0.0.1 + version: 0.0.1(@bufbuild/buf@1.47.2) '@zitadel/tsconfig': specifier: workspace:* version: link:../zitadel-tsconfig