TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 10:47:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into fix-login-image-minimal

Browse Source
This commit is contained in:
Elio Bischof
2025-07-30 14:19:06 +02:00
committed by GitHub
parent 4cb89b7b78 82e4466928
commit 89e6e09905
4 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docs/docs/apis/scim2.md
View File

@@ -2,15 +2,6 @@
title: SCIM v2.0 (Preview)
---
:::info
The SCIM v2 interface of Zitadel is currently in a [preview stage](/support/software-release-cycles-support#preview).
It is not yet feature-complete, may contain bugs, and is not generally available.
Do not use it for production yet.
As long as the feature is in a preview state, it will be available for free, it will be put behind a commercial license once it is fully available.
:::
The Zitadel [SCIM v2](https://scim.cloud/) service provider interface enables seamless integration of identity and
access management (IAM) systems with Zitadel,
following the System for Cross-domain Identity Management (SCIM) v2.0 specification.

9
docs/docs/guides/manage/user/scim2.md
View File

@@ -2,15 +2,6 @@
title: SCIM v2.0 (Preview)
---
:::info
The SCIM v2 interface of Zitadel is currently in a [preview stage](/support/software-release-cycles-support#preview).
It is not yet feature-complete, may contain bugs, and is not generally available.
Do not use it for production yet.
As long as the feature is in a preview state, it will be available for free, it will be put behind a commercial license once it is fully available.
:::
The Zitadel [SCIM v2](https://scim.cloud/) service provider interface enables seamless integration of identity and
access management (IAM) systems with Zitadel,
following the System for Cross-domain Identity Management (SCIM) v2.0 specification.

4
docs/sidebars.js
View File

@@ -751,10 +751,10 @@ module.exports = {
label: "Organization (Beta)",
link: {
type: "generated-index",
title: "Organization Service beta API",
title: "Organization Service Beta API",
slug: "/apis/resources/org_service/v2beta",
description:
"This API is intended to manage organizations for ZITADEL. \n",
"This beta API is intended to manage organizations for ZITADEL. Expect breaking changes to occur. Please use the v2 version for a stable API. \n",
},
items: sidebar_api_org_service_v2beta,
},

8
proto/zitadel/org/v2beta/org_service.proto
View File

@@ -115,6 +115,8 @@ service OrganizationService {
//
// Required permission:
// - `org.create`
//
// Deprecated: Use [AddOrganization](/apis/resources/org_service_v2/organization-service-add-organization.api.mdx) instead to create an organization.
rpc CreateOrganization(CreateOrganizationRequest) returns (CreateOrganizationResponse) {
option (google.api.http) = {
post: "/v2beta/organizations"
@@ -127,7 +129,7 @@ service OrganizationService {
}
};
option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
responses: {
key: "200";
value: {
@@ -140,6 +142,7 @@ service OrganizationService {
description: "The organization to create already exists.";
}
};
deprecated: true;
};
}
@@ -190,6 +193,8 @@ service OrganizationService {
//
// Required permission:
// - `iam.read`
//
// Deprecated: Use [ListOrganizations](/apis/resources/org_service_v2/organization-service-list-organizations.api.mdx) instead to list organizations.
rpc ListOrganizations(ListOrganizationsRequest) returns (ListOrganizationsResponse) {
option (google.api.http) = {
post: "/v2beta/organizations/search";
@@ -206,6 +211,7 @@ service OrganizationService {
responses: {
key: "200";
};
deprecated: true;
};
}