Merge branch 'master' into return-500-database-errors

.github/workflows/ci.yaml

@@ -88,13 +88,12 @@ jobs:
  - run: npm install
  name: Install node deps
  - name: Run golangci-lint
- uses: golangci/golangci-lint-action@v4
+ uses: golangci/golangci-lint-action@v6
  env:
  GOGC: 100
  with:
  args: --timeout 10m0s
- version: v1.56.2
- skip-pkg-cache: true
+ version: v1.59.1
  - name: Build Kratos
  run: make install
  - name: Run go-acc (tests)

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
 
  # Initializes the CodeQL tools for scanning.
  - name: Initialize CodeQL
- uses: github/codeql-action/init@v1
+ uses: github/codeql-action/init@v2
  with:
  languages: ${{ matrix.language }}
  config-file: ./.github/codeql/codeql-config.yml
@@ -51,7 +51,7 @@ jobs:
  # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
  # If this step fails, then you should remove it and run the build manually (see below)
  - name: Autobuild
- uses: github/codeql-action/autobuild@v1
+ uses: github/codeql-action/autobuild@v2
 
  # ℹ️ Command-line programs to run using the OS shell.
  # 📚 https://git.io/JvXDl
@@ -65,4 +65,4 @@ jobs:
  # make release
 
  - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v1
+ uses: github/codeql-action/analyze@v2

.gitignore

@@ -65,3 +65,4 @@ test/e2e/kratos.*.yml
 # VSCode debug artifact
 __debug_bin
 .debug.sqlite.db
+.last-run.json

.golangci.yml

@@ -19,14 +19,12 @@ linters-settings:
  goimports:
  local-prefixes: github.com/ory
 
-run:
- skip-dirs:
+issues:
+ exclude-dirs:
  - sdk/
- skip-files:
+ exclude-files:
  - ".+_test.go"
  - "corpx/faker.go"
-
-issues:
  exclude:
  - "Set is deprecated: use context-based WithConfigValue instead"
  - "SetDefaultIdentitySchemaFromRaw is deprecated: Use context-based WithDefaultIdentitySchemaFromRaw instead"

.schema/openapi/patches/schema.yaml

@@ -43,6 +43,7 @@
  set_ory_session_token: "#/components/schemas/continueWithSetOrySessionToken"
  show_settings_ui: "#/components/schemas/continueWithSettingsUi"
  show_recovery_ui: "#/components/schemas/continueWithRecoveryUi"
+ redirect_browser_to: "#/components/schemas/continueWithRedirectBrowserTo"
 
 - op: add
  path: /components/schemas/continueWith/oneOf
@@ -51,3 +52,4 @@
  - "$ref": "#/components/schemas/continueWithSetOrySessionToken"
  - "$ref": "#/components/schemas/continueWithSettingsUi"
  - "$ref": "#/components/schemas/continueWithRecoveryUi"
+ - "$ref": "#/components/schemas/continueWithRedirectBrowserTo"

.schema/openapi/patches/selfservice.yaml

@@ -19,6 +19,7 @@
  - "$ref": "#/components/schemas/updateRegistrationFlowWithWebAuthnMethod"
  - "$ref": "#/components/schemas/updateRegistrationFlowWithCodeMethod"
  - "$ref": "#/components/schemas/updateRegistrationFlowWithPasskeyMethod"
+ - "$ref": "#/components/schemas/updateRegistrationFlowWithProfileMethod"
 - op: add
  path: /components/schemas/updateRegistrationFlowBody/discriminator
  value:
@@ -28,7 +29,8 @@
  oidc: "#/components/schemas/updateRegistrationFlowWithOidcMethod"
  webauthn: "#/components/schemas/updateRegistrationFlowWithWebAuthnMethod"
  code: "#/components/schemas/updateRegistrationFlowWithCodeMethod"
- passKey: "#/components/schemas/updateRegistrationFlowWithPasskeyMethod"
+ passkey: "#/components/schemas/updateRegistrationFlowWithPasskeyMethod"
+ profile: "#/components/schemas/updateRegistrationFlowWithProfileMethod"
 - op: add
  path: /components/schemas/registrationFlowState/enum
  value:
@@ -50,6 +52,7 @@
  - "$ref": "#/components/schemas/updateLoginFlowWithLookupSecretMethod"
  - "$ref": "#/components/schemas/updateLoginFlowWithCodeMethod"
  - "$ref": "#/components/schemas/updateLoginFlowWithPasskeyMethod"
+ - "$ref": "#/components/schemas/updateLoginFlowWithIdentifierFirstMethod"
 - op: add
  path: /components/schemas/updateLoginFlowBody/discriminator
  value:
@@ -62,6 +65,7 @@
  lookup_secret: "#/components/schemas/updateLoginFlowWithLookupSecretMethod"
  code: "#/components/schemas/updateLoginFlowWithCodeMethod"
  passkey: "#/components/schemas/updateLoginFlowWithPasskeyMethod"
+ identifier_first: "#/components/schemas/updateLoginFlowWithIdentifierFirstMethod"
 - op: add
  path: /components/schemas/loginFlowState/enum
  value:

.schemastore/config.schema.json

@@ -432,7 +432,7 @@
  },
  "provider": {
  "title": "Provider",
- "description": "Can be one of github, github-app, gitlab, generic, google, microsoft, discord, slack, facebook, auth0, vk, yandex, apple, spotify, netid, dingtalk, patreon.",
+ "description": "Can be one of github, github-app, gitlab, generic, google, microsoft, discord, salesforce, slack, facebook, auth0, vk, yandex, apple, spotify, netid, dingtalk, patreon.",
  "type": "string",
  "enum": [
  "github",
@@ -442,6 +442,7 @@
  "google",
  "microsoft",
  "discord",
+ "salesforce",
  "slack",
  "facebook",
  "auth0",