Skip to content

Commit 465ae37

Browse files
committed
Merge branch 'dev' into sentry-email-rendering
2 parents a08b23d + 57a050e commit 465ae37

90 files changed

Lines changed: 4581 additions & 736 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/db-migration-backwards-compatibility.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ jobs:
215215
run: pnpm test
216216

217217
- name: Verify data integrity
218-
run: pnpm run verify-data-integrity
218+
run: pnpm run verify-data-integrity --no-bail
219219

220220
- name: Print Docker Compose logs
221221
if: always()

.github/workflows/e2e-api-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ jobs:
156156
run: pnpm test ${{ matrix.freestyle-mode == 'prod' && '--min-workers=1 --max-workers=1' || '' }}
157157

158158
- name: Verify data integrity
159-
run: pnpm run verify-data-integrity
159+
run: pnpm run verify-data-integrity --no-bail
160160

161161
- name: Print Docker Compose logs
162162
if: always()

.github/workflows/e2e-custom-base-port-api-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ jobs:
150150
run: pnpm test
151151

152152
- name: Verify data integrity
153-
run: pnpm run verify-data-integrity
153+
run: pnpm run verify-data-integrity --no-bail
154154

155155
- name: Print Docker Compose logs
156156
if: always()

.github/workflows/e2e-source-of-truth-api-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ jobs:
156156
run: pnpm test
157157

158158
- name: Verify data integrity
159-
run: pnpm run verify-data-integrity
159+
run: pnpm run verify-data-integrity --no-bail
160160

161161
- name: Print Docker Compose logs
162162
if: always()

.github/workflows/restart-dev-and-test-with-custom-base-port.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616

1717
jobs:
1818
restart-dev-and-test-with-custom-base-port:
19-
runs-on: ubicloud-standard-8
19+
runs-on: ubicloud-standard-16
2020
env:
2121
NEXT_PUBLIC_STACK_PORT_PREFIX: "69"
2222

.github/workflows/restart-dev-and-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616

1717
jobs:
1818
restart-dev-and-test:
19-
runs-on: ubicloud-standard-8
19+
runs-on: ubicloud-standard-16
2020

2121
steps:
2222
- uses: actions/checkout@v6

.github/workflows/setup-tests-with-custom-base-port.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616

1717
jobs:
1818
setup-tests-with-custom-base-port:
19-
runs-on: ubicloud-standard-8
19+
runs-on: ubicloud-standard-16
2020
env:
2121
NEXT_PUBLIC_STACK_PORT_PREFIX: "69"
2222

.github/workflows/setup-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616

1717
jobs:
1818
setup-tests:
19-
runs-on: ubicloud-standard-8
19+
runs-on: ubicloud-standard-16
2020
steps:
2121
- uses: actions/checkout@v6
2222

apps/backend/.env

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,16 @@ STACK_QSTASH_TOKEN=
8181
STACK_QSTASH_CURRENT_SIGNING_KEY=
8282
STACK_QSTASH_NEXT_SIGNING_KEY=
8383

84+
# Email monitor
85+
STACK_EMAIL_MONITOR_RESEND_EMAIL_API_KEY=# enter the resend poller api key here
86+
STACK_EMAIL_MONITOR_RESEND_EMAIL_DOMAIN=# enter the resend domain that should receive the emails
87+
STACK_EMAIL_MONITOR_PROJECT_ID=# enter the project id for the project that the email monitor will attempt to sign up for
88+
STACK_EMAIL_MONITOR_PUBLISHABLE_CLIENT_KEY=# enter the publishable client key for email monitor to use when attempting a sign up
89+
STACK_EMAIL_MONITOR_VERIFICATION_CALLBACK_URL=# enter a valid verification callback url for the project that the email monitor will attempt to sign up for
90+
STACK_EMAIL_MONITOR_INBUCKET_API_URL=# enter a valid inbucket api url for the email monitor to check emails from in test mode
91+
STACK_EMAIL_MONITOR_USE_INBUCKET=# enter true/false based on whether the email monitor should use inbucket or resend. Note that if this is set to true in prod, the email monitor will throw an error.
92+
STACK_EMAIL_MONITOR_SECRET_TOKEN=# enter the secret token value needed for the request to the email monitor to be accepted
93+
8494
# Clickhouse
8595
STACK_CLICKHOUSE_URL=# URL of the Clickhouse instance
8696
STACK_CLICKHOUSE_ADMIN_USER=# username of the admin account

apps/backend/.env.development

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ NEXT_PUBLIC_STACK_API_URL=http://localhost:${NEXT_PUBLIC_STACK_PORT_PREFIX:-81}0
22
NEXT_PUBLIC_STACK_DASHBOARD_URL=http://localhost:${NEXT_PUBLIC_STACK_PORT_PREFIX:-81}01
33
STACK_SERVER_SECRET=23-wuNpik0gIW4mruTz25rbIvhuuvZFrLOLtL7J4tyo
44

5+
STACK_CHANGELOG_URL=https://raw.githubusercontent.com/stack-auth/stack-auth/refs/heads/dev/CHANGELOG.md
6+
57
STACK_SEED_ENABLE_DUMMY_PROJECT=true
68
STACK_SEED_INTERNAL_PROJECT_SIGN_UP_ENABLED=true
79
STACK_SEED_INTERNAL_PROJECT_OTP_ENABLED=true
@@ -55,6 +57,16 @@ STACK_OPENAI_API_KEY=mock_openai_api_key
5557
STACK_STRIPE_SECRET_KEY=sk_test_mockstripekey
5658
STACK_STRIPE_WEBHOOK_SECRET=mock_stripe_webhook_secret
5759

60+
# Email monitor configuration for tests
61+
STACK_EMAIL_MONITOR_VERIFICATION_CALLBACK_URL=http://localhost:8101/handler/email-verification
62+
STACK_EMAIL_MONITOR_PROJECT_ID=internal
63+
STACK_EMAIL_MONITOR_PUBLISHABLE_CLIENT_KEY=this-publishable-client-key-is-for-local-development-only
64+
STACK_EMAIL_MONITOR_RESEND_EMAIL_DOMAIN=stack-generated.example.com
65+
STACK_EMAIL_MONITOR_RESEND_EMAIL_API_KEY=this-is-a-fake-key
66+
STACK_EMAIL_MONITOR_INBUCKET_API_URL=http://localhost:${NEXT_PUBLIC_STACK_PORT_PREFIX:-81}05
67+
STACK_EMAIL_MONITOR_USE_INBUCKET=true
68+
STACK_EMAIL_MONITOR_SECRET_TOKEN=this-secret-token-is-for-local-development-only
69+
5870
# S3 Configuration for local development using s3mock
5971
STACK_S3_ENDPOINT=http://localhost:${NEXT_PUBLIC_STACK_PORT_PREFIX:-81}21
6072
STACK_S3_REGION=us-east-1

0 commit comments

Comments
 (0)