Skip to content

Commit 2332c52

Browse files
authored
Merge branch 'ory:master' into refactor/flutter-quickstart
2 parents 5c05fc8 + 3a2cddf commit 2332c52

File tree

7 files changed

+137
-30
lines changed

7 files changed

+137
-30
lines changed

docs/intro.mdx

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -67,30 +67,39 @@ around identities, sessions, login, OAuth2, permissions, and more. The core comp
6767

6868
Ory Network incorporates the open-source [Ory Kratos Identity Server](https://www.ory.sh/kratos) and offers:
6969

70-
- **Self-service** flows are everything users do on their own / without the help of others:
71-
- Registration with passwords, social sign-in, OpenID Connect, ...
72-
- Login with passwords, social sign-in, OpenID Connect, ...
73-
- Updating the profile, email, changing the password, un/linking with social sign-in providers, ...
70+
- Self-service flows are everything users do on their own / without the help of others:
71+
- Registration with passwords, social sign-in, OpenID Connect, passkeys, and more.
72+
- Login with passwords, social sign-in, OpenID Connect, passkeys, and more.
73+
- Updating the profile, email, changing the password, un/linking with social sign-in providers, and more.
7474
- Recovering the account by resetting the password.
75-
- Verifying email addresses, phone numbers,...
75+
- Verifying email addresses, phone numbers, and more.
7676
- Multi-factor authentication flows and recovery processes.
77-
- **Administrative identity management** to get, create, update, and delete identities (users) and their data.
78-
- **Headless APIs and data models** allow you to fully customize Identity Schemas (for example adding fields like first name,
79-
accept tos, shipping address, gender, ...) and create your login, registration, profile settings, recovery, and verification
80-
screen using SDKs and REST APIs.
77+
- Administrative identity management to get, create, update, and delete identities and their data.
78+
- Headless APIs and data models allow you to fully customize Identity Schemas - for example adding fields like name, accept ToS,
79+
phone number - and create your login, registration, profile settings, recovery, and verification screen using SDKs and REST
80+
APIs.
81+
- SCIM support for automated user provisioning and deprovisioning with supported identity providers.
8182

8283
### Permissions and relationships
8384

8485
Ory Network incorporates the open-source [Ory Keto Permission Server](https://www.ory.sh/keto) and offers:
8586

86-
- **Permission management** to get, create, update, and delete permissions.
87-
- **Permission checking** to check if a user has a permission.
87+
- Permission management to get, create, update, and delete permissions.
88+
- Permission checking to check if a user has a permission.
8889

8990
### OAuth2 and OIDC
9091

9192
Ory Network incorporates the open-source [Ory Hydra OAuth2 & OpenID Server](https://www.ory.sh/hydra) and offers:
9293

93-
- **Fully featured OAuth2 & [OpenID Certified](https://openid.net/developers/certified/)® OIDC Provider**
94+
- Fully featured OAuth2 & [OpenID Certified](https://openid.net/developers/certified/)® OIDC Provider
95+
96+
### SAML
97+
98+
Ory Network incorporates the open-source [Ory Polis](https://www.ory.sh/polis) and offers:
99+
100+
- Enterprise SSO integration with SAML identity providers such as Okta, Azure AD, and Google Workspace.
101+
- Simplified SSO flow by implementing SSO as a standard OAuth 2.0 flow, abstracting away the complexities of SAML.
102+
- Act as a SAML Identity Provider (IdP).
94103

95104
### Ory Console
96105

@@ -118,18 +127,3 @@ in the world. Ory is not another company "greenwashing" with open source by publ
118127
all Ory core systems are available as Apache 2.0 licensed software without enterprise or open-core models.
119128

120129
Head over to the [Ory Open Source Overview](./open-source.mdx) for an introduction to the different projects.
121-
122-
### Is open source taking a back seat?
123-
124-
**No!**
125-
126-
Ory Network is the commercial offering which generates revenue to sustain high quality development and add more features to Ory
127-
Open Source. The value proposition and vision for Ory Network is to incorporate and advance the open-source ecosystem and add
128-
additional services which aren't possible to open source (for example analytics, SLAs, SRE, low-latency).
129-
130-
The Ory Network and Ory Open Source software are interlinked. Ory Network is using the [Ory Open Source](https://github.com/ory/)
131-
code base, APIs, features, and configurations to provide services. Ory Network features modifications to better support the custom
132-
multi-tenant environment and operational (SRE) mode.
133-
134-
In the future, Ory will continue to increase its open-source footprint. and make the projects easier to modify, use, access, and
135-
distribute. The biggest impact Ory Network will have is that it will accelerate and sustain the development of Ory Open Source.

docs/open-source.mdx

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ title: Ory is open source
44
sidebar_label: Projects
55
---
66

7+
This document provides an overview of the most popular Ory open-source projects, and other related resources.
8+
79
Ory has an open-source architecture, attitude, and heart. We believe in collaboration, participation, and the open exchange of
810
ideas. Open source is a fundamental part of modern software development and allows everyone regardless of economic background to
911
build a better world with software.
1012

11-
Therefore, most of what Ory does is open source. Read more about [Ory's commitment to open source](./open-source/commitment.mdx).
12-
13-
This document provides an overview of our most popular open-source projects, and other related resources.
13+
Most of what Ory does is open source. Read more about [Ory's commitment to open source](./open-source/commitment.mdx).
1414

1515
## Projects
1616

@@ -47,3 +47,19 @@ For many more visit [Ory on GitHub](https://github.com/ory).
4747
- [Ory Community Chat](https://slack.ory.sh/)
4848
- [GitHub discussions](https://github.com/discussions?discussions_q=org%3Aory)
4949
- [Ory Community Examples](https://github.com/ory/examples)
50+
51+
## Is open source taking a back seat?
52+
53+
No — open source remains at the core of Ory.
54+
55+
The Ory Network and the Ory Enterprise License are commercial offerings designed to fund and accelerate the development of Ory
56+
Open Source. They enable long-term sustainability, support enterprise requirements, and provide capabilities that are difficult to
57+
deliver through open source alone — such as multi-tenancy, analytics, SLAs, SRE support, high scalability, high availability,
58+
globally distributed low-latency infrastructure, and more.
59+
60+
Both Ory Network and the Ory Enterprise License are built on top of the [Ory Open Source](https://github.com/ory/) code base. They
61+
use the same APIs, features, and configurations, with enhancements tailored for multi-tenant architectures and enterprise-grade
62+
security and operations.
63+
64+
Ory is committed to continuing the growth of its open-source ecosystem — making it even more accessible, customizable, and
65+
developer-friendly. The commercial offerings play a key role in accelerating and sustaining the development of Ory Open Source.

docs/reference/api.json

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10421,6 +10421,19 @@
1042110421
"required": ["identifier", "method"],
1042210422
"type": "object"
1042310423
},
10424+
"updateOrganizationOnboardingPortalLinkBody": {
10425+
"properties": {
10426+
"enable_sso": {
10427+
"description": "Feature flag to enable SSO configuration",
10428+
"type": "boolean"
10429+
},
10430+
"expires_at": {
10431+
"$ref": "#/components/schemas/Time"
10432+
}
10433+
},
10434+
"required": ["enable_sso"],
10435+
"type": "object"
10436+
},
1042410437
"updateRecoveryFlowBody": {
1042510438
"description": "Update Recovery Flow Request Body",
1042610439
"discriminator": {
@@ -16843,6 +16856,83 @@
1684316856
],
1684416857
"summary": "Delete an organization onboarding portal link",
1684516858
"tags": ["project"]
16859+
},
16860+
"post": {
16861+
"description": "Update a onboarding portal link for an organization.",
16862+
"operationId": "updateOrganizationOnboardingPortalLink",
16863+
"parameters": [
16864+
{
16865+
"description": "Project ID\n\nThe project's ID.",
16866+
"in": "path",
16867+
"name": "project_id",
16868+
"required": true,
16869+
"schema": {
16870+
"type": "string"
16871+
}
16872+
},
16873+
{
16874+
"description": "Organization ID\n\nThe Organization's ID.",
16875+
"in": "path",
16876+
"name": "organization_id",
16877+
"required": true,
16878+
"schema": {
16879+
"type": "string"
16880+
}
16881+
},
16882+
{
16883+
"in": "path",
16884+
"name": "onboarding_portal_link_id",
16885+
"required": true,
16886+
"schema": {
16887+
"type": "string"
16888+
}
16889+
}
16890+
],
16891+
"requestBody": {
16892+
"content": {
16893+
"application/json": {
16894+
"schema": {
16895+
"$ref": "#/components/schemas/updateOrganizationOnboardingPortalLinkBody"
16896+
}
16897+
}
16898+
},
16899+
"x-originalParamName": "Body"
16900+
},
16901+
"responses": {
16902+
"200": {
16903+
"content": {
16904+
"application/json": {
16905+
"schema": {
16906+
"$ref": "#/components/schemas/onboardingPortalLink"
16907+
}
16908+
}
16909+
},
16910+
"description": "onboardingPortalLink"
16911+
},
16912+
"default": {
16913+
"content": {
16914+
"application/json": {
16915+
"schema": {
16916+
"$ref": "#/components/schemas/errorGeneric"
16917+
}
16918+
}
16919+
},
16920+
"description": "errorGeneric"
16921+
}
16922+
},
16923+
"security": [
16924+
{
16925+
"oryWorkspaceApiKey": []
16926+
}
16927+
],
16928+
"servers": [
16929+
{
16930+
"description": "The Ory Network control plane API which is used to manage your Ory Network projects and workspaces.",
16931+
"url": "https://api.console.ory.sh"
16932+
}
16933+
],
16934+
"summary": "Update organization onboarding portal link",
16935+
"tags": ["project"]
1684616936
}
1684716937
},
1684816938
"/projects/{project_id}/revision/{revision_id}": {

docs/self-hosted/oel/oel-hydra-image-tags.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
| Image Tag | Release Date |
22
| ---------------------------------------- | ------------ |
3+
| ea3038323329fb703a31bde1abc1a0cf41a08926 | 2025-06-23 |
4+
| 19fae4f763fa139db38db601000cb80b53ebde4d | 2025-06-20 |
35
| 290abca8469dc46c1ba07708849fed28fdbc1b69 | 2025-06-11 |
46
| d389bd4c1bc21c1cdaf5e60688314a5bf9bfce3e | 2025-06-06 |
57
| d4f640cf72989adf24ba153919ede18d4cddc98e | 2025-05-27 |
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
| Image Tag | Release Date |
22
| ---------------------------------------- | ------------ |
3+
| ea3038323329fb703a31bde1abc1a0cf41a08926 | 2025-06-23 |
4+
| 19fae4f763fa139db38db601000cb80b53ebde4d | 2025-06-20 |
35
| de9debec0a2c8e8f35b2a8924cc133925162a0a6 | 2025-06-18 |
46
| d389bd4c1bc21c1cdaf5e60688314a5bf9bfce3e | 2025-06-06 |
57
| d4f640cf72989adf24ba153919ede18d4cddc98e | 2025-05-27 |

docs/self-hosted/oel/oel-kratos-image-tags.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
| Image Tag | Release Date |
22
| ---------------------------------------- | ------------ |
3+
| ea3038323329fb703a31bde1abc1a0cf41a08926 | 2025-06-23 |
4+
| 19fae4f763fa139db38db601000cb80b53ebde4d | 2025-06-20 |
35
| de9debec0a2c8e8f35b2a8924cc133925162a0a6 | 2025-06-18 |
46
| 290abca8469dc46c1ba07708849fed28fdbc1b69 | 2025-06-11 |
57
| d389bd4c1bc21c1cdaf5e60688314a5bf9bfce3e | 2025-06-06 |
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
| Image Tag | Release Date |
22
| ---------------------------------------- | ------------ |
3+
| ea3038323329fb703a31bde1abc1a0cf41a08926 | 2025-06-23 |
34
| de9debec0a2c8e8f35b2a8924cc133925162a0a6 | 2025-06-18 |
45
| d389bd4c1bc21c1cdaf5e60688314a5bf9bfce3e | 2025-06-06 |
56
| 936e2f934cae31d47939e342dcc1e8c5f6f81fe7 | 2025-05-05 |

0 commit comments

Comments
 (0)