Merge branch 'main' into release

# Conflicts:
#	package-lock.json
#	package.json
#	swagger/swagger.json

Author: deepakprabhakara

.env.example

@@ -64,6 +64,8 @@ OPENID_RSA_PRIVATE_KEY=
 # cat public_key.pem | base64
 OPENID_RSA_PUBLIC_KEY=
 
+OPENID_REDIRECT_EXACT_MATCH=
+
 # You can use `openssl req -x509 -newkey rsa:2048 -keyout key.pem -out public.crt -sha256 -days 365000 -nodes` to generate one
 # Base64 encoded value of public key `cat public.crt | base64`
 PUBLIC_KEY=
@@ -121,4 +123,7 @@ LOG_LEVEL=
 # FLATTEN_RAW_CLAIMS=true
 
 ADMIN_PORTAL_HIDE_IDENTITY_FEDERATION=
-ADMIN_PORTAL_HIDE_DIRECTORY_SYNC=
+ADMIN_PORTAL_HIDE_DIRECTORY_SYNC=
+
+# Uncomment below if you want to enable the JSON error page instead of the default HTML error page
+JSON_ERROR_PAGE=

.github/workflows/main.yml

@@ -55,12 +55,11 @@ jobs:
       BOXYHQ_LICENSE_KEY: 'dummy-license'
     strategy:
       matrix:
-        node-version: [22]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+        node-version: [24]
 
     services:
       postgres:
-        image: postgres:16.4
+        image: postgres:18.3
         ports:
           - 5432:5432
         env:
@@ -73,51 +72,47 @@ jobs:
           --health-timeout 5s
           --health-retries 5
       redis:
-        image: redis:7.4-alpine
+        image: redis:8.6-alpine
         ports:
           - 6379:6379
       mongo:
-        image: mongo:7.0.12
+        image: mongo:8.2.6
         ports:
           - 27017:27017
       planetscale:
-        image: mysql:8.4.2
+        image: mysql:9.6.0
         ports:
           - 3308:3306
         env:
           MYSQL_DATABASE: mysql
           MYSQL_ROOT_PASSWORD: mysql
       mysql:
-        image: mysql:8.4.2
+        image: mysql:9.6.0
         ports:
           - 3307:3306
         env:
           MYSQL_DATABASE: mysql
           MYSQL_ROOT_PASSWORD: mysql
       maria:
-        image: mariadb:11.5.2
+        image: mariadb:12.2.2
         ports:
           - 3306:3306
         env:
           MARIADB_DATABASE: mysql
           MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: 'yes'
       mssql:
-        image: mcr.microsoft.com/azure-sql-edge:2.0.0
+        image: mcr.microsoft.com/mssql/server:2025-latest
         ports:
           - 1433:1433
         env:
           ACCEPT_EULA: 'Y'
           SA_PASSWORD: '123ABabc!'
       dynamodb-local:
-        image: 'amazon/dynamodb-local:2.5.2'
+        image: 'amazon/dynamodb-local:3.3.0'
         ports:
           - '8000:8000'
-      turso:
-        image: ghcr.io/tursodatabase/libsql-server:latest
-        ports:
-          - '8080:8080'
       mocksaml:
-        image: boxyhq/mock-saml:1.3.9
+        image: boxyhq/mock-saml:1.4.2
         ports:
           - 4000:4000
         env:
@@ -127,9 +122,9 @@ jobs:
           PRIVATE_KEY: 'LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2d0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktrd2dnU2xBZ0VBQW9JQkFRRE0yUzJaUDNnRUt0WUsKWDduYmF5RnJmeTZPbVJkYU1zOFRqamxwWDhFUmxZVGxISndOS0llU1pWcmcvRGV3d3Q5bkk3ZkE4THMwS1gxYQpvdU4xelZjVEpaOWphREVVU09WM0FXVjloWS8zNzgyaTU0RVNPWHcrMTVSZzRqNnlodkhsUm4vMHROMjdsU29MCmx0V1NWay95M29QWStaRmlyYW1OT0pMT1NnenFCK3dUWVhGNHF1aG4xOHpSUHdMVnp5V21ydlRFUTUySzFmMDIKQitBZ0JvVWEwZ0xDVVBUYkdxeEdlaWU1a1Zla3pkZVRpU240aDhVRUF6Tlc2RFJkN2t0Q1FKN0tacVNCaXczZwppN0x3aGl5OXNXcWs2MWx1YU5zcEdTNVc1eVBKL0psYWFUNDVPdENKVTFObWRzaktHUHhId3pnYWdkQ0lESkZPCjhQVHlGbnBEQWdNQkFBRUNnZ0VBQ0NPbytDblpidkQweUR5OWVjWnI4WVdBS0JKVkp6UlZuZ1ZNcXE4dlVLK00KTkQ1S3hRc1ROL0huQm9GL0JQcjVQWFBoM1R5emM0TWlnL05zN2tWV2JHQldVUERXNG1OekdxTm5rUEU1b3pSWQpDMXovZCtYbzFlWmk4dWFLYnpXRmJ3SzZHdE1FN0dzazNJa0Z1MmJLam0vZzlVSVZVTUp0dGpyRk9vVWV0ajNBCkpFWU5TZFplWFA2Z0RXeitlR0F6V2RXRnlNZ1hHT0hCanVMekt1S3kwb2xQaUFHRTJIMlhicHlCSEk2K09taHUKemU4VEhYSUg0YW1TOTdaN0ZlWTdZaDZPV0xoeVByaVh3VGZjNk1NaktubUdWOWQ3RytVanIyS3NVNGtYMG1MRApQKzhsS1NqVnFvUjF2YUswWEJiV0Fnd0kwbVd4TjhQMFZqSzRjMzJUNFFLQmdRRG9wZUJ6cE1xVjFlY24ydkFzCnkvRW5JeXdMcUlBVUZuRXRsRnlnMkVOM2ZZMDRkUTBqOWNzM0ZqbXNQK3grYjA1U2pJK05vVVQzRUowNC96Uk8KMFcvcmc0cEVTUlNDOHRtelliUGkycktrc2xLSDhmUWd2YzZKV1FVUThsWWx2elh6OTZiTFlxeFNtK0EwZ1Z4QQpEc2JNQk5NZDEzdk5Wa1VjTURsMnNveTNMUUtCZ1FEaGFQWnF4QzRxSVB1TlhOZE5EbExRVGZIWGxFMzRRTXVaCnNiM3J1NVdwbkJOdWpCU0xHREV2a0pvckprcUZ1b3VYUnVOOGIrd3BObi9lc0c3TjZyM3o5bHltRkI1VE1Ba3kKTlBPR0dDNWdqOU0wVytGTmw4M2dIVkN6eVgxa3VyR2t1amVHM1F1b2RoYXZBaWpqUzdnNW5Nb1J3OEpwcitUdwp4NEtKMC92ZEx3S0JnUURBSjVHMXNweXBHVjJ0YTRZSVdnSTZvekJVQ0w2UTJPQnVGeVpTcTQwOStuTlQrRW44Ck01Mi9TQm9talQzV1NEVFd0Y1l6NHNuRmp2RnRERXkxOVFLTjhiMllIUXhXQkNPUHA5a2VQQ2hsSSt4SzRLc1YKQi9DNVBNK1VhYlNCeE9iWk5PbU0vMWo1ZWttNjFFWFBtdVRUeWdCZG00ZGoyQ2VJMnNQN3FBblZtUUtCZ1FDZgp0T0N5OE9ETWxLWG1tTnNyQzNUOWhkeE9KQlBDU3haMmhRck5WUkZMSlB4WG5RU0pNTkRZcEptMjdPQnNNNm5uCnV5QSs4SVhoQlc0Lzk3M3FRK0htVXExK05rN3VIZURHSStKUEpoN2w1OEY3SFlaYWxhNFdsbTZ4azVjMm9WaHcKSUVoclUzNkpFM0lxK1ZyREFNazhlS3hyUGNvblc2cllObU4xQ0M4eG5RS0JnUURiOGZTeDBQcHg1WisxL2tCMwpxVGc2RDJYY1YyZGVWNFdsOS9JQ2owRHFqaGpXekJjaThuTjUyb3ZoSmVXcFVxWnJ1eStVWTg2cVRuK09oNGVJClNkZFRBb0F2cU1sL2gzVzdCRUdad2NsclRJSWRqTHVmK0FuRGN5S0lKY21CUG9JZGsydzZ4dkNWczJqbmdEOTMKcjZ0R3VoNHlvM2pIRkRTR0Y3dDdCRk5RSEE9PQotLS0tLUVORCBQUklWQVRFIEtFWS0tLS0tCg=='
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           always-auth: true
           node-version: ${{ matrix.node-version }}
@@ -139,13 +134,13 @@ jobs:
           check-latest: true
       - name: Run docker-compose up
         id: docker_compose
-        uses: isbang/compose-action@v2.2.0
+        uses: isbang/compose-action@v2.5.0
         with:
           compose-file: './_dev/docker-compose-cockroachdb.yml'
       - run: node -v
       - run: npm -v
       - name: Setup Next.js cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: |
             ~/.npm
@@ -170,7 +165,7 @@ jobs:
       - name: e2e tests
         run: npx ts-node --log-error e2e/support/pretest.ts && npx playwright test -x
       - name: Upload e2e trace
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: ${{ !cancelled() }}
         with:
           name: playwright-report
@@ -213,7 +208,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check Out Repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - run: echo ${{ needs.ci.outputs.NPM_VERSION }}
       - run: echo ${{ needs.ci.outputs.IMAGE_PATH }}
@@ -224,26 +219,26 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
 
       - name: Login to Docker Hub
-        if: github.ref == 'refs/heads/release'
-        uses: docker/login-action@v3
+        if: github.ref == 'refs/heads/release' || startsWith(github.ref, 'refs/tags/beta-v')
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: ./
           file: ./Dockerfile
           platforms: linux/amd64,linux/arm64
-          push: ${{ github.ref == 'refs/heads/release' }}
+          push: ${{ github.ref == 'refs/heads/release' || startsWith(github.ref, 'refs/tags/beta-v') }}
           tags: ${{ needs.ci.outputs.IMAGE_PATH }}:${{ needs.ci.outputs.PUBLISH_TAG }},${{ needs.ci.outputs.IMAGE_PATH }}:${{ steps.slug.outputs.SHA7 }},${{ needs.ci.outputs.IMAGE_PATH }}:${{ needs.ci.outputs.NPM_VERSION }}
 
       - name: Image digest
@@ -298,12 +293,12 @@ jobs:
           sbom-artifact-match: ".*\\.cyclonedx$"
       - name: Download artifact for SPDX Report
         if: github.ref == 'refs/heads/release'
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: npm_sbom.spdx
       - name: Download artifact for CycloneDx Report
         if: github.ref == 'refs/heads/release'
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: npm_sbom.cyclonedx
       - name: Remove older SBOMs
@@ -341,12 +336,12 @@ jobs:
         run: rm -rf sbom*.* || true
       - name: Download artifact for SPDX Report
         if: github.ref == 'refs/heads/release'
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: sbom.spdx
       - name: Download artifact for CycloneDx Report
         if: github.ref == 'refs/heads/release'
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: sbom.cyclonedx
 
@@ -378,12 +373,12 @@ jobs:
           sbom-artifact-match: ".*\\.cyclonedx$"
       - name: Download artifact for SPDX Report [Docker]
         if: github.ref == 'refs/heads/release'
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: docker_sbom.spdx
       - name: Download artifact for CycloneDx Report [Docker]
         if: github.ref == 'refs/heads/release'
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: docker_sbom.cyclonedx
       - name: Create/Clear folder [Docker]
@@ -441,17 +436,16 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [22]
+        node-version: [24]
         package: [npm, internal-ui]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - run: echo ${{ needs.ci.outputs.NPM_VERSION }}
       - run: echo ${{ needs.ci.outputs.PUBLISH_TAG }}
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           always-auth: true
           node-version: ${{ matrix.node-version }}

.prettierignore

@@ -8,6 +8,7 @@ npm/migration/**
 npm/dist/**
 npm/.nyc_output/**
 .vscode/**
+next-env.d.ts
 
 npm/package-lock.json
 

CODE_OF_CONDUCT.md

@@ -47,7 +47,7 @@ individual problems. If Ory open source software is used in production in a
 for-profit company or enterprise environment, we mandate a paid support contract
 where Ory is obligated under their service level agreements (SLAs) to offer a
 defined level of availability and responsibility. For more information about
-paid support please contact us at sales@ory.sh.
+paid support please contact us at sales@ory.com.
 
 ## Enforcement Responsibilities
 
@@ -73,7 +73,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-[office@ory.sh](mailto:office@ory.sh). All complaints will be reviewed and
+[office@ory.com](mailto:office@ory.com). All complaints will be reviewed and
 investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the