Address review comments

Author: onurtemizkan

dev-packages/e2e-tests/test-applications/supabase-nextjs/lib/initSupabaseAdmin.ts

@@ -6,14 +6,16 @@ const NEXT_PUBLIC_SUPABASE_URL = 'http://localhost:54321';
 const SUPABASE_SERVICE_ROLE_KEY =
   'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJzdJsyH-qQwv8Hdp7fsn3W0YpN81IU';
 
-export const supabaseClient = createClient(NEXT_PUBLIC_SUPABASE_URL, SUPABASE_SERVICE_ROLE_KEY, {
-  auth: {
-    persistSession: false,
-    autoRefreshToken: false,
-    detectSessionInUrl: false,
-  },
-});
+export const getSupabaseClient = () => {
+  const supabaseClient = createClient(NEXT_PUBLIC_SUPABASE_URL, SUPABASE_SERVICE_ROLE_KEY, {
+    auth: {
+      persistSession: false,
+      autoRefreshToken: false,
+      detectSessionInUrl: false,
+    },
+  });
 
-Sentry.addIntegration(
-  Sentry.supabaseIntegration(supabaseClient),
-);
+  Sentry.addIntegration(Sentry.supabaseIntegration(supabaseClient));
+
+  return supabaseClient;
+};

dev-packages/e2e-tests/test-applications/supabase-nextjs/lib/initSupabaseAnon.ts

@@ -6,6 +6,9 @@ const NEXT_PUBLIC_SUPABASE_URL = 'http://localhost:54321';
 const NEXT_PUBLIC_SUPABASE_ANON_KEY =
   'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImV4cGxvcmV0ZXN0Iiwicm9sZSI6ImFub24iLCJpYXQiOjE2';
 
-export const supabaseClient = createClient(NEXT_PUBLIC_SUPABASE_URL, NEXT_PUBLIC_SUPABASE_ANON_KEY);
+export const getSupabaseClient = () => {
+  const supabaseClient = createClient(NEXT_PUBLIC_SUPABASE_URL, NEXT_PUBLIC_SUPABASE_ANON_KEY);
+  Sentry.addIntegration(Sentry.supabaseIntegration(supabaseClient));
 
-Sentry.addIntegration(Sentry.supabaseIntegration(supabaseClient));
+  return supabaseClient;
+};

dev-packages/e2e-tests/test-applications/supabase-nextjs/package.json

@@ -7,7 +7,7 @@
     "build": "next build",
     "start": "next start",
     "clean": "npx rimraf node_modules pnpm-lock.yaml .next",
-    "start-local-supabase": "supabase init --force --workdir . && supabase start -o env",
+    "start-local-supabase": "supabase init --force --workdir . && supabase start -o env && supabase db reset",
     "test:prod": "TEST_ENV=production playwright test",
     "test:build": "pnpm install && pnpm start-local-supabase && pnpm build",
     "test:assert": "pnpm test:prod"

dev-packages/e2e-tests/test-applications/supabase-nextjs/pages/_app.tsx

@@ -1,7 +1,9 @@
-import { supabaseClient } from '@/lib/initSupabaseAnon'
+import { getSupabaseClient } from '@/lib/initSupabaseAnon'
 import { SessionContextProvider } from '@supabase/auth-helpers-react'
 import type { AppProps } from 'next/app'
 
+const supabaseClient = getSupabaseClient()
+
 export default function App({ Component, pageProps }: AppProps) {
   return (
     <SessionContextProvider supabaseClient={supabaseClient}>

dev-packages/e2e-tests/test-applications/supabase-nextjs/pages/api/add-todo-entry.ts

@@ -1,12 +1,13 @@
-// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import type { NextApiRequest, NextApiResponse } from 'next';
-import { supabaseClient } from '@/lib/initSupabaseAdmin';
+import { getSupabaseClient } from '@/lib/initSupabaseAdmin';
 
 type Data = {
   data: any;
   error: any;
 };
 
+const supabaseClient = getSupabaseClient();
+
 async function login() {
   const { data, error } = await supabaseClient.auth.signInWithPassword({
     email: '[email protected]',

dev-packages/e2e-tests/test-applications/supabase-nextjs/pages/api/create-test-user.ts

@@ -1,30 +1,28 @@
-// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import type { NextApiRequest, NextApiResponse } from 'next';
-import { supabaseClient } from '@/lib/initSupabaseAdmin';
+import { getSupabaseClient } from '@/lib/initSupabaseAdmin';
+import * as Sentry from '@sentry/nextjs';
 
 type Data = {
   data: any;
   error: any;
 };
 
-async function deleteExistingUsers() {
-  const { data: { users }, error } = await supabaseClient.auth.admin.listUsers()
-
-  for (const user of users) {
-    const { error } = await supabaseClient.auth.admin.deleteUser(user.id, true);
-    if (error) console.log('error', error);
-  }
-}
+const supabaseClient = getSupabaseClient();
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<Data>) {
-  await deleteExistingUsers();
-
+  // Note for test usage
+  // This only works once in tests as it will error if the user already exists
+  // So this should be called only once before all tests to create the user
   const { data, error } = await supabaseClient.auth.admin.createUser({
     email: '[email protected]',
     password: 'sentry.test',
     email_confirm: true,
   });
 
+  if (error) {
+    console.warn('ERROR', error);
+  }
+
   res.status(200).json({
     data,
     error,

dev-packages/e2e-tests/test-applications/supabase-nextjs/pages/api/list-users.ts

@@ -0,0 +1,23 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { getSupabaseClient } from '@/lib/initSupabaseAdmin';
+import * as Sentry from '@sentry/nextjs';
+
+type Data = {
+  data: any;
+  error: any;
+};
+
+const supabaseClient = getSupabaseClient();
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse<Data>) {
+  const { data, error } = await supabaseClient.auth.admin.listUsers();
+
+  if (error) {
+    console.warn('ERROR', error);
+  }
+
+  res.status(200).json({
+    data,
+    error,
+   });
+}

dev-packages/e2e-tests/test-applications/supabase-nextjs/sentry.server.config.ts

@@ -2,7 +2,7 @@
 // The config you add here will be used whenever the server handles a request.
 // https://docs.sentry.io/platforms/javascript/guides/nextjs/
 
-import * as Sentry from "@sentry/nextjs";
+import * as Sentry from '@sentry/nextjs';
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',

dev-packages/e2e-tests/test-applications/supabase-nextjs/supabase/seed.sql

@@ -0,0 +1,2 @@
+TRUNCATE auth.users CASCADE;
+TRUNCATE auth.identities CASCADE;