Merge branch 'develop' into dependabot/npm_and_yarn/examples/nextjs/multi-516376c24b

Author: snacker81

.github/workflows/deploy-playgrounds.yml

@@ -20,6 +20,8 @@ jobs:
 
       - name: Set up Node.js
         uses: actions/setup-node@v4
+        with:
+          node-version: 24
 
       - name: Cache node modules
         id: cache-npm
@@ -41,7 +43,7 @@ jobs:
         run: |
           npm i
           npm install lerna
-          npm install vercel@33.2.0
+          npm install vercel@50.26.1
           npm list
 
       - name: Check ESLint Errors
@@ -63,7 +65,7 @@ jobs:
       - name: Deploy react playground to Vercel
         run: |
           npx vercel link --yes --project react-playground --scope corbado -t $VERCEL_TOKEN
-          npx vercel pull -t $VERCEL_TOKEN
+          npx vercel pull --environment=preview -t $VERCEL_TOKEN
           npx vercel build -t $VERCEL_TOKEN
           url="$(npx vercel deploy --prebuilt -t ${{ secrets.VERCEL_TOKEN }})"
           npx vercel alias -S corbado -t ${{ secrets.VERCEL_TOKEN }} "$url" $BRANCH_NAME.react.playground.corbado.io

.github/workflows/test-all.yml

@@ -1,6 +1,4 @@
 name: Test on React
-env:
-  BRANCH_NAME_RAW: ${{ github.head_ref || github.ref_name }}
 
 on:
   pull_request:
@@ -12,6 +10,7 @@ jobs:
   test:
     timeout-minutes: 60
     runs-on: ubuntu-24.04
+    environment: ${{ matrix.testType }}
     strategy:
       fail-fast: false
       matrix:
@@ -20,44 +19,42 @@ jobs:
             configFile: playwright.config.complete.ts
           - testType: connect
             configFile: playwright.config.connect.ts
-    env:
-      PLAYWRIGHT_NUM_CORES:       4
-      PLAYWRIGHT_TEST_URL:        ${{ secrets.PLAYWRIGHT_TEST_URL }}
 
-      PLAYWRIGHT_JWT_TOKEN:       ${{ secrets.PLAYWRIGHT_JWT_TOKEN }}
-      PLAYWRIGHT_GOOGLE_EMAIL:    ${{ secrets.PLAYWRIGHT_GOOGLE_EMAIL }}
-      PLAYWRIGHT_GOOGLE_PASSWORD: ${{ secrets.PLAYWRIGHT_GOOGLE_PASSWORD }}
+    env:
+      # ── Shared (hardcoded) ──
+      PLAYWRIGHT_NUM_CORES: 4
+      DEFAULT_CORBADO_BACKEND_API_BASIC_AUTH: ${{ secrets.DEFAULT_CORBADO_BACKEND_API_BASIC_AUTH }}
+
+      # ── "complete" environment secrets (empty on connect runners) ──
+      PLAYWRIGHT_JWT_TOKEN:          ${{ secrets.PLAYWRIGHT_JWT_TOKEN }}
+      PLAYWRIGHT_GOOGLE_EMAIL:       ${{ secrets.PLAYWRIGHT_GOOGLE_EMAIL }}
+      PLAYWRIGHT_GOOGLE_PASSWORD:    ${{ secrets.PLAYWRIGHT_GOOGLE_PASSWORD }}
       PLAYWRIGHT_GOOGLE_TOTP_SECRET: ${{ secrets.PLAYWRIGHT_GOOGLE_TOTP_SECRET }}
 
-      NEXT_PUBLIC_CORBADO_PROJECT_ID: ${{ secrets.NEXT_PUBLIC_CORBADO_PROJECT_ID }}
-      NEXT_PUBLIC_CORBADO_FRONTEND_API_URL_SUFFIX: ${{ secrets.NEXT_PUBLIC_CORBADO_FRONTEND_API_URL_SUFFIX }}
-      CORBADO_BACKEND_API_URL: ${{ secrets.CORBADO_BACKEND_API_URL }}
-      CORBADO_BACKEND_API_BASIC_AUTH:     ${{ secrets.CORBADO_BACKEND_API_BASIC_AUTH }}
-      PLAYWRIGHT_CONNECT_PROJECT_ID: ${{ secrets.PLAYWRIGHT_CONNECT_PROJECT_ID }}
-      PLAYWRIGHT_NGROK_AUTH_TOKEN:   ${{ secrets.PLAYWRIGHT_NGROK_AUTH_TOKEN }}
-      AWS_COGNITO_USER_POOL_ID:   ${{ secrets.AWS_COGNITO_USER_POOL_ID }}
-      NEXT_PUBLIC_AWS_COGNITO_USER_POOL_ID: ${{ secrets.AWS_COGNITO_USER_POOL_ID }}
-      AWS_COGNITO_CLIENT_ID:   ${{ secrets.AWS_COGNITO_CLIENT_ID }}
-      NEXT_PUBLIC_AWS_COGNITO_CLIENT_ID:   ${{ vars.NEXT_PUBLIC_AWS_COGNITO_CLIENT_ID }}
-      AWS_COGNITO_CLIENT_SECRET:   ${{ secrets.AWS_COGNITO_CLIENT_SECRET }}
-      AWS_REGION:   ${{ secrets.AWS_REGION }}
-      AWS_ACCESS_KEY_ID:   ${{ secrets.AWS_ACCESS_KEY_ID_CONNECT_PLAYGROUND }}
-      AWS_SECRET_ACCESS_KEY:   ${{ secrets.AWS_SECRET_ACCESS_KEY_CONNECT_PLAYGROUND }}
-
-      GITHUB_RUN_ID:              ${{ github.run_id }}
-      SLACK_BOT_USER_OAUTH_TOKEN: ${{ secrets.SLACK_BOT_USER_OAUTH_TOKEN }}
-      GITHUB_BRANCH_NAME:         ${{ github.ref_name }}
+      # ── "connect" environment secrets (empty on complete runners) ──
+      NEXT_PUBLIC_AWS_COGNITO_USER_POOL_ID:        ${{ secrets.AWS_COGNITO_USER_POOL_ID }}
+      NEXT_PUBLIC_AWS_COGNITO_CLIENT_ID:           ${{ vars.NEXT_PUBLIC_AWS_COGNITO_CLIENT_ID }}
+      CORBADO_BACKEND_API_BASIC_AUTH:              ${{ secrets.DEFAULT_CORBADO_BACKEND_API_BASIC_AUTH }}
+      PLAYWRIGHT_NGROK_AUTH_TOKEN:                 ${{ secrets.PLAYWRIGHT_NGROK_AUTH_TOKEN }}
+      AWS_COGNITO_USER_POOL_ID:                    ${{ secrets.AWS_COGNITO_USER_POOL_ID }}
+      AWS_COGNITO_CLIENT_ID:                       ${{ secrets.AWS_COGNITO_CLIENT_ID }}
+      AWS_COGNITO_CLIENT_SECRET:                   ${{ secrets.AWS_COGNITO_CLIENT_SECRET }}
+      AWS_REGION:                                  ${{ secrets.AWS_REGION }}
+      AWS_ACCESS_KEY_ID:                           ${{ secrets.COGNITO_AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY:                       ${{ secrets.COGNITO_AWS_SECRET_ACCESS_KEY }}
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
       - name: Set up Node.js
         uses: actions/setup-node@v4
+        with:
+          node-version: 24
 
       - name: Cache node modules
         id: cache-npm
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:
@@ -75,7 +72,6 @@ jobs:
         run: |
           npm i
           npm install lerna
-          npm install vercel@33.2.0
           npm list
 
       - name: Build SDKs
@@ -85,23 +81,22 @@ jobs:
 
       - name: Get installed Playwright version
         id: playwright-version
-        run: echo "::set-output name=version::$(yarn why --json @playwright/test | grep -h 'workspace:.' | jq --raw-output '.children[].locator' | sed -e 's/@playwright\/test@.*://')"
+        run: echo "version=$(yarn why --json @playwright/test | grep -h 'workspace:.' | jq --raw-output '.children[].locator' | sed -e 's/@playwright\/test@.*://')" >> "$GITHUB_OUTPUT"
 
       - if: ${{ steps.cache-npm.outputs.cache-hit != 'true' }}
         name: List the state of node modules
         continue-on-error: true
-        run: |
-          cd packages/tests-e2e
-          npm list
+        working-directory: packages/tests-e2e
+        run: npm list
 
       - name: Install dependencies
+        working-directory: packages/tests-e2e
         run: |
-          cd packages/tests-e2e
           npm install
           sudo apt-get update
           sudo apt-get install -y libxml2-utils
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         id: playwright-cache
         with:
           path: '~/.cache/ms-playwright'
@@ -111,26 +106,24 @@ jobs:
 
       - name: Install Playwright's dependencies
         if: steps.playwright-cache.outputs.cache-hit != 'true'
-        run: |
-          cd packages/tests-e2e
-          npx playwright install --with-deps
+        working-directory: packages/tests-e2e
+        run: npx playwright install --with-deps
 
-      - name: Create a log stream on AWS CloudWatch
+      - name: Create CloudWatch log stream
         env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_ACCESS_KEY_ID: ${{ vars.CLOUDWATCH_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.CLOUDWATCH_AWS_SECRET_ACCESS_KEY }}
           AWS_REGION: ${{ secrets.AWS_REGION }}
         run: |
           TIMESTAMP=$(date +%s000)
-          RANDOM_SUFFIX=$(head /dev/urandom | tr -dc a-z0-9 | head -c 6)
+          RANDOM_SUFFIX=$(head /dev/urandom | tr -dc 'a-z0-9' | head -c 6)
           LOG_STREAM_NAME="javascript-${TIMESTAMP}-${RANDOM_SUFFIX}"
-          echo "LOG_STREAM_NAME=$LOG_STREAM_NAME" >> $GITHUB_ENV
+          echo "LOG_STREAM_NAME=$LOG_STREAM_NAME" >> "$GITHUB_ENV"
           aws logs create-log-stream --log-group-name "test-results-board" --log-stream-name "$LOG_STREAM_NAME"
 
       - name: Run ${{ matrix.testType }} tests for react
         working-directory: packages/tests-e2e
-        run: |
-          npx playwright test --config=${{ matrix.configFile }}
+        run: npx playwright test --config=${{ matrix.configFile }}
 
       - uses: actions/upload-artifact@v4
         if: always()
@@ -139,21 +132,14 @@ jobs:
           path: packages/tests-e2e/playwright-report/
           retention-days: 30
 
-      - name: Send logs to AWS CloudWatch
+      - name: Send results to CloudWatch
         if: always()
         env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_ACCESS_KEY_ID: ${{ vars.CLOUDWATCH_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.CLOUDWATCH_AWS_SECRET_ACCESS_KEY }}
           AWS_REGION: ${{ secrets.AWS_REGION }}
         run: |
-          cd packages/tests-e2e
-          TESTS=$(xmllint --xpath 'string(/testsuites/@tests)' test-results/results.xml)
-          FAILURES=$(xmllint --xpath 'string(/testsuites/@failures)' test-results/results.xml)
-          SKIPPED=$(xmllint --xpath 'string(/testsuites/@skipped)' test-results/results.xml)
-          ERRORS=$(xmllint --xpath 'string(/testsuites/@errors)' test-results/results.xml)
-          TIME=$(xmllint --xpath 'string(/testsuites/@time)' test-results/results.xml)
-          PASSED=$((TESTS - FAILURES - ERRORS - SKIPPED))
-          FAILED=$((FAILURES + ERRORS))
-          TIMESTAMP=$(date +%s000)
-          LOG_EVENT_JSON="[{\"timestamp\":$TIMESTAMP,\"message\":\"{\\\"application\\\":\\\"${{ matrix.testType }}\\\",\\\"platform\\\":\\\"react\\\",\\\"run_type\\\":\\\"commitly\\\",\\\"execution_time\\\":$TIME,\\\"passed\\\":$PASSED,\\\"failed\\\":$FAILED,\\\"link\\\":\\\"https://github.com/corbado/javascript/actions/runs/${GITHUB_RUN_ID}\\\"}\"}]"
-          aws logs put-log-events --log-group-name "test-results-board" --log-stream-name "$LOG_STREAM_NAME" --log-events "$LOG_EVENT_JSON"
+          bash scripts/cloudwatch-log.sh \
+            "${{ matrix.testType }}" \
+            "react" \
+            "commitly"

.github/workflows/test.yml

@@ -30,3 +30,4 @@ packages/tests-e2e/.env.connect.local
 
 # scripts
 scripts/*.sh
+!scripts/cloudwatch-log.sh

.gitignore

@@ -6,6 +6,7 @@ dist
 .yalc
 .github
 .vercel
+.next
 
 docs