v2 alpha service in @zitadel/server

apps/login/app/(login)/error.tsx

@@ -12,7 +12,7 @@ export default function Error({ error, reset }: any) {
   return (
     <Boundary labels={["Home page Error UI"]} color="pink">
       <div className="space-y-4">
-        <div className="text-sm text-pink-500">
+        <div className="text-sm text-warn-light-500 dark:text-warn-dark-500">
           <strong className="font-bold">Error:</strong> {error?.message}
         </div>
         <div>

apps/login/app/(login)/register/page.tsx

@@ -1,23 +1,25 @@
 import {
-  getPasswordComplexityPolicy,
+  getLegalAndSupportSettings,
-  getPrivacyPolicy,
+  getPasswordComplexitySettings,
   server,
 } from "#/lib/zitadel";
 import RegisterForm from "#/ui/RegisterForm";
 
 export default async function Page() {
-  const privacyPolicy = await getPrivacyPolicy(server);
+  const legal = await getLegalAndSupportSettings(server);
-  const passwordComplexityPolicy = await getPasswordComplexityPolicy(server);
+  const passwordComplexitySettings = await getPasswordComplexitySettings(
+    server
+  );
 
   return (
     <div className="flex flex-col items-center space-y-4">
       <h1>Register</h1>
       <p className="ztdl-p">Create your ZITADEL account.</p>
 
-      {privacyPolicy && passwordComplexityPolicy && (
+      {legal && passwordComplexitySettings && (
         <RegisterForm
-          privacyPolicy={privacyPolicy}
+          privacyPolicy={legal}
-          passwordComplexityPolicy={passwordComplexityPolicy}
+          passwordComplexityPolicy={passwordComplexitySettings}
         ></RegisterForm>
       )}
     </div>

apps/login/app/layout.tsx

@@ -6,7 +6,7 @@ import Byline from "#/ui/Byline";
 import { LayoutProviders } from "#/ui/LayoutProviders";
 import { Analytics } from "@vercel/analytics/react";
 import ThemeWrapper from "#/ui/ThemeWrapper";
-import { getBranding } from "#/lib/zitadel";
+import { getBrandingSettings } from "#/lib/zitadel";
 import { server } from "../lib/zitadel";
 import { LabelPolicyColors } from "#/utils/colors";
 
@@ -25,7 +25,7 @@ export default async function RootLayout({
   // later only shown with dev mode enabled
   const showNav = true;
 
-  const branding = await getBranding(server);
+  const branding = await getBrandingSettings(server);
   let partialPolicy: LabelPolicyColors | undefined;
   console.log(branding);
   if (branding) {

apps/login/lib/zitadel.ts

@@ -2,14 +2,11 @@ import {
   management,
   ZitadelServer,
   ZitadelServerOptions,
-  getManagement,
   orgMetadata,
   getServer,
   getServers,
-  LabelPolicy,
   initializeServer,
-  PrivacyPolicy,
+  settings,
-  PasswordComplexityPolicy,
 } from "@zitadel/server";
 // import { getAuth } from "@zitadel/server/auth";
 
@@ -26,46 +23,47 @@ if (!getServers().length) {
   server = initializeServer(zitadelConfig);
 }
 
-export function getBranding(
+export function getBrandingSettings(
   server: ZitadelServer
-): Promise<LabelPolicy | undefined> {
+): Promise<any | undefined> {
-  const mgmt = getManagement(server);
+  // settings.branding_settings.BrandingSettings
-  return mgmt
+  const settingsService = settings.getSettings(server);
-    .getLabelPolicy(
+  return settingsService
+    .getBrandingSettings(
       {},
       {
         // metadata: orgMetadata(process.env.ZITADEL_ORG_ID ?? "")
       }
     )
-    .then((resp) => resp.policy);
+    .then((resp) => resp.settings);
 }
 
-export function getPrivacyPolicy(
+export function getLegalAndSupportSettings(
   server: ZitadelServer
-): Promise<PrivacyPolicy | undefined> {
+): Promise<any | undefined> {
-  const mgmt = getManagement(server);
+  const settingsService = settings.getSettings(server);
-  return mgmt
+  return settingsService
-    .getPrivacyPolicy(
+    .getLegalAndSupportSettings(
       {},
       {
         //  metadata: orgMetadata(process.env.ZITADEL_ORG_ID ?? "")
       }
     )
-    .then((resp) => resp.policy);
+    .then((resp) => resp.settings);
 }
 
-export function getPasswordComplexityPolicy(
+export function getPasswordComplexitySettings(
   server: ZitadelServer
-): Promise<PasswordComplexityPolicy | undefined> {
+): Promise<any | undefined> {
-  const mgmt = getManagement(server);
+  const settingsService = settings.getSettings(server);
-  return mgmt
+  return settingsService
-    .getPasswordComplexityPolicy(
+    .getPasswordComplexitySettings(
       {},
       {
         // metadata: orgMetadata(process.env.ZITADEL_ORG_ID ?? "")
       }
     )
-    .then((resp) => resp.policy);
+    .then((resp) => resp.settings);
 }
 
 export type AddHumanUserData = {
@@ -78,7 +76,7 @@ export function addHumanUser(
   server: ZitadelServer,
   { email, firstName, lastName, password }: AddHumanUserData
 ): Promise<string> {
-  const mgmt = getManagement(server);
+  const mgmt = management.getManagement(server);
   return mgmt
     .addHumanUser(
       {

apps/login/package.json

@@ -27,7 +27,7 @@
     "@zitadel/server": "workspace:*",
     "clsx": "1.2.1",
     "date-fns": "2.29.3",
-    "next": "13.3.2-canary.2",
+    "next": "13.4.2",
     "next-themes": "^0.2.1",
     "nice-grpc": "2.0.1",
     "react": "18.2.0",
@@ -45,7 +45,6 @@
     "@types/tinycolor2": "1.4.3",
     "@vercel/git-hooks": "1.0.0",
     "@zitadel/tsconfig": "workspace:*",
-    "zitadel-tailwind-config": "workspace:*",
     "autoprefixer": "10.4.13",
     "del-cli": "5.0.0",
     "eslint-config-zitadel": "workspace:*",
@@ -56,6 +55,7 @@
     "prettier-plugin-tailwindcss": "0.1.13",
     "tailwindcss": "3.2.4",
     "ts-proto": "^1.139.0",
-    "typescript": "4.8.4"
+    "typescript": "4.8.4",
+    "zitadel-tailwind-config": "workspace:*"
   }
 }

packages/zitadel-server/src/index.ts

@@ -1,6 +1,7 @@
 export * from "./server";
 export * from "./middleware";
-export * from "./management";
+export * as management from "./management";
+export * as settings from "./v2/settings";
 
 // export * as auth from "./auth";
 // export * as management from "./management";

packages/zitadel-server/src/v2/settings/index.ts

@@ -0,0 +1,6 @@
+export * from "./settings";
+export * from "../../proto/server/zitadel/settings/v2alpha/settings";
+export * as branding from "../../proto/server/zitadel/settings/v2alpha/branding_settings";
+export * as login from "../../proto/server/zitadel/settings/v2alpha/login_settings";
+export * as password from "../../proto/server/zitadel/settings/v2alpha/password_settings";
+export * as legal from "../../proto/server/zitadel/settings/v2alpha/legal_settings";

packages/zitadel-server/src/v2/settings/settings.ts

@@ -0,0 +1,46 @@
+import { CompatServiceDefinition } from "nice-grpc/lib/service-definitions";
+
+import { createChannel, createClientFactory } from "nice-grpc";
+import {
+  SettingsServiceClient,
+  SettingsServiceDefinition,
+} from "../../proto/server/zitadel/settings/v2alpha/settings_service";
+
+import { authMiddleware } from "../../middleware";
+import { ZitadelServer, getServers } from "../../server";
+
+const createClient = <Client>(
+  definition: CompatServiceDefinition,
+  apiUrl: string,
+  token: string
+) => {
+  if (!apiUrl) {
+    throw Error("ZITADEL_API_URL not set");
+  }
+
+  const channel = createChannel(process.env.ZITADEL_API_URL ?? "");
+  return createClientFactory()
+    .use(authMiddleware(token))
+    .create(definition, channel) as Client;
+};
+
+export const getSettings = (server?: string | ZitadelServer) => {
+  console.log("init settings");
+  let config;
+  if (server && typeof server === "string") {
+    const apps = getServers();
+    config = apps.find((a) => a.name === server)?.config;
+  } else if (server && typeof server === "object") {
+    config = server.config;
+  }
+
+  if (!config) {
+    throw Error("No ZITADEL server found");
+  }
+
+  return createClient<SettingsServiceClient>(
+    SettingsServiceDefinition as CompatServiceDefinition,
+    config.apiUrl,
+    config.token
+  );
+};

pnpm-lock.yaml

@@ -41,7 +41,7 @@ importers:
       grpc-tools: 1.11.3
       lint-staged: 13.0.3
       make-dir-cli: 3.0.0
-      next: 13.3.2-canary.2
+      next: 13.4.2
       next-themes: ^0.2.1
       nice-grpc: 2.0.1
       postcss: 8.4.21
@@ -65,8 +65,8 @@ importers:
       '@zitadel/server': link:../../packages/zitadel-server
       clsx: 1.2.1
       date-fns: 2.29.3
-      next: 13.3.2-canary.2_krg7tz6h6n3fx3eq7tclunioeu
+      next: 13.4.2_krg7tz6h6n3fx3eq7tclunioeu
-      next-themes: 0.2.1_fbdiuaz6irj67j3n36ky3t2nbi
+      next-themes: 0.2.1_cmp7sjki5xcmfyvhcokzzink7a
       nice-grpc: 2.0.1
       react: 18.2.0
       react-dom: 18.2.0_react@18.2.0
@@ -667,8 +667,8 @@ packages:
     resolution: {integrity: sha512-FN50r/E+b8wuqyRjmGaqvqNDuWBWYWQiigfZ50KnSFH0f+AMQQyaZl+Zm2+CIpKk0fL9QxhLxOpTVA3xFHgFow==}
     dev: false
 
-  /@next/env/13.3.2-canary.2:
+  /@next/env/13.4.2:
-    resolution: {integrity: sha512-/NqWjXLGlNpGkxPAXR8TDWT6ZYsYGwWNfwhpPhtyMtUOU78wwWiT5p/smGd/+h/PFaIeLjrjtqiA7hHqrw0u0A==}
+    resolution: {integrity: sha512-Wqvo7lDeS0KGwtwg9TT9wKQ8raelmUxt+TQKWvG/xKfcmDXNOtCuaszcfCF8JzlBG1q0VhpI6CKaRMbVPMDWgw==}
     dev: false
 
   /@next/eslint-plugin-next/13.3.1:
@@ -704,8 +704,8 @@ packages:
     dev: false
     optional: true
 
-  /@next/swc-darwin-arm64/13.3.2-canary.2:
+  /@next/swc-darwin-arm64/13.4.2:
-    resolution: {integrity: sha512-HdqGogdJAF88hzmVLhSXu/msxlkv2MP395natN1MmGxjqfTNGLSJewWmPf4vdOBIP54lDc6Nap/b2joYWOrCDw==}
+    resolution: {integrity: sha512-6BBlqGu3ewgJflv9iLCwO1v1hqlecaIH2AotpKfVUEzUxuuDNJQZ2a4KLb4MBl8T9/vca1YuWhSqtbF6ZuUJJw==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [darwin]
@@ -722,8 +722,8 @@ packages:
     dev: false
     optional: true
 
-  /@next/swc-darwin-x64/13.3.2-canary.2:
+  /@next/swc-darwin-x64/13.4.2:
-    resolution: {integrity: sha512-u9LPNpaRXjKi6WPDqhrXEYW3UJxyf3J2mva8fmb3CGZHR8BrkItRDcn7VDgSZ0jTHRHpCGqYXlPE+z6+bVYdeg==}
+    resolution: {integrity: sha512-iZuYr7ZvGLPjPmfhhMl0ISm+z8EiyLBC1bLyFwGBxkWmPXqdJ60mzuTaDSr5WezDwv0fz32HB7JHmRC6JVHSZg==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [darwin]
@@ -758,8 +758,8 @@ packages:
     dev: false
     optional: true
 
-  /@next/swc-linux-arm64-gnu/13.3.2-canary.2:
+  /@next/swc-linux-arm64-gnu/13.4.2:
-    resolution: {integrity: sha512-e/aUm7RZoDcvLHrK7sTiRMX3cS+1LVlN2gUKV9PYrrXGftuQGkIwJyZPUm4nsJUX7ozNWXPU50YeHPvt9K0c2Q==}
+    resolution: {integrity: sha512-2xVabFtIge6BJTcJrW8YuUnYTuQjh4jEuRuS2mscyNVOj6zUZkom3CQg+egKOoS+zh2rrro66ffSKIS+ztFJTg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
@@ -776,8 +776,8 @@ packages:
     dev: false
     optional: true
 
-  /@next/swc-linux-arm64-musl/13.3.2-canary.2:
+  /@next/swc-linux-arm64-musl/13.4.2:
-    resolution: {integrity: sha512-wDvtL9LcN0pSao+M/A3qSYVHvPcyH1H9d0v7aIbwd6F/JuTIlTeXgKuxVCYY5OBNC6dXbzOyGSREZ8hLCx9Wjw==}
+    resolution: {integrity: sha512-wKRCQ27xCUJx5d6IivfjYGq8oVngqIhlhSAJntgXLt7Uo9sRT/3EppMHqUZRfyuNBTbykEre1s5166z+pvRB5A==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
@@ -794,8 +794,8 @@ packages:
     dev: false
     optional: true
 
-  /@next/swc-linux-x64-gnu/13.3.2-canary.2:
+  /@next/swc-linux-x64-gnu/13.4.2:
-    resolution: {integrity: sha512-Z/GTeCcD6YK92rBdrAa5GVLC9TzXkXpGKnlDLJLm/2oY1eBRTVpQT5/vp0vrRcPYjdHXubizquk1Q3eyAtlKTg==}
+    resolution: {integrity: sha512-NpCa+UVhhuNeaFVUP1Bftm0uqtvLWq2JTm7+Ta48+2Uqj2mNXrDIvyn1DY/ZEfmW/1yvGBRaUAv9zkMkMRixQA==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
@@ -812,8 +812,8 @@ packages:
     dev: false
     optional: true
 
-  /@next/swc-linux-x64-musl/13.3.2-canary.2:
+  /@next/swc-linux-x64-musl/13.4.2:
-    resolution: {integrity: sha512-P0KCzP17aoxfq3k+rtgDhOl8BILdgw3pw8w88/qD5WA2xK2R9Rg4lRI6pAQSro0++ToNDgnrXpRuJov7n1OfeQ==}
+    resolution: {integrity: sha512-ZWVC72x0lW4aj44e3khvBrj2oSYj1bD0jESmyah3zG/3DplEy/FOtYkMzbMjHTdDSheso7zH8GIlW6CDQnKhmQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
@@ -830,8 +830,8 @@ packages:
     dev: false
     optional: true
 
-  /@next/swc-win32-arm64-msvc/13.3.2-canary.2:
+  /@next/swc-win32-arm64-msvc/13.4.2:
-    resolution: {integrity: sha512-yGpQpU0To4gp/bjhwKHqu3zVJ/Jco+g4Okv95IWnbYUX7sd14kophZGwHiZN4dLErB9Pdd4vvmz8ccJP5h+Ubg==}
+    resolution: {integrity: sha512-pLT+OWYpzJig5K4VKhLttlIfBcVZfr2+Xbjra0Tjs83NQSkFS+y7xx+YhCwvpEmXYLIvaggj2ONPyjbiigOvHQ==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [win32]
@@ -848,8 +848,8 @@ packages:
     dev: false
     optional: true
 
-  /@next/swc-win32-ia32-msvc/13.3.2-canary.2:
+  /@next/swc-win32-ia32-msvc/13.4.2:
-    resolution: {integrity: sha512-iHtddC48Xdl7RxCdhBWZ6+1hq/eC0duTR4y3yYPELpXpZnIwGjOT5W5N+3nVRXUVLsj6teRf8fEfWBp3WbJ0RQ==}
+    resolution: {integrity: sha512-dhpiksQCyGca4WY0fJyzK3FxMDFoqMb0Cn+uDB+9GYjpU2K5//UGPQlCwiK4JHxuhg8oLMag5Nf3/IPSJNG8jw==}
     engines: {node: '>= 10'}
     cpu: [ia32]
     os: [win32]
@@ -866,8 +866,8 @@ packages:
     dev: false
     optional: true
 
-  /@next/swc-win32-x64-msvc/13.3.2-canary.2:
+  /@next/swc-win32-x64-msvc/13.4.2:
-    resolution: {integrity: sha512-Ctw3gL8cBMvREpJM09xvC+pPKsG8TVSWxsQPTLvD33qFED0gtU9HSIacJ09eXd8mqtRGebcXaNjY9fVFfGHZ3A==}
+    resolution: {integrity: sha512-O7bort1Vld00cu8g0jHZq3cbSTUNMohOEvYqsqE10+yfohhdPHzvzO+ziJRz4Dyyr/fYKREwS7gR4JC0soSOMw==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [win32]
@@ -948,8 +948,8 @@ packages:
       tslib: 2.4.1
     dev: false
 
-  /@swc/helpers/0.5.0:
+  /@swc/helpers/0.5.1:
-    resolution: {integrity: sha512-SjY/p4MmECVVEWspzSRpQEM3sjR17sP8PbGxELWrT+YZMBfiUyt1MRUNjMV23zohwlG2HYtCQOsCwsTHguXkyg==}
+    resolution: {integrity: sha512-sJ902EfIzn1Fa+qYmjdQqh8tPsoxyBz+8yBKC2HKUxyezKJFwPGOn7pv4WY6QuQW//ySQi5lJjA/ZT9sNWWNTg==}
     dependencies:
       tslib: 2.4.1
     dev: false
@@ -3608,14 +3608,14 @@ packages:
   /natural-compare/1.4.0:
     resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
 
-  /next-themes/0.2.1_fbdiuaz6irj67j3n36ky3t2nbi:
+  /next-themes/0.2.1_cmp7sjki5xcmfyvhcokzzink7a:
     resolution: {integrity: sha512-B+AKNfYNIzh0vqQQKqQItTS8evEouKD7H5Hj3kmuPERwddR2TxvDSFZuTj6T7Jfn1oyeUyJMydPl1Bkxkh0W7A==}
     peerDependencies:
       next: '*'
       react: '*'
       react-dom: '*'
     dependencies:
-      next: 13.3.2-canary.2_krg7tz6h6n3fx3eq7tclunioeu
+      next: 13.4.2_krg7tz6h6n3fx3eq7tclunioeu
       react: 18.2.0
       react-dom: 18.2.0_react@18.2.0
     dev: false
@@ -3667,9 +3667,9 @@ packages:
       - babel-plugin-macros
     dev: false
 
-  /next/13.3.2-canary.2_krg7tz6h6n3fx3eq7tclunioeu:
+  /next/13.4.2_krg7tz6h6n3fx3eq7tclunioeu:
-    resolution: {integrity: sha512-tAJBdhzzQxzomn2Ge3lR3zCVPBnPSfXy6+fTQTDtZHDQe/pH9xJgnMpwvA8kBYEr5yrCcJn0U3kxeo32LRJUjw==}
+    resolution: {integrity: sha512-aNFqLs3a3nTGvLWlO9SUhCuMUHVPSFQC0+tDNGAsDXqx+WJDFSbvc233gOJ5H19SBc7nw36A9LwQepOJ2u/8Kg==}
-    engines: {node: '>=14.18.0'}
+    engines: {node: '>=16.8.0'}
     hasBin: true
     peerDependencies:
       '@opentelemetry/api': ^1.1.0
@@ -3688,8 +3688,8 @@ packages:
       sass:
         optional: true
     dependencies:
-      '@next/env': 13.3.2-canary.2
+      '@next/env': 13.4.2
-      '@swc/helpers': 0.5.0
+      '@swc/helpers': 0.5.1
       busboy: 1.6.0
       caniuse-lite: 1.0.30001473
       postcss: 8.4.14
@@ -3697,16 +3697,17 @@ packages:
       react-dom: 18.2.0_react@18.2.0
       sass: 1.62.0
       styled-jsx: 5.1.1_react@18.2.0
+      zod: 3.21.4
     optionalDependencies:
-      '@next/swc-darwin-arm64': 13.3.2-canary.2
+      '@next/swc-darwin-arm64': 13.4.2
-      '@next/swc-darwin-x64': 13.3.2-canary.2
+      '@next/swc-darwin-x64': 13.4.2
-      '@next/swc-linux-arm64-gnu': 13.3.2-canary.2
+      '@next/swc-linux-arm64-gnu': 13.4.2
-      '@next/swc-linux-arm64-musl': 13.3.2-canary.2
+      '@next/swc-linux-arm64-musl': 13.4.2
-      '@next/swc-linux-x64-gnu': 13.3.2-canary.2
+      '@next/swc-linux-x64-gnu': 13.4.2
-      '@next/swc-linux-x64-musl': 13.3.2-canary.2
+      '@next/swc-linux-x64-musl': 13.4.2
-      '@next/swc-win32-arm64-msvc': 13.3.2-canary.2
+      '@next/swc-win32-arm64-msvc': 13.4.2
-      '@next/swc-win32-ia32-msvc': 13.3.2-canary.2
+      '@next/swc-win32-ia32-msvc': 13.4.2
-      '@next/swc-win32-x64-msvc': 13.3.2-canary.2
+      '@next/swc-win32-x64-msvc': 13.4.2
     transitivePeerDependencies:
       - '@babel/core'
       - babel-plugin-macros
@@ -5420,3 +5421,7 @@ packages:
   /yocto-queue/0.1.0:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
+
+  /zod/3.21.4:
+    resolution: {integrity: sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==}
+    dev: false

turbo.json

@@ -23,11 +23,5 @@
     }
   },
   "globalDependencies": ["**/.env.*local"],
-  "globalEnv": [
+  "globalEnv": ["ZITADEL_API_URL", "ZITADEL_SERVICE_USER_TOKEN"]
-    "ZITADEL_API_URL",
-    "ZITADEL_PROJECT_ID",
-    "ZITADEL_APP_ID",
-    "ZITADEL_SERVICE_USER_TOKEN",
-    "ZITADEL_ORG_ID"
-  ]
 }