diff --git a/.changeset/nine-grapes-promise.md b/.changeset/nine-grapes-promise.md deleted file mode 100644 index a845151cc8..0000000000 --- a/.changeset/nine-grapes-promise.md +++ /dev/null @@ -1,2 +0,0 @@ ---- ---- diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f020469837..9eaf62c341 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,8 +2,7 @@ name: CI on: merge_group: - pull_request_target: - types: [opened, synchronize] + pull_request: branches: - main - release/v4 @@ -13,7 +12,7 @@ concurrency: cancel-in-progress: true jobs: - # Check triggering actor permissions to prevent PRs from forks accessing secrets by default, preventing them from accessing secrets for malicious purposes + # Check triggering actor permissions to prevent PRs from forks accessing secrets by default, preventing them from exfiltrating secrets for malicious purposes check-permissions: runs-on: 'blacksmith-8vcpu-ubuntu-2204' steps: @@ -48,7 +47,6 @@ jobs: with: fetch-depth: 0 show-progress: false - ref: ${{ github.event.pull_request.head.sha }} - name: Setup id: config @@ -120,7 +118,6 @@ jobs: with: fetch-depth: 0 show-progress: false - ref: ${{ github.event.pull_request.head.sha }} - name: Setup id: config @@ -182,7 +179,6 @@ jobs: with: fetch-depth: 0 show-progress: false - ref: ${{ github.event.pull_request.head.sha }} - name: Setup id: config diff --git a/packages/backend/src/api/endpoints/SamlConnectionApi.ts b/packages/backend/src/api/endpoints/SamlConnectionApi.ts index 58671806c6..9ac17c2cf2 100644 --- a/packages/backend/src/api/endpoints/SamlConnectionApi.ts +++ b/packages/backend/src/api/endpoints/SamlConnectionApi.ts @@ -14,6 +14,7 @@ type CreateSamlConnectionParams = { name: string; provider: SamlIdpSlug; domain: string; + organizationId?: string; idpEntityId?: string; idpSsoUrl?: string; idpCertificate?: string; @@ -31,6 +32,7 @@ type UpdateSamlConnectionParams = { name?: string; provider?: SamlIdpSlug; domain?: string; + organizationId?: string; idpEntityId?: string; idpSsoUrl?: string; idpCertificate?: string;