Skip to content

Commit b705127

Browse files
authored
Merge branch 'main' into rob/user-5100-deprecate-requireauth-helper
2 parents 30d62c6 + 26692e1 commit b705127

7 files changed

Lines changed: 42 additions & 2 deletions

File tree

.changeset/fifty-paths-tie.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/ui': patch
3+
---
4+
5+
Adjust padding and display logo on `OrganizationList` header
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/backend': patch
3+
---
4+
5+
Export `OrganizationInvitationAcceptedWebhookEvent` type.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

.github/workflows/e2e-staging.yml

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ concurrency:
3939
jobs:
4040
permissions-check:
4141
name: Check Permissions
42+
if: ${{ github.event_name != 'repository_dispatch' }}
4243
runs-on: 'blacksmith-8vcpu-ubuntu-2204'
4344
steps:
4445
- name: Check org membership
@@ -70,12 +71,35 @@ jobs:
7071
validate-instances:
7172
name: Validate Staging Instances
7273
needs: [permissions-check]
74+
if: ${{ always() && (needs.permissions-check.result == 'success' || needs.permissions-check.result == 'skipped') }}
7375
runs-on: 'blacksmith-8vcpu-ubuntu-2204'
7476
steps:
77+
- name: Normalize inputs
78+
id: inputs
79+
env:
80+
EVENT_NAME: ${{ github.event_name }}
81+
INPUT_REF: ${{ github.event.inputs.ref }}
82+
PAYLOAD_REF: ${{ github.event.client_payload.ref }}
83+
run: |
84+
if [ "$EVENT_NAME" = "workflow_dispatch" ]; then
85+
echo "ref=${INPUT_REF:-main}" >> $GITHUB_OUTPUT
86+
else
87+
echo "ref=${PAYLOAD_REF:-main}" >> $GITHUB_OUTPUT
88+
fi
89+
90+
- name: Validate ref
91+
env:
92+
REF: ${{ steps.inputs.outputs.ref }}
93+
run: |
94+
if [[ ! "$REF" =~ ^(main|release/.*)$ ]]; then
95+
echo "::error::Ref '$REF' is not allowed. Only 'main' and 'release/*' branches are permitted."
96+
exit 1
97+
fi
98+
7599
- name: Checkout Repo
76100
uses: actions/checkout@v4
77101
with:
78-
ref: ${{ github.event.inputs.ref || github.event.client_payload.ref || 'main' }}
102+
ref: ${{ steps.inputs.outputs.ref }}
79103
sparse-checkout: scripts/validate-staging-instances.mjs
80104
fetch-depth: 1
81105

@@ -88,6 +112,7 @@ jobs:
88112
integration-tests:
89113
name: Integration Tests (${{ matrix.test-name }}, ${{ matrix.test-project }})
90114
needs: [permissions-check]
115+
if: ${{ always() && (needs.permissions-check.result == 'success' || needs.permissions-check.result == 'skipped') }}
91116
runs-on: 'blacksmith-8vcpu-ubuntu-2204'
92117
defaults:
93118
run:

packages/backend/src/api/resources/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ export * from './Web3Wallet';
6767
export type {
6868
EmailWebhookEvent,
6969
OrganizationDomainWebhookEvent,
70+
OrganizationInvitationAcceptedWebhookEvent,
7071
OrganizationInvitationWebhookEvent,
7172
OrganizationMembershipWebhookEvent,
7273
OrganizationWebhookEvent,

packages/backend/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ export type {
163163
EmailWebhookEvent,
164164
OrganizationWebhookEvent,
165165
OrganizationDomainWebhookEvent,
166+
OrganizationInvitationAcceptedWebhookEvent,
166167
OrganizationInvitationWebhookEvent,
167168
OrganizationMembershipWebhookEvent,
168169
RoleWebhookEvent,

packages/ui/src/components/OrganizationList/OrganizationListPage.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,9 @@ export const OrganizationListPageList = (props: { onCreateOrganizationClick: ()
137137
<>
138138
<Header.Root
139139
sx={t => ({
140-
padding: `${t.space.$none} ${t.space.$8}`,
140+
padding: `${t.space.$4} ${t.space.$4} ${t.space.$none}`,
141141
})}
142+
showLogo
142143
>
143144
<Header.Title
144145
localizationKey={localizationKeys(

0 commit comments

Comments
 (0)