Merge pull request #1777 from nhost/changeset-release/main

chore: update versions

.github/actions/install-dependencies/action.yaml

@@ -23,9 +23,7 @@ runs:
     - uses: actions/cache@v3
       id: pnpm-cache
       with:
-        path: |
-          ${{ steps.pnpm-cache-dir.outputs.dir }}
-          ~/.cache/Cypress
+        path: ${{ steps.pnpm-cache-dir.outputs.dir }}
         key: ${{ runner.os }}-node-${{ hashFiles('pnpm-lock.yaml') }}
         restore-keys: ${{ runner.os }}-node-
     - name: Use Node.js 16

.github/workflows/ci.yaml

@@ -19,6 +19,11 @@ env:
   NEXT_PUBLIC_ENV: dev
   NEXT_TELEMETRY_DISABLED: 1
   NEXT_PUBLIC_NHOST_BACKEND_URL: http://localhost:1337
+  NHOST_TEST_DASHBOARD_URL: ${{ vars.NHOST_TEST_DASHBOARD_URL }}
+  NHOST_TEST_WORKSPACE_NAME: ${{ vars.NHOST_TEST_WORKSPACE_NAME }}
+  NHOST_TEST_PROJECT_NAME: ${{ vars.NHOST_TEST_PROJECT_NAME }}
+  NHOST_TEST_USER_EMAIL: ${{ secrets.NHOST_TEST_USER_EMAIL }}
+  NHOST_TEST_USER_PASSWORD: ${{ secrets.NHOST_TEST_USER_PASSWORD }}
 
 jobs:
   build:
@@ -60,47 +65,6 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
 
-  e2e:
-    name: 'e2e (${{ matrix.package.path }})'
-    needs: build
-    if: ${{ needs.build.outputs.matrix != '[]' && needs.build.outputs.matrix != '' }}
-    strategy:
-      # * Don't cancel other matrices when one fails
-      fail-fast: false
-      matrix:
-        package: ${{ fromJson(needs.build.outputs.matrix) }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      # * Install Node and dependencies. Package dependencies won't be downloaded again as they have been cached by the `build` job.
-      - name: Install Node and dependencies
-        uses: ./.github/actions/install-dependencies
-        with:
-          TURBO_TOKEN: ${{ env.TURBO_TOKEN }}
-          TURBO_TEAM: ${{ env.TURBO_TEAM }}
-      # * Install Nhost CLI if a `nhost/config.yaml` file is found
-      - name: Install Nhost CLI
-        if: hashFiles(format('{0}/nhost/config.yaml', matrix.package.path)) != ''
-        uses: ./.github/actions/nhost-cli
-      # * Run the `ci` script of the current package of the matrix. Dependencies build is cached by Turborepo
-      - name: Run e2e test
-        run: pnpm --filter="${{ matrix.package.name }}" run e2e
-      - id: file-name
-        if: ${{ failure() }}
-        name: Tranform package name into a valid file name
-        run: |
-          PACKAGE_FILE_NAME=$(echo "${{ matrix.package.name }}" | sed 's/@//g; s/\//-/g')
-          echo "fileName=$PACKAGE_FILE_NAME"  >> $GITHUB_OUTPUT
-      # * Run this step only if the previous step failed, and some Cypress screenshots/videos exist
-      - name: Upload Cypress videos and screenshots
-        if: ${{ failure() && hashFiles(format('{0}/cypress/screenshots/**', matrix.package.path), format('{0}/cypress/videos/**', matrix.package.path)) != ''}}
-        uses: actions/upload-artifact@v3
-        with:
-          name: cypress-${{ steps.file-name.outputs.fileName }}
-          path: |
-            ${{format('{0}/cypress/screenshots/**', matrix.package.path)}}
-            ${{format('{0}/cypress/videos/**', matrix.package.path)}}
-
   unit:
     name: Unit tests
     needs: build
@@ -141,3 +105,57 @@ jobs:
       # * Run every `lint` script in the workspace . Dependencies build is cached by Turborepo
       - name: Lint
         run: pnpm run lint:all
+
+  e2e:
+    name: 'E2E (Package: ${{ matrix.package.path }})'
+    needs: build
+    if: ${{ needs.build.outputs.matrix != '[]' && needs.build.outputs.matrix != '' }}
+    strategy:
+      # * Don't cancel other matrices when one fails
+      fail-fast: false
+      matrix:
+        package: ${{ fromJson(needs.build.outputs.matrix) }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      # * Install Node and dependencies. Package dependencies won't be downloaded again as they have been cached by the `build` job.
+      - name: Install Node and dependencies
+        uses: ./.github/actions/install-dependencies
+        with:
+          TURBO_TOKEN: ${{ env.TURBO_TOKEN }}
+          TURBO_TEAM: ${{ env.TURBO_TEAM }}
+      # * Install Nhost CLI if a `nhost/config.yaml` file is found
+      - name: Install Nhost CLI
+        if: hashFiles(format('{0}/nhost/config.yaml', matrix.package.path)) != ''
+        uses: ./.github/actions/nhost-cli
+      - name: Fetch Dashboard Preview URL
+        id: fetch-dashboard-preview-url
+        uses: zentered/vercel-preview-url@v1.1.9
+        if: github.ref_name != 'main'
+        env:
+          VERCEL_TOKEN: ${{ secrets.DASHBOARD_VERCEL_DEPLOY_TOKEN }}
+          GITHUB_REF: ${{ github.ref_name }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+        with:
+          vercel_team_id: ${{ secrets.DASHBOARD_VERCEL_TEAM_ID }}
+          vercel_project_id: ${{ secrets.DASHBOARD_STAGING_VERCEL_PROJECT_ID }}
+          vercel_state: BUILDING,READY,INITIALIZING
+      - name: Set Dashboard Preview URL
+        if: steps.fetch-dashboard-preview-url.outputs.preview_url != ''
+        run: echo "NHOST_TEST_DASHBOARD_URL=https://${{ steps.fetch-dashboard-preview-url.outputs.preview_url }}" >> $GITHUB_ENV
+      # * Run the `ci` script of the current package of the matrix. Dependencies build is cached by Turborepo
+      - name: Run e2e tests
+        run: pnpm --filter="${{ matrix.package.name }}" run e2e
+      - id: file-name
+        if: ${{ failure() }}
+        name: Transform package name into a valid file name
+        run: |
+          PACKAGE_FILE_NAME=$(echo "${{ matrix.package.name }}" | sed 's/@//g; s/\//-/g')
+          echo "fileName=$PACKAGE_FILE_NAME"  >> $GITHUB_OUTPUT
+      # * Run this step only if the previous step failed, and Playwright generated a report
+      - name: Upload Playwright Report
+        if: ${{ failure() && hashFiles(format('{0}/playwright-report/**', matrix.package.path)) != ''}}
+        uses: actions/upload-artifact@v3
+        with:
+          name: playwright-${{ steps.file-name.outputs.fileName }}
+          path: ${{format('{0}/playwright-report/**', matrix.package.path)}}

.github/workflows/dashboard.yaml

@@ -9,6 +9,7 @@ env:
   NEXT_PUBLIC_ENV: dev
   NEXT_TELEMETRY_DISABLED: 1
   NEXT_PUBLIC_NHOST_BACKEND_URL: http://localhost:1337
+
 jobs:
   build:
     name: Build

config/.eslint.base.js

@@ -23,8 +23,8 @@ module.exports = {
     'e2e/**/*.ts',
     'e2e/**/*.d.ts'
   ],
-  plugins: ['@typescript-eslint', 'cypress'],
-  extends: ['plugin:cypress/recommended'],
+  plugins: ['@typescript-eslint'],
+  extends: [],
   parserOptions: {
     ecmaVersion: 2020,
     sourceType: 'module'

dashboard/.gitignore

@@ -49,4 +49,8 @@ tailwind.json
 .idea
 
 # Do not ignore Logs page
-!src/**/logs*
+!src/**/logs*
+/test-results/
+/playwright-report/
+/playwright/.cache/
+storageState.json

dashboard/.storybook/preview.js

@@ -51,7 +51,7 @@ export const decorators = [
   (Story) => (
     <NhostApolloProvider
       fetchPolicy="cache-first"
-      graphqlUrl="http://localhost:1337/v1/graphql"
+      graphqlUrl="https://local.graphql.nhost.run/v1"
     >
       <Story />
     </NhostApolloProvider>

dashboard/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @nhost/dashboard
 
+## 0.13.10
+
+### Patch Changes
+
+- e93b06ab: fix(dashboard): remove left margin from workspace list on mobile
+- 1c4806bf: chore(deps): bump `sharp` to 0.32.0
+  - @nhost/react-apollo@5.0.14
+  - @nhost/nextjs@1.13.18
+
+## 0.13.9
+
+### Patch Changes
+
+- 912ed76c: chore(dashboard): bump `@apollo/client` to 3.7.10
+- Updated dependencies [912ed76c]
+  - @nhost/react-apollo@5.0.13
+
+## 0.13.8
+
+### Patch Changes
+
+- 7c127372: chore(dashboard): bump `react-error-boundary` to v4
+
+## 0.13.7
+
+### Patch Changes
+
+- 9130ab12: chore(dashboard): bump `yup` to v1 and `@hookform/resolvers` to v3
+
 ## 0.13.6
 
 ### Patch Changes

dashboard/README.md

@@ -111,3 +111,21 @@ pnpm storybook
 | `@typescript-eslint/consistent-type-imports` | Enforces `import type { Type } from 'module'` syntax. It prevents false positive circular dependency errors.                                                 |
 | `@typescript-eslint/naming-convention`       | Enforces a consistent naming convention.                                                                                                                     |
 | `no-restricted-imports`                      | Enforces absolute imports and consistent import paths for components from `src/components/ui` folder.                                                        |
+
+### End-to-End Tests
+
+End-to-end tests are written using [Playwright](https://playwright.dev/). To run the tests, run the following command:
+
+```bash
+pnpm e2e
+```
+
+Most of the tests require access to the Nhost test user. To run these tests, you need to set the following environment variables in `.env.test`:
+
+```
+NHOST_TEST_DASHBOARD_URL=<test_dashboard_url>
+NHOST_TEST_USER_EMAIL=<test_user_email>
+NHOST_TEST_USER_PASSWORD=<test_user_password>
+NHOST_TEST_WORKSPACE_NAME=<test_workspace_name>
+NHOST_TEST_PROJECT_NAME=<test_project_name>
+```

dashboard/e2e/auth/user-management.test.ts

@@ -0,0 +1,93 @@
+import {
+  TEST_PROJECT_NAME,
+  TEST_PROJECT_SLUG,
+  TEST_WORKSPACE_SLUG,
+} from '@/e2e/env';
+import { openProject } from '@/e2e/utils';
+import type { Page } from '@playwright/test';
+import { expect, test } from '@playwright/test';
+
+let page: Page;
+
+test.describe.configure({ mode: 'serial' });
+
+test.beforeAll(async ({ browser }) => {
+  page = await browser.newPage();
+
+  await page.goto('/');
+
+  await openProject({
+    page,
+    projectName: TEST_PROJECT_NAME,
+    workspaceSlug: TEST_WORKSPACE_SLUG,
+    projectSlug: TEST_PROJECT_SLUG,
+  });
+
+  await page
+    .getByRole('navigation', { name: /main navigation/i })
+    .getByRole('link', { name: /auth/i })
+    .click();
+
+  await page.waitForURL(`/${TEST_WORKSPACE_SLUG}/${TEST_PROJECT_SLUG}/users`);
+});
+
+test.afterAll(async () => {
+  await page.close();
+});
+
+test('should create a user', async () => {
+  await expect(
+    page.getByRole('heading', { name: /there are no users yet/i }),
+  ).toBeVisible();
+
+  await page
+    .getByRole('button', { name: /create user/i })
+    .first()
+    .click();
+
+  await expect(page.getByRole('dialog')).toBeVisible();
+  await expect(
+    page.getByRole('heading', { name: /create user/i }),
+  ).toBeVisible();
+
+  await page
+    .getByRole('textbox', { name: /email/i })
+    .fill('testuser@example.com');
+  await page.getByRole('textbox', { name: /password/i }).fill('test.password');
+  await page.getByRole('button', { name: /create/i, exact: true }).click();
+
+  await expect(page.getByRole('dialog')).not.toBeVisible();
+
+  await expect(
+    page.getByRole('button', { name: /view testuser@example.com/i }),
+  ).toBeVisible();
+});
+
+test('should delete a user', async () => {
+  await expect(
+    page.getByRole('button', { name: /view testuser@example.com/i }),
+  ).toBeVisible();
+
+  await page
+    .getByRole('button', { name: /more options for testuser@example.com/i })
+    .click();
+  await page.getByRole('menuitem', { name: /delete user/i }).click();
+
+  await expect(page.getByRole('dialog')).toBeVisible();
+  await expect(
+    page.getByRole('heading', { name: /delete user/i }),
+  ).toBeVisible();
+  await expect(
+    page.getByText(
+      /are you sure you want to delete the "testuser@example.com" user?/i,
+    ),
+  ).toBeVisible();
+
+  await page.getByRole('button', { name: /delete/i, exact: true }).click();
+
+  await expect(page.getByRole('dialog')).not.toBeVisible();
+
+  await expect(
+    page.getByRole('heading', { name: /there are no users yet/i }),
+  ).toBeVisible();
+});

dashboard/e2e/database/create-table.test.ts

@@ -0,0 +1,276 @@
+import {
+  TEST_PROJECT_NAME,
+  TEST_PROJECT_SLUG,
+  TEST_WORKSPACE_SLUG,
+} from '@/e2e/env';
+import { openProject, prepareTable } from '@/e2e/utils';
+import { faker } from '@faker-js/faker';
+import type { Page } from '@playwright/test';
+import { expect, test } from '@playwright/test';
+
+let page: Page;
+
+test.beforeAll(async ({ browser }) => {
+  page = await browser.newPage();
+  await page.goto('/');
+
+  await openProject({
+    page,
+    projectName: TEST_PROJECT_NAME,
+    workspaceSlug: TEST_WORKSPACE_SLUG,
+    projectSlug: TEST_PROJECT_SLUG,
+  });
+
+  await page
+    .getByRole('navigation', { name: /main navigation/i })
+    .getByRole('link', { name: /database/i })
+    .click();
+});
+
+test.afterAll(async () => {
+  await page.close();
+});
+
+test('should create a simple table', async () => {
+  await page.getByRole('button', { name: /new table/i }).click();
+  await expect(page.getByText(/create a new table/i)).toBeVisible();
+
+  const tableName = faker.random.word().toLowerCase();
+
+  await prepareTable({
+    page,
+    name: tableName,
+    primaryKey: 'id',
+    columns: [
+      { name: 'id', type: 'uuid', defaultValue: 'gen_random_uuid()' },
+      { name: 'title', type: 'text' },
+    ],
+  });
+
+  // create table
+  await page.getByRole('button', { name: /create/i }).click();
+
+  await page.waitForURL(
+    `/${TEST_WORKSPACE_SLUG}/${TEST_PROJECT_SLUG}/database/browser/default/public/${tableName}`,
+  );
+
+  await expect(
+    page.getByRole('link', { name: tableName, exact: true }),
+  ).toBeVisible();
+});
+
+test('should create a table with unique constraints', async () => {
+  await page.getByRole('button', { name: /new table/i }).click();
+  await expect(page.getByText(/create a new table/i)).toBeVisible();
+
+  const tableName = faker.random.word().toLowerCase();
+
+  await prepareTable({
+    page,
+    name: tableName,
+    primaryKey: 'id',
+    columns: [
+      { name: 'id', type: 'uuid', defaultValue: 'gen_random_uuid()' },
+      { name: 'title', type: 'text', unique: true },
+      { name: 'isbn', type: 'text', unique: true },
+    ],
+  });
+
+  // create table
+  await page.getByRole('button', { name: /create/i }).click();
+
+  await page.waitForURL(
+    `/${TEST_WORKSPACE_SLUG}/${TEST_PROJECT_SLUG}/database/browser/default/public/${tableName}`,
+  );
+
+  await expect(
+    page.getByRole('link', { name: tableName, exact: true }),
+  ).toBeVisible();
+});
+
+test('should create a table with nullable columns', async () => {
+  await page.getByRole('button', { name: /new table/i }).click();
+  await expect(page.getByText(/create a new table/i)).toBeVisible();
+
+  const tableName = faker.random.word().toLowerCase();
+
+  await prepareTable({
+    page,
+    name: tableName,
+    primaryKey: 'id',
+    columns: [
+      { name: 'id', type: 'uuid', defaultValue: 'gen_random_uuid()' },
+      { name: 'title', type: 'text', nullable: true },
+      { name: 'description', type: 'text', nullable: true },
+    ],
+  });
+
+  // create table
+  await page.getByRole('button', { name: /create/i }).click();
+
+  await page.waitForURL(
+    `/${TEST_WORKSPACE_SLUG}/${TEST_PROJECT_SLUG}/database/browser/default/public/${tableName}`,
+  );
+
+  await expect(
+    page.getByRole('link', { name: tableName, exact: true }),
+  ).toBeVisible();
+});
+
+test('should create a table with an identity column', async () => {
+  await page.getByRole('button', { name: /new table/i }).click();
+  await expect(page.getByText(/create a new table/i)).toBeVisible();
+
+  const tableName = faker.random.word().toLowerCase();
+
+  await prepareTable({
+    page,
+    name: tableName,
+    primaryKey: 'id',
+    columns: [
+      { name: 'id', type: 'int4' },
+      { name: 'title', type: 'text', nullable: true },
+      { name: 'description', type: 'text', nullable: true },
+    ],
+  });
+
+  await page.getByRole('button', { name: /identity/i }).click();
+  await page.getByRole('option', { name: /id/i }).click();
+
+  // create table
+  await page.getByRole('button', { name: /create/i }).click();
+
+  await page.waitForURL(
+    `/${TEST_WORKSPACE_SLUG}/${TEST_PROJECT_SLUG}/database/browser/default/public/${tableName}`,
+  );
+
+  await expect(
+    page.getByRole('link', { name: tableName, exact: true }),
+  ).toBeVisible();
+});
+
+test('should create table with foreign key constraint', async () => {
+  await page.getByRole('button', { name: /new table/i }).click();
+  await expect(page.getByText(/create a new table/i)).toBeVisible();
+
+  const firstTableName = faker.random.word().toLowerCase();
+
+  await prepareTable({
+    page,
+    name: firstTableName,
+    primaryKey: 'id',
+    columns: [
+      { name: 'id', type: 'uuid', defaultValue: 'gen_random_uuid()' },
+      { name: 'name', type: 'text' },
+    ],
+  });
+
+  // create table
+  await page.getByRole('button', { name: /create/i }).click();
+
+  await page.waitForURL(
+    `/${TEST_WORKSPACE_SLUG}/${TEST_PROJECT_SLUG}/database/browser/default/public/${firstTableName}`,
+  );
+
+  await page.getByRole('button', { name: /new table/i }).click();
+  await expect(page.getByText(/create a new table/i)).toBeVisible();
+
+  const secondTableName = faker.random.word().toLowerCase();
+
+  await prepareTable({
+    page,
+    name: secondTableName,
+    primaryKey: 'id',
+    columns: [
+      { name: 'id', type: 'uuid', defaultValue: 'gen_random_uuid()' },
+      { name: 'title', type: 'text' },
+      { name: 'author_id', type: 'uuid' },
+    ],
+  });
+
+  await page.getByRole('button', { name: /add foreign key/i }).click();
+
+  // select column in current table
+  await page
+    .getByRole('button', { name: /column/i })
+    .first()
+    .click();
+  await page.getByRole('option', { name: /author_id/i }).click();
+
+  // select reference schema
+  await page.getByRole('button', { name: /schema/i }).click();
+  await page.getByRole('option', { name: /public/i }).click();
+
+  // select reference table
+  await page.getByRole('button', { name: /table/i }).click();
+  await page.getByRole('option', { name: firstTableName, exact: true }).click();
+
+  // select reference column
+  await page
+    .getByRole('button', { name: /column/i })
+    .nth(1)
+    .click();
+  await page.getByRole('option', { name: /id/i }).click();
+
+  await page.getByRole('button', { name: /add/i }).click();
+
+  await expect(
+    page.getByText(`public.${firstTableName}.id`, { exact: true }),
+  ).toBeVisible();
+
+  // create table
+  await page.getByRole('button', { name: /create/i }).click();
+
+  await page.waitForURL(
+    `/${TEST_WORKSPACE_SLUG}/${TEST_PROJECT_SLUG}/database/browser/default/public/${secondTableName}`,
+  );
+
+  await expect(
+    page.getByRole('link', { name: secondTableName, exact: true }),
+  ).toBeVisible();
+});
+
+test('should not be able to create a table with a name that already exists', async () => {
+  await page.getByRole('button', { name: /new table/i }).click();
+  await expect(page.getByText(/create a new table/i)).toBeVisible();
+
+  const tableName = faker.random.word().toLowerCase();
+
+  await prepareTable({
+    page,
+    name: tableName,
+    primaryKey: 'id',
+    columns: [
+      { name: 'id', type: 'uuid', defaultValue: 'gen_random_uuid()' },
+      { name: 'name', type: 'text' },
+    ],
+  });
+
+  // create table
+  await page.getByRole('button', { name: /create/i }).click();
+
+  await page.waitForURL(
+    `/${TEST_WORKSPACE_SLUG}/${TEST_PROJECT_SLUG}/database/browser/default/public/${tableName}`,
+  );
+
+  await page.getByRole('button', { name: /new table/i }).click();
+  await expect(page.getByText(/create a new table/i)).toBeVisible();
+
+  await prepareTable({
+    page,
+    name: tableName,
+    primaryKey: 'id',
+    columns: [
+      { name: 'id', type: 'uuid', defaultValue: 'gen_random_uuid()' },
+      { name: 'title', type: 'text' },
+      { name: 'author_id', type: 'uuid' },
+    ],
+  });
+
+  // create table
+  await page.getByRole('button', { name: /create/i }).click();
+
+  await expect(
+    page.getByText(/error: a table with this name already exists/i),
+  ).toBeVisible();
+});

dashboard/e2e/database/delete-table.test.ts

@@ -0,0 +1,191 @@
+import {
+  TEST_PROJECT_NAME,
+  TEST_PROJECT_SLUG,
+  TEST_WORKSPACE_SLUG,
+} from '@/e2e/env';
+import { openProject, prepareTable } from '@/e2e/utils';
+import { faker } from '@faker-js/faker';
+import type { Page } from '@playwright/test';
+import { expect, test } from '@playwright/test';
+
+let page: Page;
+
+test.beforeAll(async ({ browser }) => {
+  page = await browser.newPage();
+  await page.goto('/');
+
+  await openProject({
+    page,
+    projectName: TEST_PROJECT_NAME,
+    workspaceSlug: TEST_WORKSPACE_SLUG,
+    projectSlug: TEST_PROJECT_SLUG,
+  });
+
+  await page
+    .getByRole('navigation', { name: /main navigation/i })
+    .getByRole('link', { name: /database/i })
+    .click();
+});
+
+test.afterAll(async () => {
+  await page.close();
+});
+
+test('should delete a table', async () => {
+  const tableName = faker.random.word().toLowerCase();
+
+  await page.getByRole('button', { name: /new table/i }).click();
+
+  await prepareTable({
+    page,
+    name: tableName,
+    primaryKey: 'id',
+    columns: [
+      { name: 'id', type: 'uuid', defaultValue: 'gen_random_uuid()' },
+      { name: 'title', type: 'text' },
+    ],
+  });
+
+  await page.getByRole('button', { name: /create/i }).click();
+
+  await page.waitForURL(
+    `/${TEST_WORKSPACE_SLUG}/${TEST_PROJECT_SLUG}/database/browser/default/public/${tableName}`,
+  );
+
+  const tableLink = page.getByRole('link', {
+    name: tableName,
+    exact: true,
+  });
+
+  await tableLink.hover();
+  await page
+    .getByRole('listitem')
+    .filter({ hasText: tableName })
+    .getByRole('button')
+    .click();
+
+  await page.getByRole('menuitem', { name: /delete table/i }).click();
+
+  await expect(
+    page.getByRole('heading', { name: /delete table/i }),
+  ).toBeVisible();
+
+  await page.getByRole('button', { name: /delete/i }).click();
+
+  // navigate to next URL
+  await page.waitForURL(
+    `/${TEST_WORKSPACE_SLUG}/${TEST_PROJECT_SLUG}/database/browser/default/public/**`,
+  );
+
+  await expect(
+    page.getByRole('link', { name: tableName, exact: true }),
+  ).not.toBeVisible();
+});
+
+test('should not be able to delete a table if other tables have foreign keys referencing it', async () => {
+  await page.getByRole('button', { name: /new table/i }).click();
+  await expect(page.getByText(/create a new table/i)).toBeVisible();
+
+  const firstTableName = faker.random.word().toLowerCase();
+
+  await prepareTable({
+    page,
+    name: firstTableName,
+    primaryKey: 'id',
+    columns: [
+      { name: 'id', type: 'uuid', defaultValue: 'gen_random_uuid()' },
+      { name: 'name', type: 'text' },
+    ],
+  });
+
+  // create table
+  await page.getByRole('button', { name: /create/i }).click();
+
+  await page.waitForURL(
+    `/${TEST_WORKSPACE_SLUG}/${TEST_PROJECT_SLUG}/database/browser/default/public/${firstTableName}`,
+  );
+
+  await page.getByRole('button', { name: /new table/i }).click();
+  await expect(page.getByText(/create a new table/i)).toBeVisible();
+
+  const secondTableName = faker.random.word().toLowerCase();
+
+  await prepareTable({
+    page,
+    name: secondTableName,
+    primaryKey: 'id',
+    columns: [
+      { name: 'id', type: 'uuid', defaultValue: 'gen_random_uuid()' },
+      { name: 'title', type: 'text' },
+      { name: 'author_id', type: 'uuid' },
+    ],
+  });
+
+  await page.getByRole('button', { name: /add foreign key/i }).click();
+
+  // select column in current table
+  await page
+    .getByRole('button', { name: /column/i })
+    .first()
+    .click();
+  await page.getByRole('option', { name: /author_id/i }).click();
+
+  // select reference schema
+  await page.getByRole('button', { name: /schema/i }).click();
+  await page.getByRole('option', { name: /public/i }).click();
+
+  // select reference table
+  await page.getByRole('button', { name: /table/i }).click();
+  await page.getByRole('option', { name: firstTableName, exact: true }).click();
+
+  // select reference column
+  await page
+    .getByRole('button', { name: /column/i })
+    .nth(1)
+    .click();
+  await page.getByRole('option', { name: /id/i }).click();
+
+  await page.getByRole('button', { name: /add/i }).click();
+
+  await expect(
+    page.getByText(`public.${firstTableName}.id`, { exact: true }),
+  ).toBeVisible();
+
+  // create table
+  await page.getByRole('button', { name: /create/i }).click();
+
+  await page.waitForURL(
+    `/${TEST_WORKSPACE_SLUG}/${TEST_PROJECT_SLUG}/database/browser/default/public/${secondTableName}`,
+  );
+
+  await expect(
+    page.getByRole('link', { name: secondTableName, exact: true }),
+  ).toBeVisible();
+
+  // try to delete the first table that is referenced by the second table
+  const tableLink = page.getByRole('link', {
+    name: firstTableName,
+    exact: true,
+  });
+
+  await tableLink.hover();
+  await page
+    .getByRole('listitem')
+    .filter({ hasText: firstTableName })
+    .getByRole('button')
+    .click();
+
+  await page.getByRole('menuitem', { name: /delete table/i }).click();
+
+  await expect(
+    page.getByRole('heading', { name: /delete table/i }),
+  ).toBeVisible();
+
+  await page.getByRole('button', { name: /delete/i }).click();
+
+  await expect(
+    page.getByText(
+      /constraint [a-zA-Z_]+ on table [a-zA-Z_]+ depends on table [a-zA-Z_]+/i,
+    ),
+  ).toBeVisible();
+});

dashboard/e2e/env.ts

@@ -0,0 +1,42 @@
+import slugify from 'slugify';
+
+/**
+ * URL of the dashboard to test against.
+ */
+export const TEST_DASHBOARD_URL = process.env.NHOST_TEST_DASHBOARD_URL;
+
+/**
+ * Name of the workspace to test against.
+ */
+export const TEST_WORKSPACE_NAME = process.env.NHOST_TEST_WORKSPACE_NAME;
+
+/**
+ * Slugified name of the workspace to test against.
+ */
+export const TEST_WORKSPACE_SLUG = slugify(TEST_WORKSPACE_NAME, {
+  lower: true,
+  strict: true,
+});
+
+/**
+ * Name of the project to test against.
+ */
+export const TEST_PROJECT_NAME = process.env.NHOST_TEST_PROJECT_NAME;
+
+/**
+ * Slugified name of the project to test against.
+ */
+export const TEST_PROJECT_SLUG = slugify(TEST_PROJECT_NAME, {
+  lower: true,
+  strict: true,
+});
+
+/**
+ * Email of the test account to use.
+ */
+export const TEST_USER_EMAIL = process.env.NHOST_TEST_USER_EMAIL;
+
+/**
+ * Password of the test account to use.
+ */
+export const TEST_USER_PASSWORD = process.env.NHOST_TEST_USER_PASSWORD;

dashboard/e2e/overview/overview.test.ts

@@ -0,0 +1,109 @@
+import {
+  TEST_PROJECT_NAME,
+  TEST_PROJECT_SLUG,
+  TEST_WORKSPACE_NAME,
+  TEST_WORKSPACE_SLUG,
+} from '@/e2e/env';
+import { openProject } from '@/e2e/utils';
+import type { Page } from '@playwright/test';
+import { expect, test } from '@playwright/test';
+
+let page: Page;
+
+test.beforeAll(async ({ browser }) => {
+  page = await browser.newPage();
+
+  await page.goto('/');
+  await openProject({
+    page,
+    projectName: TEST_PROJECT_NAME,
+    workspaceSlug: TEST_WORKSPACE_SLUG,
+    projectSlug: TEST_PROJECT_SLUG,
+  });
+});
+
+test.afterAll(async () => {
+  await page.close();
+});
+
+test('should show a sidebar with menu items', async () => {
+  const navLocator = page.getByRole('navigation', { name: /main navigation/i });
+  await expect(navLocator).toBeVisible();
+  await expect(navLocator.getByRole('list').getByRole('listitem')).toHaveCount(
+    10,
+  );
+  await expect(
+    navLocator.getByRole('link', { name: /overview/i }),
+  ).toBeVisible();
+  await expect(
+    navLocator.getByRole('link', { name: /database/i }),
+  ).toBeVisible();
+  await expect(
+    navLocator.getByRole('link', { name: /graphql/i }),
+  ).toBeVisible();
+  await expect(navLocator.getByRole('link', { name: /hasura/i })).toBeVisible();
+  await expect(navLocator.getByRole('link', { name: /auth/i })).toBeVisible();
+  await expect(
+    navLocator.getByRole('link', { name: /storage/i }),
+  ).toBeVisible();
+  await expect(
+    navLocator.getByRole('link', { name: /deployments/i }),
+  ).toBeVisible();
+  await expect(
+    navLocator.getByRole('link', { name: /backups/i }),
+  ).toBeVisible();
+  await expect(navLocator.getByRole('link', { name: /logs/i })).toBeVisible();
+  await expect(
+    navLocator.getByRole('link', { name: /settings/i }),
+  ).toBeVisible();
+});
+
+test('should show a header with a logo, the workspace name, and the project name', async () => {
+  await expect(
+    page.getByRole('banner').getByRole('link', { name: TEST_WORKSPACE_NAME }),
+  ).toBeVisible();
+
+  await expect(
+    page.getByRole('banner').getByRole('link', { name: TEST_PROJECT_NAME }),
+  ).toBeVisible();
+});
+
+test("should show the project's name, the Upgrade button and the Settings button", async () => {
+  await expect(
+    page.getByRole('heading', { name: TEST_PROJECT_NAME }),
+  ).toBeVisible();
+  await expect(page.getByText(/free plan/i)).toBeVisible();
+  await expect(page.getByRole('button', { name: /upgrade/i })).toBeVisible();
+  await expect(
+    page.getByRole('main').getByRole('link', { name: /settings/i }),
+  ).toBeVisible();
+});
+
+test("should show the project's region and subdomain", async () => {
+  await expect(page.locator('p:has-text("Region") + div p').nth(0)).toHaveText(
+    /frankfurt \(eu-central-1\)/i,
+  );
+  await expect(
+    page.locator('p:has-text("Subdomain") + div p').nth(0),
+  ).toHaveText(/[a-z]{20}/i);
+});
+
+test('should not have a GitHub repository connected', async () => {
+  await expect(
+    page.getByRole('button', { name: /connect to github/i }),
+  ).toBeVisible();
+});
+
+test('should show proper limits for the free project', async () => {
+  // Limit for Database
+  await expect(page.getByText(/of 500 MB/i)).toBeVisible();
+
+  // Limit for Storage
+  await expect(page.getByText(/of 1 GB/i)).toBeVisible();
+
+  // Limit for Users
+  await expect(page.getByText(/of 10000/i)).toBeVisible();
+
+  // Limit for Functions
+  await expect(page.getByText(/of 10$/i, { exact: true })).toBeVisible();
+});

dashboard/e2e/utils.ts

@@ -0,0 +1,113 @@
+import type { Page } from '@playwright/test';
+
+/**
+ * Open a project by navigating to the project's overview page.
+ *
+ * @param page - The Playwright page object.
+ * @param workspaceSlug - The slug of the workspace that contains the project.
+ * @param projectSlug - The slug of the project to open.
+ * @param projectName - The name of the project to open.
+ * @returns A promise that resolves when the project is opened.
+ */
+export async function openProject({
+  page,
+  projectName,
+  workspaceSlug,
+  projectSlug,
+}: {
+  page: Page;
+  workspaceSlug: string;
+  projectSlug: string;
+  projectName: string;
+}) {
+  await page.getByRole('link', { name: projectName }).click();
+  await page.waitForURL(`/${workspaceSlug}/${projectSlug}`);
+}
+
+/**
+ * Prepares a table by filling out the form.
+ *
+ * @param page - The Playwright page object.
+ * @param name - The name of the table to create.
+ * @param columns - The columns to create in the table.
+ * @returns A promise that resolves when the table is prepared.
+ */
+export async function prepareTable({
+  page,
+  name: tableName,
+  primaryKey,
+  columns,
+}: {
+  page: Page;
+  name: string;
+  primaryKey: string;
+  columns: Array<{
+    name: string;
+    type: string;
+    nullable?: boolean;
+    unique?: boolean;
+    defaultValue?: string;
+  }>;
+}) {
+  if (!columns.some(({ name }) => name === primaryKey)) {
+    throw new Error('Primary key must be one of the columns.');
+  }
+
+  await page.getByRole('textbox', { name: /name/i }).first().fill(tableName);
+
+  await Promise.all(
+    columns.map(
+      async (
+        { name: columnName, type, nullable, unique, defaultValue },
+        index,
+      ) => {
+        // set name
+        await page.getByPlaceholder(/name/i).nth(index).fill(columnName);
+
+        // set type
+        await page
+          .getByRole('combobox', { name: /type/i })
+          .nth(index)
+          .fill(type);
+        await page.getByRole('option', { name: type }).first().click();
+
+        // optionally set default value
+        if (defaultValue) {
+          await page
+            .getByRole('combobox', { name: /default value/i })
+            .first()
+            .fill(defaultValue);
+          await page
+            .getByRole('option', { name: defaultValue })
+            .first()
+            .click();
+        }
+
+        // optionally check unique
+        if (unique) {
+          await page
+            .getByRole('checkbox', { name: /unique/i })
+            .nth(index)
+            .check();
+        }
+
+        // optionally check nullable
+        if (nullable) {
+          await page
+            .getByRole('checkbox', { name: /nullable/i })
+            .nth(index)
+            .check();
+        }
+
+        // add new column if not last
+        if (index < columns.length - 1) {
+          await page.getByRole('button', { name: /add column/i }).click();
+        }
+      },
+    ),
+  );
+
+  // select the first column as primary key
+  await page.getByRole('button', { name: /primary key/i }).click();
+  await page.getByRole('option', { name: primaryKey, exact: true }).click();
+}

dashboard/global-setup.ts

@@ -0,0 +1,27 @@
+import { chromium } from '@playwright/test';
+import {
+  TEST_DASHBOARD_URL,
+  TEST_USER_EMAIL,
+  TEST_USER_PASSWORD,
+} from './e2e/env';
+
+async function globalSetup() {
+  const browser = await chromium.launch();
+  const page = await browser.newPage();
+
+  await page.goto(TEST_DASHBOARD_URL);
+  await page.waitForURL(`${TEST_DASHBOARD_URL}/signin`);
+  await page.getByRole('link', { name: /continue with email/i }).click();
+
+  await page.waitForURL(`${TEST_DASHBOARD_URL}/signin/email`);
+  await page.getByLabel('Email').fill(TEST_USER_EMAIL);
+  await page.getByLabel('Password').fill(TEST_USER_PASSWORD);
+  await page.getByRole('button', { name: /sign in/i }).click();
+
+  await page.waitForURL(TEST_DASHBOARD_URL);
+  await page.context().storageState({ path: 'storageState.json' });
+
+  await browser.close();
+}
+
+export default globalSetup;

dashboard/graphql.config.yaml

@@ -1,5 +1,5 @@
 schema:
-  - http://localhost:1337/v1/graphql:
+  - https://local.graphql.nhost.run/v1:
       headers:
         x-hasura-admin-secret: nhost-admin-secret
 generates:

dashboard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/dashboard",
-  "version": "0.13.6",
+  "version": "0.13.10",
   "private": true,
   "scripts": {
     "preinstall": "npx only-allow pnpm",
@@ -14,10 +14,11 @@
     "nhost:dev": "nhost dev -d",
     "format": "prettier --write \"src/**/*.{js,ts,tsx,jsx,json,md}\" --plugin-search-dir=.",
     "storybook": "start-storybook -p 6006 -s public",
-    "build-storybook": "build-storybook"
+    "build-storybook": "build-storybook",
+    "e2e": "npx playwright@1.31.2 install --with-deps && playwright test"
   },
   "dependencies": {
-    "@apollo/client": "^3.7.3",
+    "@apollo/client": "^3.7.10",
     "@codemirror/language": "^6.3.0",
     "@emotion/cache": "^11.10.5",
     "@emotion/react": "^11.10.5",
@@ -29,7 +30,7 @@
     "@graphiql/toolkit": "^0.8.2",
     "@headlessui/react": "^1.6.5",
     "@heroicons/react": "^1.0.6",
-    "@hookform/resolvers": "^2.9.10",
+    "@hookform/resolvers": "^3.0.0",
     "@mui/base": "^5.0.0-alpha.106",
     "@mui/material": "^5.10.14",
     "@mui/system": "^5.10.14",
@@ -62,7 +63,7 @@
     "prettysize": "^2.0.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-error-boundary": "^3.1.4",
+    "react-error-boundary": "^4.0.0",
     "react-hook-form": "^7.42.1",
     "react-hot-toast": "^2.4.0",
     "react-is": "18.2.0",
@@ -70,23 +71,25 @@
     "react-merge-refs": "^1.1.0",
     "react-syntax-highlighter": "^15.4.5",
     "react-table": "^7.8.0",
-    "sharp": "^0.31.2",
+    "sharp": "^0.32.0",
     "slugify": "^1.6.5",
     "stripe": "^10.17.0",
     "tailwind-merge": "^1.8.0",
     "utility-types": "^3.10.0",
     "validator": "^13.7.0",
-    "yup": "^0.32.11",
+    "yup": "^1.0.2",
     "yup-password": "^0.2.2"
   },
   "devDependencies": {
     "@babel/core": "^7.20.2",
+    "@faker-js/faker": "^7.6.0",
     "@graphql-codegen/cli": "^3.0.0",
     "@graphql-codegen/typescript": "^3.0.0",
     "@graphql-codegen/typescript-graphql-request": "^4.5.1",
     "@graphql-codegen/typescript-operations": "^3.0.0",
     "@graphql-codegen/typescript-react-apollo": "^3.3.1",
     "@next/bundle-analyzer": "^12.3.1",
+    "@playwright/test": "^1.31.2",
     "@storybook/addon-actions": "^6.5.14",
     "@storybook/addon-essentials": "^6.5.14",
     "@storybook/addon-interactions": "^6.5.14",
@@ -116,6 +119,7 @@
     "babel-loader": "^8.3.0",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "csstype": "^3.0.10",
+    "dotenv": "^16.0.3",
     "encoding": "^0.1.13",
     "eslint": "^8.28.0",
     "eslint-config-airbnb": "19.0.4",
@@ -161,4 +165,4 @@
   "msw": {
     "workerDirectory": "public"
   }
-}
+}

dashboard/playwright.config.ts

@@ -0,0 +1,32 @@
+import { defineConfig, devices } from '@playwright/test';
+
+import dotenv from 'dotenv';
+import path from 'path';
+
+dotenv.config({ path: path.resolve(__dirname, '.env.test') });
+
+export default defineConfig({
+  testDir: './e2e',
+  timeout: 30 * 1000,
+  expect: {
+    timeout: 5000,
+  },
+  fullyParallel: true,
+  forbidOnly: !!process.env.CI,
+  retries: process.env.CI ? 2 : 0,
+  workers: process.env.CI ? 1 : undefined,
+  reporter: 'html',
+  globalSetup: require.resolve('./global-setup'),
+  use: {
+    actionTimeout: 0,
+    trace: 'on-first-retry',
+    storageState: 'storageState.json',
+    baseURL: process.env.NHOST_TEST_DASHBOARD_URL,
+  },
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] },
+    },
+  ],
+});

dashboard/src/components/dataBrowser/EditPermissionsForm/validationSchemas.ts

@@ -39,17 +39,17 @@ const ruleGroupSchema = Yup.object().shape({
 
 const baseValidationSchema = Yup.object().shape({
   filter: ruleGroupSchema.nullable().required('Please select a filter type.'),
-  columns: Yup.array().of(Yup.string()).nullable(true),
+  columns: Yup.array().of(Yup.string()).nullable(),
 });
 
 const selectValidationSchema = baseValidationSchema.shape({
   limit: Yup.number()
     .label('Limit')
     .min(0, 'Limit must not be negative.')
-    .nullable(true),
-  allowAggregations: Yup.boolean().nullable(true),
-  queryRootFields: Yup.array().of(Yup.string()).nullable(true),
-  subscriptionRootFields: Yup.array().of(Yup.string()).nullable(true),
+    .nullable(),
+  allowAggregations: Yup.boolean().nullable(),
+  queryRootFields: Yup.array().of(Yup.string()).nullable(),
+  subscriptionRootFields: Yup.array().of(Yup.string()).nullable(),
 });
 
 const columnPresetSchema = Yup.object().shape({
@@ -88,17 +88,17 @@ const columnPresetSchema = Yup.object().shape({
 });
 
 const insertValidationSchema = baseValidationSchema.shape({
-  backendOnly: Yup.boolean().nullable(true),
-  columnPresets: Yup.array().of(columnPresetSchema).nullable(true),
+  backendOnly: Yup.boolean().nullable(),
+  columnPresets: Yup.array().of(columnPresetSchema).nullable(),
 });
 
 const updateValidationSchema = baseValidationSchema.shape({
-  backendOnly: Yup.boolean().nullable(true),
-  columnPresets: Yup.array().of(columnPresetSchema).nullable(true),
+  backendOnly: Yup.boolean().nullable(),
+  columnPresets: Yup.array().of(columnPresetSchema).nullable(),
 });
 
 const deleteValidationSchema = baseValidationSchema.shape({
-  columnPresets: Yup.array().of(columnPresetSchema).nullable(true),
+  columnPresets: Yup.array().of(columnPresetSchema).nullable(),
 });
 
 const validationSchemas: Record<DatabaseAction, Yup.ObjectSchema<any>> = {

dashboard/src/components/home/Sidebar.tsx

@@ -7,7 +7,7 @@ import Link from 'next/link';
 
 export default function Sidebar() {
   return (
-    <div className="grid grid-flow-row gap-8 mt-2 ml-10 w-full md:grid md:w-workspaceSidebar content-start">
+    <div className="mt-2 grid w-full grid-flow-row content-start gap-8 md:ml-10 md:grid md:w-workspaceSidebar">
       <WorkspaceSection />
       <Resources />
 

dashboard/src/components/overview/OverviewDeployments/OverviewDeployments.test.tsx

@@ -2,8 +2,9 @@ import { UserDataProvider } from '@/context/workspace1-context';
 import type { Project } from '@/types/application';
 import { ApplicationStatus } from '@/types/application';
 import type { Workspace } from '@/types/workspace';
+import nhostGraphQLLink from '@/utils/msw/mocks/graphql/nhostGraphQLLink';
 import { render, screen, waitForElementToBeRemoved } from '@/utils/testUtils';
-import { graphql, rest } from 'msw';
+import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { afterAll, beforeAll, vi } from 'vitest';
 import OverviewDeployments from '.';
@@ -73,13 +74,11 @@ const mockWorkspace: Workspace = {
   applications: [mockApplication],
 };
 
-const mockGraphqlLink = graphql.link('http://localhost:1337/v1/graphql');
-
 const server = setupServer(
-  rest.get('http://localhost:1337/v1/graphql', (req, res, ctx) =>
+  rest.get('https://local.graphql.nhost.run/v1', (_req, res, ctx) =>
     res(ctx.status(200)),
   ),
-  mockGraphqlLink.operation(async (req, res, ctx) =>
+  nhostGraphQLLink.operation(async (_req, res, ctx) =>
     res(
       ctx.data({
         deployments: [],
@@ -143,7 +142,7 @@ test('should render an empty state when GitHub is connected, but there are no de
 
 test('should render a list of deployments', async () => {
   server.use(
-    mockGraphqlLink.operation(async (req, res, ctx) => {
+    nhostGraphQLLink.operation(async (req, res, ctx) => {
       const requestPayload = await req.json();
 
       if (requestPayload.operationName === 'ScheduledOrPendingDeploymentsSub') {
@@ -193,7 +192,7 @@ test('should render a list of deployments', async () => {
 
 test('should disable redeployments if a deployment is already in progress', async () => {
   server.use(
-    mockGraphqlLink.operation(async (req, res, ctx) => {
+    nhostGraphQLLink.operation(async (req, res, ctx) => {
       const requestPayload = await req.json();
 
       if (requestPayload.operationName === 'ScheduledOrPendingDeploymentsSub') {

dashboard/src/components/settings/signInMethods/AppleProviderSettings/AppleProviderSettings.tsx

@@ -24,22 +24,30 @@ import { twMerge } from 'tailwind-merge';
 import * as Yup from 'yup';
 
 const validationSchema = Yup.object({
-  teamId: Yup.string().label('Team ID').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
-  keyId: Yup.string().label('Key ID').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
-  clientId: Yup.string().label('Client ID').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
-  privateKey: Yup.string().label('Private Key').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
+  teamId: Yup.string()
+    .label('Team ID')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
+  keyId: Yup.string()
+    .label('Key ID')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
+  clientId: Yup.string()
+    .label('Client ID')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
+  privateKey: Yup.string()
+    .label('Private Key')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
   enabled: Yup.boolean(),
 });
 

dashboard/src/components/settings/signInMethods/BaseProviderSettings/BaseProviderSettings.tsx

@@ -3,14 +3,18 @@ import { useFormContext } from 'react-hook-form';
 import * as Yup from 'yup';
 
 export const baseProviderValidationSchema = Yup.object({
-  clientId: Yup.string().label('Client ID').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
-  clientSecret: Yup.string().label('Client Secret').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
+  clientId: Yup.string()
+    .label('Client ID')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
+  clientSecret: Yup.string()
+    .label('Client Secret')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
   enabled: Yup.bool(),
 });
 

dashboard/src/components/settings/signInMethods/SMSSettings/SMSSettings.tsx

@@ -22,19 +22,23 @@ import { twMerge } from 'tailwind-merge';
 import * as Yup from 'yup';
 
 const validationSchema = Yup.object({
-  accountSid: Yup.string().label('Account SID').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
-  authToken: Yup.string().label('Auth Token').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
+  accountSid: Yup.string()
+    .label('Account SID')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
+  authToken: Yup.string()
+    .label('Auth Token')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
   messagingServiceId: Yup.string()
     .label('Messaging Service ID')
     .when('enabled', {
       is: true,
-      then: Yup.string().required(),
+      then: (schema) => schema.required(),
     }),
   enabled: Yup.boolean().label('Enabled'),
 });

dashboard/src/components/settings/signInMethods/TwitterProviderSettings/TwitterProviderSettings.tsx

@@ -23,14 +23,18 @@ import { twMerge } from 'tailwind-merge';
 import * as Yup from 'yup';
 
 const validationSchema = Yup.object({
-  consumerSecret: Yup.string().label('Consumer Secret').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
-  consumerKey: Yup.string().label('Consumer Key').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
+  consumerSecret: Yup.string()
+    .label('Consumer Secret')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
+  consumerKey: Yup.string()
+    .label('Consumer Key')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
   enabled: Yup.boolean(),
 });
 

dashboard/src/components/settings/signInMethods/WorkOsProviderSettings/WorkOsProviderSettings.tsx

@@ -24,22 +24,30 @@ import { twMerge } from 'tailwind-merge';
 import * as Yup from 'yup';
 
 const validationSchema = Yup.object({
-  clientId: Yup.string().label('Client ID').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
-  clientSecret: Yup.string().label('Client Secret').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
-  organization: Yup.string().label('Organization').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
-  connection: Yup.string().label('Connection').when('enabled', {
-    is: true,
-    then: Yup.string().required(),
-  }),
+  clientId: Yup.string()
+    .label('Client ID')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
+  clientSecret: Yup.string()
+    .label('Client Secret')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
+  organization: Yup.string()
+    .label('Organization')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
+  connection: Yup.string()
+    .label('Connection')
+    .when('enabled', {
+      is: true,
+      then: (schema) => schema.required(),
+    }),
   enabled: Yup.boolean(),
 });
 

dashboard/src/components/users/CreateUserForm/CreateUserForm.tsx

@@ -165,7 +165,7 @@ export default function CreateUserForm({
           </Alert>
         )}
         <div className="grid grid-flow-row gap-2">
-          <Button type="submit" loading={isSubmitting} disabled={isSubmitting}>
+          <Button type="submit" disabled={isSubmitting}>
             Create
           </Button>
 

dashboard/src/components/users/UsersBody/UsersBody.tsx

@@ -242,7 +242,11 @@ export default function UsersBody({ users, onSubmit }: UsersBodyProps) {
             secondaryAction={
               <Dropdown.Root>
                 <Dropdown.Trigger asChild hideChevron>
-                  <IconButton variant="borderless" color="secondary">
+                  <IconButton
+                    variant="borderless"
+                    color="secondary"
+                    aria-label={`More options for ${user.displayName}`}
+                  >
                     <DotsHorizontalIcon />
                   </IconButton>
                 </Dropdown.Trigger>
@@ -282,6 +286,7 @@ export default function UsersBody({ users, onSubmit }: UsersBodyProps) {
             <ListItem.Button
               className="grid h-full w-full grid-cols-1 py-2.5 lg:grid-cols-6"
               onClick={() => handleViewUser(user)}
+              aria-label={`View ${user.displayName}`}
             >
               <div className="col-span-2 grid grid-flow-col place-content-start gap-4">
                 <Avatar

dashboard/src/utils/dataBrowser/validationSchemaHelpers/validationSchemaHelpers.ts

@@ -7,7 +7,7 @@ export interface ColumnDetails {
   hasDefaultValue: boolean;
 }
 
-function createGenericValidationSchema<T extends yup.BaseSchema>(
+function createGenericValidationSchema<T extends yup.Schema>(
   genericSchema: T,
   { isNullable, hasDefaultValue, isIdentity }: ColumnDetails,
 ): T {
@@ -136,7 +136,10 @@ export function createDynamicValidationSchema(
       };
     }
 
-    if (column.type === 'text' && column.specificType === 'jsonb') {
+    if (
+      column.type === 'text' &&
+      (column.specificType === 'jsonb' || column.specificType === 'json')
+    ) {
       return {
         ...schema,
         [column.id]: createJSONValidationSchema(details),

dashboard/src/utils/msw/mocks/graphql/nhostGraphQLLink.ts

@@ -1,5 +1,5 @@
 import { graphql } from 'msw';
 
-const nhostGraphQLLink = graphql.link('http://localhost:1337/v1/graphql');
+const nhostGraphQLLink = graphql.link('https://local.graphql.nhost.run/v1');
 
 export default nhostGraphQLLink;

dashboard/src/utils/testUtils.tsx

@@ -79,7 +79,7 @@ function Providers({ children }: PropsWithChildren<{}>) {
               <NhostApolloProvider
                 nhost={nhost}
                 link={createHttpLink({
-                  uri: 'http://localhost:1337/v1/graphql',
+                  uri: 'https://local.graphql.nhost.run/v1',
                 })}
               >
                 <WorkspaceProvider>

dashboard/tsconfig.json

@@ -19,6 +19,7 @@
     "baseUrl": "./src",
     "useUnknownInCatchVariables": false,
     "paths": {
+      "@/e2e/*": ["../e2e/*"],
       "@/components/*": ["components/*"],
       "@/hooks/*": ["hooks/*"],
       "@/utils/*": ["utils/*"],

dashboard/tsconfig.test.json

@@ -4,6 +4,7 @@
     "jsx": "react-jsx",
     "types": ["vitest/globals"],
     "paths": {
+      "@/e2e/*": ["../e2e/*"],
       "@/components/*": ["components/*"],
       "@/hooks/*": ["hooks/*"],
       "@/utils/*": ["utils/*"],

dashboard/vitest.config.ts

@@ -10,5 +10,6 @@ export default defineConfig({
     environment: 'jsdom',
     globals: true,
     setupFiles: 'src/setupTests.ts',
+    include: ['src/**/*.(spec|test).{js,jsx,ts,tsx}'],
   },
 });

docs/docs/authentication/sign-in-methods/4-google.mdx

@@ -56,6 +56,7 @@ Follow this guide to sign in users with Google.
 - Click on **Credentials** under **APIs & Services** in the left menu.
 - Click **+ CREATE CREDENTIALS** and then **OAuth client ID** in the top menu.
 - On the **Create OAuth client ID** page for **Application Type** select **Web application**.
+- Under **Authorized JavaScript origins**, add your project's redirect URL for the Google sign-in method in the following format: `https://<subdomain>.auth.<region>.nhost.run`
 - Under **Authorized redirect URIs** add your **OAuth Callback URL** from Nhost.
 - Click **CREATE**.
 

docs/docs/serverless-functions.mdx

@@ -31,11 +31,11 @@ export default (req: Request, res: Response) => {
 To get the `Request`, and `Response` types you can install the `@types/express` package.
 
 ```bash
-npm install -d @types/express
+npm install -D @types/express
 # or yarn
-yarn add -d @types/express
+yarn add -D @types/express
 # or pnpm
-pnpm add -d @types/express
+pnpm add -D @types/express
 ```
 
 :::

docs/package.json

@@ -16,9 +16,9 @@
   },
   "dependencies": {
     "@algolia/client-search": "^4.9.1",
-    "@docusaurus/core": "2.3.1",
-    "@docusaurus/plugin-sitemap": "2.3.1",
-    "@docusaurus/preset-classic": "2.3.1",
+    "@docusaurus/core": "2.4.0",
+    "@docusaurus/plugin-sitemap": "2.4.0",
+    "@docusaurus/preset-classic": "2.4.0",
     "@mdx-js/react": "^1.6.22",
     "clsx": "^1.2.1",
     "docusaurus-plugin-image-zoom": "^0.1.1",
@@ -30,7 +30,7 @@
     "unist-util-visit": "^2.0.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.3.1",
+    "@docusaurus/module-type-aliases": "2.4.0",
     "@tsconfig/docusaurus": "^1.0.6",
     "typescript": "^4.8.4"
   },

examples/nextjs/.eslintrc.js

@@ -1,9 +1,5 @@
 module.exports = {
-  extends: [
-    '../../config/.eslintrc.js',
-    'plugin:react/jsx-runtime',
-    'plugin:@next/next/recommended'
-  ],
+  extends: ['../../config/.eslintrc.js', 'plugin:@next/next/recommended'],
   rules: {
     'react/react-in-jsx-scope': 'off'
   }

examples/react-apollo/.gitignore

@@ -25,5 +25,7 @@ yarn-error.log*
 .nhost
 functions/node_modules
 
-cypress/videos
-cypress/screenshots
+/test-results/
+/playwright-report/
+/playwright/.cache/
+storageState.json

examples/react-apollo/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @nhost-examples/react-apollo
 
+## 0.1.10
+
+### Patch Changes
+
+- caba147b: chore(examples): improve tests of the React Apollo example
+
 ## 0.1.9
 
 ### Patch Changes

examples/react-apollo/cypress.config.ts

@@ -1,16 +0,0 @@
-import { defineConfig } from 'cypress'
-
-export default defineConfig({
-  e2e: {
-    baseUrl: 'http://localhost:3000',
-    chromeWebSecurity: false,
-    // * for some reason, the mailhog API is not systematically available
-    // * when using `localhost` instead of `127.0.0.1`
-    mailHogUrl: 'http://127.0.0.1:8025',
-    env: {
-      backendUrl: 'http://localhost:1337'
-    },
-    defaultCommandTimeout: 20000,
-    requestTimeout: 20000
-  }
-} as Cypress.ConfigOptions)

examples/react-apollo/cypress/e2e/1-unauthenticated/authentication-guards.cy.ts

@@ -1,8 +0,0 @@
-context('Authentication guards', () => {
-  it('should redirect to /sign-in when not authenticated', () => {
-    cy.visit('/')
-    cy.location('pathname').should('equal', '/sign-in')
-    cy.visit('/apollo')
-    cy.location('pathname').should('equal', '/sign-in')
-  })
-})

examples/react-apollo/cypress/e2e/1-unauthenticated/forgot-password.cy.ts

@@ -1,21 +0,0 @@
-import { faker } from '@faker-js/faker'
-
-context('Forgot password', () => {
-  it('should reset password', () => {
-    const email = faker.internet.email()
-    const password = faker.internet.password(8)
-
-    cy.signUpEmailPassword(email, password)
-    cy.contains('Verification email sent').should('be.visible')
-
-    cy.visit('/sign-in')
-    cy.findByRole('button', { name: /Continue with email \+ password/i }).click()
-    cy.findByRole('button', { name: /Forgot Password?/i }).click()
-
-    cy.findByPlaceholderText('Email Address').type(email)
-    cy.findByRole('button', { name: /Reset your password/i }).click()
-
-    cy.confirmEmail(email)
-    cy.contains('Profile page')
-  })
-})

examples/react-apollo/cypress/e2e/2-sign-up/anonymous.cy.ts

@@ -1,51 +0,0 @@
-import { faker } from '@faker-js/faker'
-
-context('Anonymous users', () => {
-  beforeEach(() => {
-    cy.signInAnonymous()
-  })
-
-  it('should sign-up anonymously', () => {
-    cy.contains('You signed in anonymously')
-  })
-
-  it('should deanonymise with email+password', () => {
-    cy.fetchUserData()
-      .its('id')
-      .then((id) => {
-        const email = faker.internet.email()
-        const password = faker.internet.password()
-        cy.signUpEmailPassword(email, password)
-        cy.contains('Verification email sent').should('be.visible')
-        cy.confirmEmail(email)
-        cy.contains('You signed in anonymously').should('not.exist')
-
-        cy.fetchUserData().then((user) => {
-          cy.wrap(user).its('id').should('equal', id)
-          cy.wrap(user).its('email').should('equal', email)
-        })
-      })
-  })
-
-  it('should deanonymise with a magic link', () => {
-    cy.fetchUserData()
-      .its('id')
-      .then((id) => {
-        const email = faker.internet.email()
-        cy.signUpEmailPasswordless(email)
-        cy.contains('Verification email sent').should('be.visible')
-        cy.confirmEmail(email)
-        cy.goToHomePage()
-        cy.contains('You signed in anonymously').should('not.exist')
-
-        cy.fetchUserData().then((user) => {
-          cy.wrap(user).its('id').should('equal', id)
-          cy.wrap(user).its('email').should('equal', email)
-        })
-      })
-  })
-
-  // TODO implement deanonymisation with Oauth?
-  // TODO forbid email/password change, MFA activation, and password reset when the following PR is released
-  // * https://github.com/nhost/hasura-auth/pull/190
-})

examples/react-apollo/cypress/e2e/2-sign-up/email-password.cy.ts

@@ -1,28 +0,0 @@
-import { faker } from '@faker-js/faker'
-
-context('Sign up with email+password', () => {
-  it('should sign-up with email and password', () => {
-    const email = faker.internet.email()
-    const password = faker.internet.password()
-    cy.signUpEmailPassword(email, password)
-    cy.contains('Verification email sent').should('be.visible')
-    cy.confirmEmail(email)
-    cy.contains('You are authenticated')
-  })
-
-  it('shoud raise an error when trying to sign up with an existing email', () => {
-    const email = faker.internet.email()
-    const password = faker.internet.password(10)
-    cy.signUpEmailPassword(email, password)
-    cy.contains('Verification email sent').should('be.visible')
-    cy.signUpEmailPassword(email, password)
-    cy.contains('Email already in use').should('be.visible')
-  })
-
-  // TODO implement in the UI
-  it.skip('should fail when network is not available', () => {
-    cy.disconnectBackend()
-    cy.signUpEmailPassword(faker.internet.email(), faker.internet.password())
-    cy.contains('Error').should('be.visible')
-  })
-})

examples/react-apollo/cypress/e2e/2-sign-up/email-passwordless.cy.ts

@@ -1,17 +0,0 @@
-import { faker } from '@faker-js/faker'
-
-context('Sign up with a magic link', () => {
-  it('should sign-up with a magic link', () => {
-    const email = faker.internet.email()
-    cy.signUpEmailPasswordless(email)
-    cy.contains('Verification email sent').should('be.visible')
-    cy.confirmEmail(email)
-    cy.contains('Profile page')
-  })
-
-  it('should fail when network is not available', () => {
-    cy.disconnectBackend()
-    cy.signUpEmailPasswordless(faker.internet.email())
-    cy.contains('Error').should('be.visible')
-  })
-})

examples/react-apollo/cypress/e2e/3-sign-in/email-password.cy.ts

@@ -1,74 +0,0 @@
-import totp from 'totp-generator'
-
-import { faker } from '@faker-js/faker'
-import { Decoder } from '@nuintun/qrcode'
-
-context('Sign in with email+password', () => {
-  it('should sign-in with email and password', () => {
-    const email = faker.internet.email()
-    const password = faker.internet.password()
-    cy.signUpEmailPassword(email, password)
-    cy.contains('Verification email sent').should('be.visible')
-    cy.confirmEmail(email)
-    cy.signOut()
-    cy.contains('Sign in to the Application').should('be.visible')
-    cy.signInEmailPassword(email, password)
-
-    cy.contains('You are authenticated')
-  })
-
-  // TODO implement in the UI
-  it.skip('should fail when network is not available', () => {
-    const email = faker.internet.email()
-    const password = faker.internet.password()
-    cy.disconnectBackend()
-    cy.signInEmailPassword(email, password)
-    cy.contains('Error').should('be.visible')
-  })
-
-  it('should activate and sign-in with MFA', () => {
-    // * Sign-up with email+password
-    const email = faker.internet.email()
-    const password = faker.internet.email()
-    cy.signUpEmailPassword(email, password)
-    cy.contains('Verification email sent').should('be.visible')
-    cy.confirmEmail(email)
-
-    cy.getNavBar()
-      .findByRole('button', { name: /Profile/i })
-      .click()
-
-    cy.findByText(/Activate 2-step verification/i)
-      .parent()
-      .findByRole('button')
-      .click()
-
-    cy.findAllByAltText(/qrcode/i).then(async (img) => {
-      // * Activate MFA
-      const result = await new Decoder().scan(img.prop('src'))
-      const [, params] = result.data.split('?')
-      const { secret, algorithm, digits, period } = Object.fromEntries(new URLSearchParams(params))
-      const code = totp(secret, {
-        algorithm: algorithm.replace('SHA1', 'SHA-1'),
-        digits: parseInt(digits),
-        period: parseInt(period)
-      })
-      cy.findByPlaceholderText('Enter activation code').type(code)
-      cy.findByRole('button', { name: /Activate/i }).click()
-      cy.contains('MFA has been activated!!!')
-      cy.signOut()
-
-      // * Sign-in with MFA
-      cy.visit('/sign-in')
-      cy.findByRole('button', { name: /Continue with email \+ password/i }).click()
-      cy.findByPlaceholderText('Email Address').type(email)
-      cy.findByPlaceholderText('Password').type(password)
-      cy.findByRole('button', { name: /Sign in/i }).click()
-      cy.contains('Send 2-step verification code')
-      const newCode = totp(secret, { timestamp: Date.now() })
-      cy.findByPlaceholderText('One-time password').type(newCode)
-      cy.findByRole('button', { name: /Send 2-step verification code/i }).click()
-      cy.contains('You are authenticated')
-    })
-  })
-})

examples/react-apollo/cypress/e2e/3-sign-in/token.cy.ts

@@ -1,22 +0,0 @@
-context('Automatic sign-in with a refresh token', () => {
-  it('should sign in automatically with a refresh token', () => {
-    cy.signUpAndConfirmEmail()
-    cy.contains('Profile page')
-    cy.clearLocalStorage()
-    cy.reload()
-    cy.contains('Sign in to the Application')
-    cy.visitPathWithRefreshToken('/profile')
-    cy.contains('Profile page')
-  })
-
-  it('should fail automatic sign-in when network is not available', () => {
-    cy.signUpAndConfirmEmail()
-    cy.contains('Profile page')
-    cy.disconnectBackend()
-    cy.clearLocalStorage()
-    cy.reload()
-    cy.contains('Sign in to the Application')
-    cy.visitPathWithRefreshToken('/profile')
-    cy.contains('Could not sign in automatically. Retrying to get user information..')
-  })
-})

examples/react-apollo/cypress/e2e/4-authenticated/apollo.cy.ts

@@ -1,45 +0,0 @@
-import { faker } from '@faker-js/faker'
-
-context('Apollo', () => {
-  const addItemTest = (sentence: string) => {
-    cy.getNavBar()
-      .findByRole('button', { name: /Apollo/i })
-      .click()
-    cy.contains('Todo list')
-    cy.focused().type(sentence)
-    cy.findByRole('button', { name: /Add/i }).click()
-  }
-
-  it('should add an item to the todo list when normally authenticated', () => {
-    cy.signUpAndConfirmEmail()
-    const sentence = faker.lorem.sentence()
-    addItemTest(sentence)
-    cy.get('li').contains(sentence)
-  })
-
-  it('should add an item to the todo list when anonymous', () => {
-    cy.signInAnonymous()
-    const sentence = faker.lorem.sentence()
-    addItemTest(sentence)
-    cy.get('li').contains(sentence)
-  })
-
-  it('should add an item to the todo list after a token refresh', () => {
-    // * This test has a limitation: Hasura's clock is not changing, so the previous JWT will still be valid.
-    cy.signUpAndConfirmEmail()
-    const now = Date.now()
-    cy.clock(now)
-    cy.tick(4 * 7 * 24 * 60 * 60 * 1000)
-    const sentence = faker.lorem.sentence()
-    addItemTest(sentence)
-    cy.get('li').contains(sentence)
-  })
-
-  it('should not add an item when backend is disconnected', () => {
-    cy.signUpAndConfirmEmail()
-    cy.disconnectBackend()
-    addItemTest(faker.lorem.sentence())
-    cy.contains('Network error')
-    cy.get('ul').should('be.empty')
-  })
-})

examples/react-apollo/cypress/e2e/4-authenticated/change-email.cy.ts

@@ -1,30 +0,0 @@
-import { faker } from '@faker-js/faker'
-
-context('Change email', () => {
-  it('should change email', () => {
-    const newEmail = faker.internet.email()
-    cy.signUpAndConfirmEmail()
-    cy.findByPlaceholderText('New email').type(newEmail)
-    cy.findByText(/Change Email/i)
-      .parent()
-      .findByRole('button')
-      .click()
-    cy.contains('Please check your inbox and follow the link to confirm the email change').should(
-      'be.visible'
-    )
-    cy.signOut()
-    cy.confirmEmail(newEmail)
-    cy.contains('Profile page')
-  })
-
-  it('should not accept an invalid email', () => {
-    const newEmail = faker.random.alphaNumeric()
-    cy.signUpAndConfirmEmail()
-    cy.findByPlaceholderText('New email').type(newEmail)
-    cy.findByText(/Change Email/i)
-      .parent()
-      .findByRole('button')
-      .click()
-    cy.contains('Email is incorrectly formatted').should('be.visible')
-  })
-})

examples/react-apollo/cypress/e2e/4-authenticated/change-password.cy.ts

@@ -1,29 +0,0 @@
-import { faker } from '@faker-js/faker'
-
-context('Change password', () => {
-  it('should change password', () => {
-    const email = faker.internet.email()
-    const newPassword = faker.internet.password()
-    cy.signUpAndConfirmEmail(email)
-    cy.findByPlaceholderText('New password').type(newPassword)
-    cy.findByText(/Change Password/i)
-      .parent()
-      .findByRole('button')
-      .click()
-    cy.contains('Password changed successfully').should('be.visible')
-    cy.signOut()
-    cy.signInEmailPassword(email, newPassword)
-    cy.contains('You are authenticated')
-  })
-
-  it('should not accept an invalid password', () => {
-    const newPassword = faker.random.alphaNumeric(2)
-    cy.signUpAndConfirmEmail()
-    cy.findByPlaceholderText('New password').type(newPassword)
-    cy.findByText(/Change Password/i)
-      .parent()
-      .findByRole('button')
-      .click()
-    cy.contains('Password is incorrectly formatted').should('be.visible')
-  })
-})

examples/react-apollo/cypress/e2e/4-authenticated/file-uploads.cy.ts

@@ -1,75 +0,0 @@
-context('File uploads', () => {
-  it('should upload a single file', () => {
-    cy.signUpAndConfirmEmail()
-    cy.findByRole('button', { name: /Storage/i }).click()
-    cy.findByRole('button', { name: /Drag a file here or click to select/i })
-      .children('input[type=file]')
-      .selectFile(
-        {
-          contents: Cypress.Buffer.from('file contents'),
-          fileName: 'file.txt',
-          mimeType: 'text/plain',
-          lastModified: Date.now()
-        },
-        { force: true }
-      )
-      .parent()
-      .contains('Successfully uploaded')
-  })
-
-  it('should upload two files using the same single file uploader', () => {
-    cy.signUpAndConfirmEmail()
-    cy.findByRole('button', { name: /Storage/i }).click()
-    cy.findByRole('button', { name: /Drag a file here or click to select/i })
-      .children('input[type=file]')
-      .selectFile(
-        {
-          contents: Cypress.Buffer.from('file contents'),
-          fileName: 'file.txt',
-          mimeType: 'text/plain',
-          lastModified: Date.now()
-        },
-        { force: true }
-      )
-      .selectFile(
-        {
-          contents: Cypress.Buffer.from('file contents'),
-          fileName: 'file.txt',
-          mimeType: 'text/plain',
-          lastModified: Date.now()
-        },
-        { force: true }
-      )
-      .parent()
-      .contains('Successfully uploaded')
-  })
-
-  it('should upload multiple files', () => {
-    const files: Required<Cypress.FileReferenceObject>[] = [
-      {
-        contents: Cypress.Buffer.from('file contents'),
-        fileName: 'file1.txt',
-        mimeType: 'text/plain',
-        lastModified: Date.now()
-      },
-      {
-        contents: Cypress.Buffer.from('file contents'),
-        fileName: 'file2.txt',
-        mimeType: 'text/plain',
-        lastModified: Date.now()
-      }
-    ]
-    cy.signUpAndConfirmEmail()
-    cy.findByRole('button', { name: /Storage/i }).click()
-    cy.findByRole('button', { name: /Drag files here or click to select/i })
-      .children('input[type=file]')
-      .selectFile(files, { force: true })
-    cy.findByRole('button', { name: /Upload/i }).click()
-    cy.findByRole('button', { name: /Successfully uploaded/i }).should('be.visible')
-    cy.findByRole('table').within(() => {
-      files.forEach((file) => {
-        cy.contains(file.fileName).parent().findByTitle('success').should('exist')
-      })
-    })
-  })
-})

examples/react-apollo/cypress/e2e/4-authenticated/sign-out.cy.ts

@@ -1,13 +0,0 @@
-context('Sign out', () => {
-  beforeEach(() => {
-    cy.signUpAndConfirmEmail()
-  })
-
-  it('should sign out', () => {
-    cy.visitPathWithRefreshToken()
-    cy.goToProfilePage()
-    cy.contains('Profile page')
-    cy.signOut()
-    cy.contains('Sign in to the Application')
-  })
-})

examples/react-apollo/cypress/e2e/4-authenticated/token-refresh.cy.ts

@@ -1,30 +0,0 @@
-import { faker } from '@faker-js/faker'
-
-context('Token refresh', () => {
-  it('should refresh token one minute before it expires', () => {
-    const email = faker.internet.email()
-    cy.signUpEmailPasswordless(email)
-    cy.contains('Verification email sent').should('be.visible')
-    const now = Date.now()
-    cy.clock(now)
-    cy.confirmEmail(email)
-
-    cy.intercept(Cypress.env('backendUrl') + '/v1/auth/token').as('tokenRequest')
-    cy.tick(14 * 60 * 1000)
-    cy.wait('@tokenRequest').its('response.statusCode').should('eq', 200)
-  })
-
-  it('should refresh session from localStorage after 4 weeks of inactivity', () => {
-    const email = faker.internet.email()
-    cy.signUpEmailPasswordless(email)
-    cy.contains('Verification email sent').should('be.visible')
-    const now = Date.now()
-    cy.clock(now)
-    cy.confirmEmail(email)
-    cy.contains('Profile page')
-
-    cy.tick(4 * 7 * 24 * 60 * 60 * 1000)
-    cy.reload()
-    cy.contains('Profile page')
-  })
-})

examples/react-apollo/cypress/support/e2e.ts

@@ -1,139 +0,0 @@
-import { faker } from '@faker-js/faker'
-import { User } from '@nhost/react'
-
-import '@testing-library/cypress/add-commands'
-import 'cypress-mailhog'
-declare module 'mocha' {
-  export interface Context {
-    refreshToken?: string
-  }
-}
-declare global {
-  namespace Cypress {
-    interface Chainable {
-      signUpEmailPassword(email: string, password: string): Chainable<Element>
-      signUpEmailPasswordless(email: string): Chainable<Element>
-      signInEmailPassword(email: string, password: string): Chainable<Element>
-      signInAnonymous(): Chainable<Element>
-      /** Sign in from the refresh token stored in the global state */
-      visitPathWithRefreshToken(path?: string): Chainable<Element>
-      /** Click on the 'Sign Out' item of the left side menu to sign out the current user */
-      signOut(): Chainable<Element>
-      /** Run a sign-up + authentication sequence with passwordless to use an authenticated user in other tests */
-      signUpAndConfirmEmail(email?: string): Chainable<Element>
-      /** Gets a confirmation email and click on the link */
-      confirmEmail(email: string): Chainable<Element>
-      /** Save the refresh token in the global state so it can be reused with `this.refreshToken` */
-      saveRefreshToken(): Chainable<Element>
-      /** Make the Nhost backend unavailable */
-      disconnectBackend(): Chainable<Element>
-      /** Get the left side navigation bar */
-      getNavBar(): Chainable<Element>
-      /** Go to the profile page */
-      goToProfilePage(): Chainable<Element>
-      /** Go to the home page */
-      goToHomePage(): Chainable<Element>
-      /** Go getch the user ID in the profile page*/
-      fetchUserData(): Chainable<User>
-    }
-  }
-}
-
-Cypress.Commands.add('signUpEmailPassword', (email, password) => {
-  cy.visit('/sign-up')
-  cy.findByRole('button', { name: /Continue with email \+ password/i }).click()
-  cy.findByPlaceholderText('First name').type(faker.name.firstName())
-  cy.findByPlaceholderText('Last name').type(faker.name.lastName())
-  cy.findByPlaceholderText('Email Address').type(email)
-  cy.findByPlaceholderText('Password').type(password)
-  cy.findByPlaceholderText('Confirm Password').type(password)
-  cy.findByRole('button', { name: /Continue with email \+ password/i }).click()
-})
-
-Cypress.Commands.add('signUpEmailPasswordless', (email) => {
-  cy.visit('/sign-up')
-  cy.findByRole('button', { name: /Continue with a magic link/i }).click()
-  cy.findByPlaceholderText('Email Address').type(email)
-  cy.findByRole('button', { name: /Continue with email/i }).click()
-})
-
-Cypress.Commands.add('signInEmailPassword', (email, password) => {
-  cy.visit('/sign-in')
-  cy.findByRole('button', { name: /Continue with email \+ password/i }).click()
-  cy.findByPlaceholderText('Email Address').type(email)
-  cy.findByPlaceholderText('Password').type(password)
-  cy.findByRole('button', { name: /Sign in/i }).click()
-  cy.saveRefreshToken()
-})
-
-Cypress.Commands.add('signInAnonymous', () => {
-  cy.visit('/sign-in')
-  cy.findByRole('link', { name: /sign in anonymously/i }).click()
-  cy.saveRefreshToken()
-})
-
-Cypress.Commands.add('visitPathWithRefreshToken', function (path = '/') {
-  cy.visit(path + '#refreshToken=' + this.refreshToken)
-})
-
-Cypress.Commands.add('signOut', () => {
-  cy.getNavBar()
-    .findByRole('button', { name: /Sign Out/i })
-    .click()
-})
-
-Cypress.Commands.add('confirmEmail', (email) => {
-  cy.mhGetMailsByRecipient(email, 1)
-    .should('have.length', 1)
-    .then(([message]) => {
-      cy.visit(message.Content.Headers['X-Link'][0])
-      cy.saveRefreshToken()
-    })
-})
-
-Cypress.Commands.add('signUpAndConfirmEmail', (givenEmail) => {
-  const email = givenEmail || faker.internet.email()
-  cy.signUpEmailPasswordless(email)
-  cy.contains('Verification email sent').should('be.visible')
-  cy.confirmEmail(email)
-})
-
-Cypress.Commands.add('saveRefreshToken', () => {
-  cy.getNavBar()
-    .findByRole('button', { name: /Sign Out/i })
-    .then(() => localStorage.getItem('nhostRefreshToken'))
-    .as('refreshToken')
-})
-
-Cypress.Commands.add('disconnectBackend', () => {
-  cy.intercept(Cypress.env('backendUrl') + '/**', {
-    forceNetworkError: true
-  })
-})
-
-Cypress.Commands.add('getNavBar', () => {
-  cy.findByRole(`navigation`, { name: /main navigation/i })
-})
-
-Cypress.Commands.add('goToProfilePage', () => {
-  cy.getNavBar()
-    .findByRole('button', { name: /Profile/i })
-    .click()
-})
-
-Cypress.Commands.add('goToHomePage', () => {
-  cy.getNavBar().findByRole('button', { name: /Home/i }).click()
-})
-
-Cypress.Commands.add('fetchUserData', () => {
-  cy.goToProfilePage()
-  cy.findByText('User information')
-    .parent()
-    .within(() => {
-      cy.get('pre')
-        .invoke('text')
-        .then((text) => JSON.parse(text))
-        .as('user')
-    })
-  return cy.get<User>('@user')
-})

examples/react-apollo/e2e/authenticated/apollo.test.ts

@@ -0,0 +1,52 @@
+import { faker } from '@faker-js/faker'
+import { expect, test } from '@playwright/test'
+import { signInAnonymously, signUpWithEmailAndPassword, verifyEmail } from '../utils'
+
+test('should add an item to the todo list when authenticated with email and password', async ({
+  page
+}) => {
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+  const sentence = faker.lorem.sentence()
+
+  await page.goto('/')
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+  await newPage.getByRole('button', { name: /apollo/i }).click()
+  await expect(newPage.getByText(/todo list/i)).toBeVisible()
+  await newPage.getByRole('textbox').fill(sentence)
+  await newPage.getByRole('button', { name: /add/i }).click()
+  await expect(newPage.getByRole('listitem').first()).toHaveText(sentence)
+})
+
+test('should add an item to the todo list when authenticated anonymously', async ({ page }) => {
+  const sentence = faker.lorem.sentence()
+
+  await page.goto('/')
+
+  await signInAnonymously({ page })
+  await page.getByRole('button', { name: /apollo/i }).click()
+  await expect(page.getByText(/todo list/i)).toBeVisible()
+  await page.getByRole('textbox').fill(sentence)
+  await page.getByRole('button', { name: /add/i }).click()
+  await expect(page.getByRole('listitem').first()).toHaveText(sentence)
+})
+
+test('should fail when network is not available', async ({ page }) => {
+  const sentence = faker.lorem.sentence()
+
+  await page.goto('/')
+
+  await signInAnonymously({ page })
+  await page.getByRole('button', { name: /apollo/i }).click()
+  await expect(page.getByText(/todo list/i)).toBeVisible()
+
+  await page.route('**', (route) => route.abort('internetdisconnected'))
+  await page.getByRole('textbox').fill(sentence)
+  await page.getByRole('button', { name: /add/i }).click()
+
+  await expect(page.getByText(/network error/i)).toBeVisible()
+})

examples/react-apollo/e2e/authenticated/change-email.test.ts

@@ -0,0 +1,56 @@
+import { faker } from '@faker-js/faker'
+import { expect, test } from '@playwright/test'
+import { signUpWithEmailAndPassword, verifyEmail } from '../utils'
+
+test('should be able to change email', async ({ page }) => {
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await page.goto('/')
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+  await newPage.getByRole('button', { name: /profile/i }).click()
+
+  const newEmail = faker.internet.email()
+
+  await newPage.getByPlaceholder(/new email/i).fill(newEmail)
+  await newPage.locator('h1:has-text("Change email") + div button:has-text("Change")').click()
+
+  await expect(
+    newPage.getByText(/please check your inbox and follow the link to confirm the email change/i)
+  ).toBeVisible()
+
+  await newPage.getByRole('button', { name: /sign out/i }).click()
+
+  const updatedEmailPage = await verifyEmail({
+    page: newPage,
+    email: newEmail,
+    context: page.context(),
+    linkText: /change email/i
+  })
+
+  await expect(updatedEmailPage.getByText(/profile page/i)).toBeVisible()
+})
+
+test('should not accept an invalid email', async ({ page }) => {
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await page.goto('/')
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+  await newPage.getByRole('button', { name: /profile/i }).click()
+
+  const newEmail = faker.random.alphaNumeric()
+
+  await newPage.getByPlaceholder(/new email/i).fill(newEmail)
+  await newPage.locator('h1:has-text("Change email") + div button:has-text("Change")').click()
+
+  await expect(newPage.getByText(/email is incorrectly formatted/i)).toBeVisible()
+})

examples/react-apollo/e2e/authenticated/change-password.test.ts

@@ -0,0 +1,47 @@
+import { faker } from '@faker-js/faker'
+import { expect, test } from '@playwright/test'
+import { signInWithEmailAndPassword, signUpWithEmailAndPassword, verifyEmail } from '../utils'
+
+test('should be able to change password', async ({ page }) => {
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await page.goto('/')
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+  await newPage.getByRole('button', { name: /profile/i }).click()
+
+  const newPassword = faker.internet.password()
+
+  await newPage.getByPlaceholder(/new password/i).fill(newPassword)
+  await newPage.locator('h1:has-text("Change password") + div button:has-text("Change")').click()
+  await expect(newPage.getByText(/password changed successfully/i)).toBeVisible()
+
+  await newPage.getByRole('button', { name: /sign out/i }).click()
+
+  await signInWithEmailAndPassword({ page: newPage, email, password: newPassword })
+  await expect(newPage.getByText(/you are authenticated/i)).toBeVisible()
+})
+
+test('should not accept an invalid email', async ({ page }) => {
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await page.goto('/')
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+  await newPage.getByRole('button', { name: /profile/i }).click()
+
+  const newPassword = faker.internet.password(2)
+
+  await newPage.getByPlaceholder(/new password/i).fill(newPassword)
+  await newPage.locator('h1:has-text("Change password") + div button:has-text("Change")').click()
+
+  await expect(newPage.getByText(/password is incorrectly formatted/i)).toBeVisible()
+})

examples/react-apollo/e2e/authenticated/file-upload.test.ts

@@ -0,0 +1,97 @@
+import { faker } from '@faker-js/faker'
+import { expect, test } from '@playwright/test'
+import { signUpWithEmailAndPassword, verifyEmail } from '../utils'
+
+test('should upload a single file', async ({ page }) => {
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await page.goto('/')
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+  await newPage.getByRole('button', { name: /storage/i }).click()
+
+  await newPage
+    .getByRole('button', { name: /drag a file here or click to select/i })
+    .locator('input[type=file]')
+    .setInputFiles({
+      buffer: Buffer.from('file contents', 'utf-8'),
+      name: 'file.txt',
+      mimeType: 'text/plain'
+    })
+
+  await expect(newPage.getByText(/successfully uploaded/i)).toBeVisible()
+})
+
+test('should upload two files using the same single file uploader', async ({ page }) => {
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await page.goto('/')
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+  await newPage.getByRole('button', { name: /storage/i }).click()
+
+  await newPage
+    .getByRole('button', { name: /drag a file here or click to select/i })
+    .locator('input[type=file]')
+    .setInputFiles({
+      buffer: Buffer.from('file contents 1', 'utf-8'),
+      name: 'file1.txt',
+      mimeType: 'text/plain'
+    })
+
+  await expect(newPage.getByText(/successfully uploaded/i)).toBeVisible()
+
+  await newPage
+    .getByRole('button', { name: /successfully uploaded/i })
+    .locator('input[type=file]')
+    .setInputFiles({
+      buffer: Buffer.from('file contents 2', 'utf-8'),
+      name: 'file2.txt',
+      mimeType: 'text/plain'
+    })
+
+  await expect(newPage.getByText(/successfully uploaded/i)).toBeVisible()
+})
+
+test('should upload multiple files at once', async ({ page }) => {
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await page.goto('/')
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+  await newPage.getByRole('button', { name: /storage/i }).click()
+
+  await newPage
+    .getByRole('button', { name: /drag files here or click to select/i })
+    .locator('input[type=file]')
+    .setInputFiles([
+      {
+        buffer: Buffer.from('file contents 1', 'utf-8'),
+        name: 'file1.txt',
+        mimeType: 'text/plain'
+      },
+      {
+        buffer: Buffer.from('file contents 2', 'utf-8'),
+        name: 'file2.txt',
+        mimeType: 'text/plain'
+      }
+    ])
+
+  await expect(newPage.getByRole('row').nth(0)).toHaveText('file1.txt')
+  await expect(newPage.getByRole('row').nth(1)).toHaveText('file2.txt')
+  await newPage.getByRole('button', { name: /upload/i }).click()
+
+  await expect(newPage.getByText(/successfully uploaded/i)).toBeVisible()
+})

examples/react-apollo/e2e/config.ts

@@ -0,0 +1,3 @@
+export const baseURL = 'http://localhost:3000'
+export const mailhogURL = 'http://localhost:8025'
+export const authBackendURL = 'https://local.auth.nhost.run'

examples/react-apollo/e2e/sign-in/auto-sign-in.test.ts

@@ -0,0 +1,72 @@
+import { faker } from '@faker-js/faker'
+import { expect, test } from '@playwright/test'
+import { authBackendURL, baseURL } from '../config'
+import {
+  clearStorage,
+  getValueFromLocalStorage,
+  signUpWithEmailAndPassword,
+  verifyEmail
+} from '../utils'
+
+test('should sign in automatically with a refresh token', async ({ page }) => {
+  await page.goto('/')
+
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+
+  await expect(newPage.getByText(/you are authenticated/i)).toBeVisible()
+
+  const refreshToken = await getValueFromLocalStorage({
+    page: newPage,
+    origin: baseURL,
+    key: 'nhostRefreshToken'
+  })
+
+  // Clear storage and reload the page
+  await clearStorage({ page: newPage })
+  await newPage.reload()
+
+  await expect(newPage.getByText(/sign in to the application/i)).toBeVisible()
+
+  // User should be signed in automatically
+  await newPage.goto(`${baseURL}/profile#refreshToken=${refreshToken}`)
+  await expect(newPage.getByText(/profile page/i)).toBeVisible()
+})
+
+test('should fail automatic sign-in when network is not available', async ({ page }) => {
+  await page.goto('/')
+
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+
+  await expect(newPage.getByText(/you are authenticated/i)).toBeVisible()
+
+  const refreshToken = await getValueFromLocalStorage({
+    page: newPage,
+    origin: baseURL,
+    key: 'nhostRefreshToken'
+  })
+
+  // Clear storage and reload the page
+  await clearStorage({ page: newPage })
+  await newPage.reload()
+
+  await expect(newPage.getByText(/sign in to the application/i)).toBeVisible()
+  await newPage.route(`${authBackendURL}/**`, (route) => route.abort('internetdisconnected'))
+
+  // User should be signed in automatically
+  await newPage.goto(`${baseURL}/profile#refreshToken=${refreshToken}`)
+  await expect(
+    newPage.getByText(/could not sign in automatically. retrying to get user information/i)
+  ).toBeVisible()
+})

examples/react-apollo/e2e/sign-in/email-password.test.ts

@@ -0,0 +1,84 @@
+import { faker } from '@faker-js/faker'
+import type { Page } from '@playwright/test'
+import { expect, test } from '@playwright/test'
+import totp from 'totp-generator'
+import { baseURL } from '../config'
+import {
+  decodeQRCode,
+  signInWithEmailAndPassword,
+  signUpWithEmailAndPassword,
+  verifyEmail
+} from '../utils'
+
+const email = faker.internet.email()
+const password = faker.internet.password()
+
+let page: Page
+
+test.describe.configure({ mode: 'serial' })
+
+test.beforeAll(async ({ browser }) => {
+  page = await browser.newPage()
+
+  await page.goto('/')
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const newPage = await verifyEmail({ page, email, context: page.context() })
+  await expect(newPage.getByText(/you are authenticated/i)).toBeVisible()
+  await newPage.getByRole('button', { name: /sign out/i }).click()
+
+  page = newPage
+})
+
+test.afterEach(async () => {
+  await page.getByRole('button', { name: /sign out/i }).click()
+})
+
+test.afterAll(() => {
+  page.close()
+})
+
+test('should sign in with email and password', async () => {
+  await page.goto('/')
+
+  await signInWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/you are authenticated/i)).toBeVisible()
+})
+
+// TODO: Create email verification test
+
+test('should activate and sign in with MFA', async () => {
+  await page.goto('/')
+
+  await signInWithEmailAndPassword({ page, email, password })
+  await page.waitForURL(baseURL)
+  await page.getByRole('button', { name: /profile/i }).click()
+  await page.getByRole('button', { name: /generate/i }).click()
+
+  const image = page.getByAltText(/qrcode/i)
+  const src = await image.getAttribute('src')
+
+  const { secret, algorithm, digits, period } = decodeQRCode(src)
+
+  const code = totp(secret, {
+    algorithm: algorithm.replace('SHA1', 'SHA-1'),
+    digits: parseInt(digits),
+    period: parseInt(period)
+  })
+
+  await page.getByPlaceholder(/enter activation code/i).fill(code)
+  await page.getByRole('button', { name: /activate/i }).click()
+  await expect(page.getByText(/mfa has been activated/i)).toBeVisible()
+  await page.getByRole('button', { name: /sign out/i }).click()
+
+  await page.getByRole('button', { name: /continue with email \+ password/i }).click()
+  await signInWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/send 2-step verification code/i)).toBeVisible()
+
+  const newCode = totp(secret, { timestamp: Date.now() })
+
+  await page.getByPlaceholder(/one-time password/i).fill(newCode)
+  await page.getByRole('button', { name: /send 2-step verification code/i }).click()
+  await expect(page.getByText(/you are authenticated/i)).toBeVisible()
+})

examples/react-apollo/e2e/sign-up/anonymous.test.ts

@@ -0,0 +1,53 @@
+import { faker } from '@faker-js/faker'
+import { expect, test } from '@playwright/test'
+import {
+  getUserData,
+  signInAnonymously,
+  signUpWithEmailAndPassword,
+  signUpWithEmailPasswordless,
+  verifyEmail,
+  verifyMagicLink
+} from '../utils'
+
+test('should deanonymize with email and password', async ({ page, context }) => {
+  const email = faker.internet.email()
+  const password = faker.internet.password(8)
+
+  await page.goto('/')
+
+  await signInAnonymously({ page })
+  await page.getByRole('button', { name: /profile/i }).click()
+
+  const userData = await getUserData(page)
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const authenticatedPage = await verifyEmail({ page, context, email })
+  await authenticatedPage.getByRole('button', { name: /profile/i }).click()
+
+  const updatedUserData = await getUserData(authenticatedPage)
+  expect(updatedUserData.id).toBe(userData.id)
+  expect(updatedUserData.email).toBe(email)
+})
+
+test('should deanonymize with a magic link', async ({ page, context }) => {
+  const email = faker.internet.email()
+
+  await page.goto('/')
+
+  await signInAnonymously({ page })
+  await page.getByRole('button', { name: /profile/i }).click()
+
+  const userData = await getUserData(page)
+
+  await signUpWithEmailPasswordless({ page, email })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const authenticatedPage = await verifyMagicLink({ page, context, email })
+  await authenticatedPage.getByRole('button', { name: /profile/i }).click()
+
+  const updatedUserData = await getUserData(authenticatedPage)
+  expect(updatedUserData.id).toBe(userData.id)
+  expect(updatedUserData.email).toBe(email)
+})

examples/react-apollo/e2e/sign-up/email-password.test.ts

@@ -0,0 +1,44 @@
+import { faker } from '@faker-js/faker'
+import { expect, test } from '@playwright/test'
+import { signUpWithEmailAndPassword, verifyEmail } from '../utils'
+
+test('should sign up with email and password', async ({ page, context }) => {
+  page.goto('/')
+
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const authenticatedPage = await verifyEmail({ page, context, email })
+  await expect(authenticatedPage.getByText(/you are authenticated/i)).toBeVisible()
+})
+
+test('should raise an error when trying to sign up with an existing email', async ({ page }) => {
+  page.goto('/')
+
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  // close modal
+  await page.getByRole('dialog').getByRole('button').click()
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/email already in use/i)).toBeVisible()
+})
+
+test('should fail when network is not available', async ({ page }) => {
+  await page.goto('/')
+
+  const email = faker.internet.email()
+  const password = faker.internet.password()
+
+  await page.route('**', (route) => route.abort('internetdisconnected'))
+  await signUpWithEmailAndPassword({ page, email, password })
+
+  await expect(page.getByText(/network error/i)).toBeVisible()
+})

examples/react-apollo/e2e/sign-up/email-passwordless.test.ts

@@ -0,0 +1,27 @@
+import { faker } from '@faker-js/faker'
+import { expect, test } from '@playwright/test'
+import { signUpWithEmailPasswordless, verifyMagicLink } from '../utils'
+
+test('should sign up with a magic link', async ({ page, context }) => {
+  page.goto('/')
+
+  const email = faker.internet.email()
+
+  await signUpWithEmailPasswordless({ page, email })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  const authenticatedPage = await verifyMagicLink({ page, context, email })
+  await authenticatedPage.getByRole('button', { name: /home/i }).click()
+  await expect(authenticatedPage.getByText(/you are authenticated/i)).toBeVisible()
+})
+
+test('should fail when network is not available', async ({ page }) => {
+  await page.goto('/')
+
+  const email = faker.internet.email()
+
+  await page.route('**', (route) => route.abort('internetdisconnected'))
+  await signUpWithEmailPasswordless({ page, email })
+
+  await expect(page.getByText(/network error/i)).toBeVisible()
+})

examples/react-apollo/e2e/unauthenticated/authentication-guards.test.ts

@@ -0,0 +1,14 @@
+import { expect, test } from '@playwright/test'
+import { baseURL } from '../config'
+
+test('should redirect to /sign-in when not authenticated', async ({ page }) => {
+  await page.goto(`${baseURL}`)
+  await page.waitForURL(`${baseURL}/sign-in`)
+
+  await expect(page.getByText(/sign in to the application/i)).toBeVisible()
+
+  await page.goto(`${baseURL}/apollo`)
+  await page.waitForURL(`${baseURL}/sign-in`)
+
+  await expect(page.getByText(/sign in to the application/i)).toBeVisible()
+})

examples/react-apollo/e2e/unauthenticated/forgot-password.test.ts

@@ -0,0 +1,28 @@
+import { faker } from '@faker-js/faker'
+import { expect, test } from '@playwright/test'
+import { baseURL } from '../config'
+import { resetPassword, signUpWithEmailAndPassword } from '../utils'
+
+test('should reset password', async ({ page, context }) => {
+  await page.goto('/')
+
+  const email = faker.internet.email()
+  const password = faker.internet.password(8)
+
+  await signUpWithEmailAndPassword({ page, email, password })
+  await expect(page.getByText(/verification email sent/i)).toBeVisible()
+
+  await page.goto(`${baseURL}/sign-in`)
+  await page.getByRole('button', { name: /continue with email \+ password/i }).click()
+  await page.getByRole('button', { name: /forgot password?/i }).click()
+
+  await page.getByPlaceholder('Email Address').type(email)
+  await page.getByRole('button', { name: /reset your password/i }).click()
+
+  const authenticatedPage = await resetPassword({ page, context, email })
+
+  await authenticatedPage.waitForLoadState()
+  await authenticatedPage.getByRole('button', { name: /profile/i }).click()
+
+  await expect(authenticatedPage.getByText(/profile page/i)).toBeVisible()
+})

examples/react-apollo/e2e/utils.ts

@@ -0,0 +1,265 @@
+import { faker } from '@faker-js/faker'
+import type { User } from '@nhost/react'
+import type { BrowserContext, Page } from '@playwright/test'
+import jsQR from 'jsqr'
+import { PNG } from 'pngjs'
+import { baseURL, mailhogURL } from './config'
+
+/**
+ * Returns the user data from the profile page.
+ *
+ * @param page - The page to get the user data from.
+ * @returns The user data.
+ */
+export async function getUserData(page: Page) {
+  const textContent = await page.locator('h1:has-text("User information") + div pre').textContent()
+  const userData = textContent ? JSON.parse(textContent) : {}
+
+  return userData as User
+}
+
+/**
+ * Returns a promise that resolves when the sign up flow is completed.
+ *
+ * @param page - The page to sign up with.
+ * @param email - The email address to sign up with.
+ * @param password - The password to sign up with.
+ */
+export async function signUpWithEmailAndPassword({
+  page,
+  email,
+  password
+}: {
+  page: Page
+  email: string
+  password: string
+}) {
+  await page.getByRole('button', { name: /home/i }).click()
+  await page.getByRole('link', { name: /sign up/i }).click()
+  await page.getByRole('button', { name: /continue with email \+ password/i }).click()
+  await page.getByPlaceholder(/first name/i).type(faker.name.firstName())
+  await page.getByPlaceholder(/last name/i).type(faker.name.lastName())
+  await page.getByPlaceholder(/email address/i).type(email)
+  await page.getByPlaceholder(/^password$/i).type(password)
+  await page.getByPlaceholder(/confirm password/i).type(password)
+  await page.getByRole('button', { name: /continue with email \+ password/i }).click()
+}
+
+/**
+ * Returns a promise that resolves when the sign in flow is completed.
+ *
+ * @param page - The page to sign in with.
+ * @param email - The email address to sign in with.
+ * @param password - The password to sign in with.
+ */
+export async function signInWithEmailAndPassword({
+  page,
+  email,
+  password
+}: {
+  page: Page
+  email: string
+  password: string
+}) {
+  await page.getByRole('button', { name: /home/i }).click()
+  await page.getByRole('button', { name: /continue with email \+ password/i }).click()
+  await page.getByPlaceholder(/email address/i).type(email)
+  await page.getByPlaceholder(/password/i).type(password)
+  await page.getByRole('button', { name: /sign in/i }).click()
+}
+
+/**
+ * Returns a promise that resolves when the sign in flow is completed.
+ *
+ * @param page - The page to sign in with.
+ */
+export async function signInAnonymously({ page }: { page: Page }) {
+  await page.getByRole('button', { name: /home/i }).click()
+  await page.getByRole('link', { name: /sign in anonymously/i }).click()
+  await page.waitForURL(baseURL)
+}
+
+/**
+ * Returns a promise that resolves when the sign up flow is completed.
+ *
+ * @param page - The page to sign up with.
+ * @param email - The email address to sign up with.
+ */
+export async function signUpWithEmailPasswordless({ page, email }: { page: Page; email: string }) {
+  await page.getByRole('button', { name: /home/i }).click()
+  await page.getByRole('link', { name: /sign up/i }).click()
+  await page.getByRole('button', { name: /continue with a magic link/i }).click()
+  await page.getByPlaceholder(/email address/i).fill(email)
+  await page.getByRole('button', { name: /continue with email/i }).click()
+}
+
+/**
+ * Returns a promise that resolves to a new page that is opened after clicking
+ * the magic link in the email.
+ *
+ * @param email - The email address to reset the password for.
+ * @param page - The page to click the magic link in.
+ * @param context - The browser context.
+ * @returns A promise that resolves to a new page.
+ */
+export async function verifyMagicLink({
+  email,
+  page,
+  context
+}: {
+  email: string
+  page: Page
+  context: BrowserContext
+}) {
+  await page.goto(mailhogURL)
+  await page.locator('.messages > .msglist-message', { hasText: email }).nth(0).click()
+
+  // Based on: https://playwright.dev/docs/pages#handling-new-pages
+  const authenticatedPagePromise = context.waitForEvent('page')
+
+  await page
+    .frameLocator('#preview-html')
+    .getByRole('link', { name: /sign in/i })
+    .click()
+
+  const authenticatedPage = await authenticatedPagePromise
+  await authenticatedPage.waitForLoadState()
+
+  return authenticatedPage
+}
+
+/**
+ * Returns a promise that resolves to a new page that is opened after clicking
+ * the reset password link in the email.
+ *
+ * @param email - The email address to reset the password for.
+ * @param page - The page to click the reset password link in.
+ * @param context - The browser context.
+ * @returns A promise that resolves to a new page.
+ */
+export async function resetPassword({
+  email,
+  page,
+  context
+}: {
+  email: string
+  page: Page
+  context: BrowserContext
+}) {
+  await page.goto(mailhogURL)
+  await page.locator('.messages > .msglist-message', { hasText: email }).nth(0).click()
+
+  // Based on: https://playwright.dev/docs/pages#handling-new-pages
+  const authenticatedPagePromise = context.waitForEvent('page')
+
+  await page
+    .frameLocator('#preview-html')
+    .getByRole('link', { name: /reset password/i })
+    .click()
+
+  const authenticatedPage = await authenticatedPagePromise
+  await authenticatedPage.waitForLoadState()
+
+  return authenticatedPage
+}
+
+/**
+ * Returns a promise that resolves to a new page that is opened after clicking
+ * the verify email link in the email.
+ *
+ * @param email - The email address to verify.
+ * @param page - The page to click the verify email link in.
+ * @param context - The browser context.
+ * @param linkText - The text of the link to click.
+ * @returns A promise that resolves to a new page.
+ */
+export async function verifyEmail({
+  email,
+  page,
+  context,
+  linkText = /verify email/i
+}: {
+  email: string
+  page: Page
+  context: BrowserContext
+  linkText?: string | RegExp
+}) {
+  await page.goto(mailhogURL)
+  await page.locator('.messages > .msglist-message', { hasText: email }).nth(0).click()
+
+  // Based on: https://playwright.dev/docs/pages#handling-new-pages
+  const authenticatedPagePromise = context.waitForEvent('page')
+
+  await page.frameLocator('#preview-html').getByRole('link', { name: linkText }).click()
+
+  const authenticatedPage = await authenticatedPagePromise
+  await authenticatedPage.waitForLoadState()
+
+  return authenticatedPage
+}
+
+/**
+ * Returns decoded data from a QR code.
+ *
+ * @param base64String - The base64 encoded string of the QR code.
+ * @returns The decoded data.
+ */
+export function decodeQRCode(base64String?: string | null) {
+  if (!base64String) {
+    return {
+      secret: '',
+      algorithm: '',
+      digits: '',
+      period: ''
+    }
+  }
+
+  const buffer = Buffer.from(base64String.replace('data:image/png;base64,', ''), 'base64')
+  const pngData = PNG.sync.read(buffer)
+
+  const decoded = jsQR(Uint8ClampedArray.from(pngData.data), pngData.width, pngData.height)
+  const params = decoded?.data?.split('?').at(-1)
+
+  // note: we are decoding MFA here
+  const { secret, algorithm, digits, period } = Object.fromEntries(new URLSearchParams(params))
+
+  return { secret, algorithm, digits, period }
+}
+
+/**
+ * Clears the local and session storage for a page.
+ *
+ * @param page - The page to clear the storage for.
+ */
+export async function clearStorage({ page }: { page: Page }) {
+  await page.evaluate(() => {
+    localStorage.clear()
+    sessionStorage.clear()
+  })
+}
+
+/**
+ * Returns a promise that resolves to the value of a key in local storage.
+ *
+ * @param page - The page to get the value from.
+ * @param origin - The origin of the local storage.
+ * @param key - The key to get the value for.
+ * @returns The value of the key in local storage.
+ */
+export async function getValueFromLocalStorage({
+  page,
+  origin: externalOrigin,
+  key
+}: {
+  page: Page
+  origin: string
+  key: string
+}) {
+  const storageState = await page.context().storageState()
+  const localStorage = storageState.origins.find(
+    ({ origin }) => origin === externalOrigin
+  )?.localStorage
+  const value = localStorage?.find(({ name }) => name === key)?.value
+
+  return value || null
+}

examples/react-apollo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost-examples/react-apollo",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "private": true,
   "dependencies": {
     "@apollo/client": "^3.6.9",
@@ -22,11 +22,10 @@
   "scripts": {
     "dev": "vite --host localhost --port 3000",
     "generate": "graphql-codegen --config graphql.config.yaml",
-    "cypress": "cypress open",
-    "e2e": "start-test e2e:backend http-get://localhost:9695 e2e:frontend 3000 e2e:test",
-    "e2e:test": "cypress run",
-    "e2e:backend": "nhost dev --no-browser",
-    "e2e:frontend": "run-s build preview",
+    "e2e": "start-test e2e:start-backend http-get://localhost:9695 e2e:test",
+    "e2e:test": "npx playwright@1.31.2 install --with-deps && playwright test",
+    "e2e:start-backend": "nhost dev --no-browser",
+    "e2e:start-ui": "run-s build preview",
     "build": "vite build",
     "preview": "vite preview --host localhost --port 3000",
     "prettier": "prettier --check .",
@@ -52,14 +51,16 @@
     "@faker-js/faker": "^7.6.0",
     "@graphql-codegen/cli": "^2.12.0",
     "@nuintun/qrcode": "^3.3.0",
-    "@testing-library/cypress": "^8.0.3",
+    "@playwright/test": "^1.31.2",
+    "@types/pngjs": "^6.0.1",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.9",
     "@types/totp-generator": "^0.0.4",
     "@vitejs/plugin-react": "^3.0.0",
     "@xstate/inspect": "^0.6.2",
-    "cypress": "^10.7.0",
-    "cypress-mailhog": "^1.6.0",
+    "dotenv": "^16.0.3",
+    "jsqr": "^1.4.0",
+    "pngjs": "^7.0.0",
     "start-server-and-test": "^1.15.2",
     "totp-generator": "^0.0.13",
     "typescript": "^4.8.2",

examples/react-apollo/playwright.config.ts

@@ -0,0 +1,32 @@
+import { defineConfig, devices } from '@playwright/test'
+
+import dotenv from 'dotenv'
+import path from 'path'
+
+dotenv.config({ path: path.resolve(__dirname, '.env.test') })
+
+export default defineConfig({
+  testDir: './e2e',
+  timeout: 30 * 1000,
+  expect: {
+    timeout: 5000
+  },
+  webServer: {
+    command: 'pnpm e2e:start-ui',
+    port: 3000
+  },
+  use: {
+    baseURL: 'http://localhost:3000'
+  },
+  fullyParallel: true,
+  forbidOnly: !!process.env.CI,
+  retries: process.env.CI ? 2 : 0,
+  workers: process.env.CI ? 1 : undefined,
+  reporter: 'html',
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] }
+    }
+  ]
+})

examples/react-apollo/src/main.tsx

@@ -14,7 +14,7 @@ if (devTools) {
 }
 
 const nhost = new NhostClient({
-  subdomain: import.meta.env.VITE_NHOST_SUBDOMAIN || 'localhost',
+  subdomain: import.meta.env.VITE_NHOST_SUBDOMAIN || 'local',
   region: import.meta.env.VITE_NHOST_REGION,
   devTools
 })

examples/react-apollo/tsconfig.json

@@ -15,8 +15,8 @@
     "resolveJsonModule": true,
     "isolatedModules": false,
     "noEmit": true,
-    "types": ["node", "cypress", "@testing-library/cypress"],
+    "types": ["node"],
     "jsx": "react-jsx"
   },
-  "include": ["src", "cypress", "cypress.config.ts"]
+  "include": ["src"]
 }

integrations/apollo/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @nhost/apollo
 
+## 5.1.3
+
+### Patch Changes
+
+- @nhost/nhost-js@2.1.2
+
+## 5.1.2
+
+### Patch Changes
+
+- 912ed76c: fix(apollo): retry subscriptions on error
+
 ## 5.1.1
 
 ### Patch Changes

integrations/apollo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/apollo",
-  "version": "5.1.1",
+  "version": "5.1.3",
   "description": "Nhost Apollo Client library",
   "license": "MIT",
   "keywords": [
@@ -59,15 +59,15 @@
     "verify:fix": "run-p prettier:fix lint:fix"
   },
   "peerDependencies": {
-    "@nhost/nhost-js": "workspace:*",
-    "@apollo/client": "^3.6.2"
+    "@apollo/client": "^3.7.10",
+    "@nhost/nhost-js": "workspace:*"
   },
   "dependencies": {
     "graphql": "16.6.0",
     "graphql-ws": "^5.10.1"
   },
   "devDependencies": {
-    "@nhost/nhost-js": "workspace:*",
-    "@apollo/client": "^3.7.3"
+    "@apollo/client": "^3.7.10",
+    "@nhost/nhost-js": "workspace:*"
   }
 }

integrations/apollo/src/index.ts

@@ -1,6 +1,5 @@
 import {
   ApolloClient,
-  ApolloClientOptions,
   createHttpLink,
   from,
   InMemoryCache,
@@ -38,16 +37,19 @@ export const createApolloClient = ({
   connectToDevTools = isBrowser && process.env.NODE_ENV === 'development',
   onError,
   link: customLink
-}: NhostApolloClientOptions): ApolloClient<any> => {
-  let backendUrl = graphqlUrl || nhost?.graphql.getUrl()
+}: NhostApolloClientOptions) => {
+  const backendUrl = graphqlUrl || nhost?.graphql.httpUrl
+
   if (!backendUrl) {
     throw Error("Can't initialize the Apollo Client: no backend Url has been provided")
   }
+
+  const uri = backendUrl
   const interpreter = nhost?.auth.client.interpreter
 
   let token: string | null = null
 
-  const getAuthHeaders = () => {
+  function getAuthHeaders() {
     // add headers
     const resHeaders = {
       ...headers,
@@ -66,33 +68,28 @@ export const createApolloClient = ({
     return resHeaders
   }
 
-  const uri = backendUrl
-
-  const wsClient =
-    isBrowser &&
-    createRestartableClient({
-      url: uri.startsWith('https') ? uri.replace(/^https/, 'wss') : uri.replace(/^http/, 'ws'),
-      connectionParams: () => ({
-        headers: {
-          ...headers,
-          ...getAuthHeaders()
-        }
+  const wsClient = isBrowser
+    ? createRestartableClient({
+        url: uri.startsWith('https') ? uri.replace(/^https/, 'wss') : uri.replace(/^http/, 'ws'),
+        shouldRetry: () => true,
+        retryAttempts: 10,
+        connectionParams: () => ({
+          headers: {
+            ...headers,
+            ...getAuthHeaders()
+          }
+        })
       })
-    })
-  const wsLink = wsClient && new GraphQLWsLink(wsClient)
+    : null
 
-  const httpLink = setContext((_, { headers }) => {
-    return {
-      headers: {
-        ...headers,
-        ...getAuthHeaders()
-      }
+  const wsLink = wsClient ? new GraphQLWsLink(wsClient) : null
+
+  const httpLink = setContext((_, { headers }) => ({
+    headers: {
+      ...headers,
+      ...getAuthHeaders()
     }
-  }).concat(
-    createHttpLink({
-      uri
-    })
-  )
+  })).concat(createHttpLink({ uri }))
 
   const link = wsLink
     ? split(
@@ -112,7 +109,7 @@ export const createApolloClient = ({
       )
     : httpLink
 
-  const apolloClientOptions: ApolloClientOptions<any> = {
+  const client = new ApolloClient({
     cache: cache || new InMemoryCache(),
     ssrMode: !isBrowser,
     defaultOptions: {
@@ -120,34 +117,35 @@ export const createApolloClient = ({
         fetchPolicy
       }
     },
-    connectToDevTools
-  }
-
-  // add link
-  if (customLink) {
-    apolloClientOptions.link = from([customLink])
-  } else {
-    apolloClientOptions.link = typeof onError === 'function' ? from([onError, link]) : from([link])
-  }
-
-  const client = new ApolloClient(apolloClientOptions)
+    connectToDevTools,
+    link: customLink
+      ? from([customLink])
+      : from(typeof onError === 'function' ? [onError, link] : [link])
+  })
 
   interpreter?.onTransition(async (state, event) => {
     if (['SIGNOUT', 'SIGNED_IN', 'TOKEN_CHANGED'].includes(event.type)) {
-      const newToken = state.context.accessToken.value
-      token = newToken
       if (event.type === 'SIGNOUT') {
+        token = null
+
         try {
           await client.resetStore()
         } catch (error) {
           console.error('Error resetting Apollo client cache')
           console.error(error)
         }
-      } else {
-        if (isBrowser && wsClient && wsClient.started()) {
-          wsClient.restart()
-        }
+
+        return
       }
+
+      // update token
+      token = state.context.accessToken.value
+
+      if (!isBrowser) {
+        return
+      }
+
+      wsClient?.restart()
     }
   })
 

integrations/apollo/src/ws.ts

@@ -3,7 +3,6 @@ import { Client, ClientOptions, createClient } from 'graphql-ws'
 
 export interface RestartableClient extends Client {
   restart(): void
-  started(): boolean
 }
 
 export function createRestartableClient(options: ClientOptions): RestartableClient {
@@ -11,18 +10,41 @@ export function createRestartableClient(options: ClientOptions): RestartableClie
   let restart = () => {
     restartRequested = true
   }
-  let _started = false
-  const started = () => _started
+  let socket: WebSocket
+  let timedOut: NodeJS.Timeout
 
   const client = createClient({
     ...options,
     on: {
       ...options.on,
-      connected: () => {
-        _started = true
+      error: (error) => {
+        console.error(error)
+        options.on?.error?.(error)
+
+        restart()
+      },
+      ping: (received) => {
+        if (!received /* sent */) {
+          timedOut = setTimeout(() => {
+            // a close event `4499: Terminated` is issued to the current WebSocket and an
+            // artificial `{ code: 4499, reason: 'Terminated', wasClean: false }` close-event-like
+            // object is immediately emitted without waiting for the one coming from `WebSocket.onclose`
+            //
+            // calling terminate is not considered fatal and a connection retry will occur as expected
+            //
+            // see: https://github.com/enisdenjo/graphql-ws/discussions/290
+            client.terminate()
+            restart()
+          }, 5_000)
+        }
+      },
+      pong: (received) => {
+        if (received) {
+          clearTimeout(timedOut)
+        }
       },
       opened: (originalSocket) => {
-        const socket = originalSocket as WebSocket
+        socket = originalSocket as WebSocket
         options.on?.opened?.(socket)
 
         restart = () => {
@@ -47,7 +69,6 @@ export function createRestartableClient(options: ClientOptions): RestartableClie
 
   return {
     ...client,
-    restart: () => restart(),
-    started
+    restart: () => restart()
   }
 }

integrations/react-apollo/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @nhost/react-apollo
 
+## 5.0.14
+
+### Patch Changes
+
+- @nhost/apollo@5.1.3
+- @nhost/react@2.0.12
+
+## 5.0.13
+
+### Patch Changes
+
+- 912ed76c: fix(apollo): retry subscriptions on error
+- Updated dependencies [912ed76c]
+  - @nhost/apollo@5.1.2
+
 ## 5.0.12
 
 ### Patch Changes

integrations/react-apollo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/react-apollo",
-  "version": "5.0.12",
+  "version": "5.0.14",
   "description": "Nhost React Apollo client",
   "license": "MIT",
   "keywords": [
@@ -63,14 +63,14 @@
     "@nhost/apollo": "workspace:*"
   },
   "peerDependencies": {
-    "@apollo/client": "^3.6.2",
+    "@apollo/client": "^3.7.10",
     "@nhost/react": "workspace:*",
     "graphql": "^16.0.0",
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0"
   },
   "devDependencies": {
-    "@apollo/client": "^3.7.1",
+    "@apollo/client": "^3.7.10",
     "@nhost/react": "workspace:*",
     "@types/react": "^18.0.25",
     "graphql": "16.6.0",

integrations/react-apollo/src/hooks.tsx

@@ -9,7 +9,10 @@ import {
 } from '@apollo/client'
 import { useAuthenticated } from '@nhost/react'
 
-export function useAuthQuery<TData = any, TVariables = OperationVariables>(
+export function useAuthQuery<
+  TData = any,
+  TVariables extends OperationVariables = OperationVariables
+>(
   query: DocumentNode | TypedDocumentNode<TData, TVariables>,
   options?: QueryHookOptions<TData, TVariables>
 ) {
@@ -18,7 +21,10 @@ export function useAuthQuery<TData = any, TVariables = OperationVariables>(
   return useQuery(query, newOptions)
 }
 
-export function useAuthSubscription<TData = any, TVariables = OperationVariables>(
+export function useAuthSubscription<
+  TData = any,
+  TVariables extends OperationVariables = OperationVariables
+>(
   subscription: DocumentNode | TypedDocumentNode<TData, TVariables>,
   options?: SubscriptionHookOptions<TData, TVariables>
 ) {

integrations/react-apollo/src/provider.tsx

@@ -22,9 +22,7 @@ export const NhostApolloProvider: React.FC<PropsWithChildren<NhostApolloClientOp
     if (!client) {
       setClient(createApolloClient(options))
     }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
+  }, [client, options])
 
   return <ApolloProvider client={client || mockApolloClient}>{children}</ApolloProvider>
 }

integrations/react-urql/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @nhost/react-urql
 
+## 2.0.12
+
+### Patch Changes
+
+- @nhost/react@2.0.12
+
 ## 2.0.11
 
 ### Patch Changes

integrations/react-urql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/react-urql",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "description": "Nhost React URQL client",
   "license": "MIT",
   "keywords": [

package.json

@@ -37,6 +37,7 @@
     "test": "turbo run test --filter=!@nhost/dashboard --filter=!@nhost/docs --filter=!@nhost-examples/* --no-deps --include-dependencies",
     "test:all": "turbo run test",
     "test:dashboard": "turbo run test --filter=@nhost/dashboard",
+    "e2e:dashboard": "turbo run e2e --filter=@nhost/dashboard",
     "e2e": "turbo run e2e --concurrency=1",
     "changeset": "changeset",
     "docgen": "turbo run build --filter=@nhost/docgen --no-deps && pnpm i && turbo run docgen --filter=!@nhost/docgen --filter=@nhost/* && :",
@@ -64,7 +65,6 @@
     "@vitest/coverage-c8": "^0.29.0",
     "eslint": "^8.26.0",
     "eslint-config-react-app": "^7.0.1",
-    "eslint-plugin-cypress": "^2.12.1",
     "eslint-plugin-flowtype": "^8.0.3",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jsx-a11y": "^6.6.1",
@@ -76,7 +76,7 @@
     "husky": "^8.0.1",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
-    "turbo": "1.8.3",
+    "turbo": "1.8.5",
     "typedoc": "^0.22.18",
     "typescript": "4.9.5",
     "vite": "^4.0.2",

packages/hasura-storage-js/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @nhost/hasura-storage-js
 
+## 2.0.5
+
+### Patch Changes
+
+- 43c86fef: chore: improve presignedUrl test
+
 ## 2.0.4
 
 ### Patch Changes

packages/hasura-storage-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/hasura-storage-js",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Hasura-storage client",
   "license": "MIT",
   "keywords": [
@@ -66,6 +66,7 @@
   },
   "devDependencies": {
     "@nhost/docgen": "workspace:*",
+    "@types/uuid": "^9.0.1",
     "jpeg-js": "^0.4.4",
     "pixelmatch": "^5.3.0",
     "start-server-and-test": "^1.15.2",

packages/hasura-storage-js/tests/get-presigned-url.test.ts

@@ -1,24 +1,27 @@
-import fs from 'fs'
-import { describe, expect, it } from 'vitest'
-import { v4 as uuidv4 } from 'uuid'
-
-import { storage } from './utils/helpers'
 import FormData from 'form-data'
+import fs from 'fs'
+import fetch from 'isomorphic-unfetch'
+import { v4 as uuidv4 } from 'uuid'
+import { describe, expect, it } from 'vitest'
+import { storage } from './utils/helpers'
 
 describe('test get presigned url of file', () => {
   it('should be able to get presigned url of file', async () => {
-    const fd = new FormData()
-    fd.append('file', fs.createReadStream('./tests/assets/sample.pdf'))
+    const formData = new FormData()
+    formData.append('file', fs.createReadStream('./tests/assets/sample.pdf'))
 
-    const { fileMetadata } = await storage.upload({
-      formData: fd
-    })
+    const { fileMetadata } = await storage.upload({ formData })
 
-    const { error } = await storage.getPresignedUrl({
+    const { presignedUrl, error } = await storage.getPresignedUrl({
       fileId: fileMetadata?.id as string
     })
 
+    expect(presignedUrl).not.toBeNull()
     expect(error).toBeNull()
+
+    const imageResponse = await fetch(presignedUrl!.url)
+
+    expect(imageResponse.ok).toBeTruthy()
   })
 
   it('should fail to get presigned url of file that does not exist', async () => {

packages/nextjs/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @nhost/nextjs
 
+## 1.13.18
+
+### Patch Changes
+
+- @nhost/react@2.0.12
+
 ## 1.13.17
 
 ### Patch Changes

packages/nextjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/nextjs",
-  "version": "1.13.17",
+  "version": "1.13.18",
   "description": "Nhost NextJS library",
   "license": "MIT",
   "keywords": [

packages/nhost-js/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @nhost/nhost-js
 
+## 2.1.2
+
+### Patch Changes
+
+- Updated dependencies [43c86fef]
+  - @nhost/hasura-storage-js@2.0.5
+
 ## 2.1.1
 
 ### Patch Changes

packages/nhost-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/nhost-js",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Nhost JavaScript SDK",
   "license": "MIT",
   "keywords": [

packages/react/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @nhost/react
 
+## 2.0.12
+
+### Patch Changes
+
+- @nhost/nhost-js@2.1.2
+
 ## 2.0.11
 
 ### Patch Changes

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/react",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "description": "Nhost React library",
   "license": "MIT",
   "keywords": [

packages/react/src/components/SignedIn.tsx

@@ -7,7 +7,7 @@ import { useAuthenticationStatus } from '../useAuthenticationStatus'
  *
  * @example
  * ```tsx
- * import { NhostProvider, SignedOut } from "@nhost/react";
+ * import { NhostProvider, SignedIn } from "@nhost/react";
  * import { nhost } from '@/utils/nhost';
  *
  * function Page() {

packages/sync-versions/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @nhost/sync-versions
 
+## 0.0.7
+
+### Patch Changes
+
+- 4713cecf: chore(deps): bump `@pnpm/find-workspace-dir` to v6
+
 ## 0.0.6
 
 ### Patch Changes

packages/sync-versions/package.json

@@ -2,7 +2,7 @@
   "name": "@nhost/sync-versions",
   "description": "Sync the versions of Nhost services in each of the packages of a pnpm workspace",
   "private": true,
-  "version": "0.0.6",
+  "version": "0.0.7",
   "license": "MIT",
   "main": "dist/index.cjs.js",
   "types": "dist/index.d.ts",
@@ -33,7 +33,7 @@
     "typescript": "^4.8.4"
   },
   "dependencies": {
-    "@pnpm/find-workspace-dir": "^5.0.0",
+    "@pnpm/find-workspace-dir": "^6.0.0",
     "glob": "^9.0.0",
     "object-path": "^0.11.8",
     "yaml": "^2.1.1"

packages/vue/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @nhost/vue
 
+## 1.13.18
+
+### Patch Changes
+
+- @nhost/nhost-js@2.1.2
+
 ## 1.13.17
 
 ### Patch Changes

packages/vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nhost/vue",
-  "version": "1.13.17",
+  "version": "1.13.18",
   "description": "Nhost Vue library",
   "license": "MIT",
   "keywords": [