wip

Author: jgoux

apps/postgres-new/app/api/deploy/route.ts

@@ -3,7 +3,7 @@ import { NextResponse } from 'next/server'
 
 const supabase = createClient()
 
-export async function POST(req: Request) {
+export async function GET(req: Request) {
   const { data, error } = await supabase.auth.getUser()
 
   // We have middleware, so this should never happen (used for type narrowing)

apps/postgres-new/app/api/oauth/callback/route.ts

@@ -0,0 +1,47 @@
+import { createClient } from '~/utils/supabase/server'
+import { NextRequest, NextResponse } from 'next/server'
+import { env } from 'process'
+
+const supabase = createClient()
+
+export async function GET(req: NextRequest) {
+  const { data, error } = await supabase.auth.getUser()
+  console.log({ data, error })
+  // We have middleware, so this should never happen (used for type narrowing)
+  if (error) {
+    return new Response('Unauthorized', { status: 401 })
+  }
+
+  const { user } = data
+
+  console.log(req.nextUrl.searchParams)
+
+  const code = req.nextUrl.searchParams.get('code') as string | null
+
+  if (!code) {
+    return new Response('No code provided', { status: 400 })
+  }
+
+  const tokensResponse = await fetch('https://api.supabase.com/v1/oauth/token', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+      Accept: 'application/json',
+      Authorization: `Basic ${btoa(`${process.env.NEXT_PUBLIC_SUPABASE_OAUTH_CLIENT_ID}:${process.env.SUPABASE_OAUTH_SECRET}`)}`,
+    },
+    body: new URLSearchParams({
+      grant_type: 'authorization_code',
+      code,
+      redirect_uri: req.nextUrl.origin + '/api/oauth/callback',
+    }),
+  })
+
+  const tokens = (await tokensResponse.json()) as {
+    access_token: string
+    refresh_token: string
+    expires_in: number
+    token_type: 'Bearer'
+  }
+
+  return NextResponse.json({ user, tokens })
+}

apps/postgres-new/components/sidebar.tsx

@@ -489,9 +489,16 @@ function DatabaseMenuItem({ database, isActive }: DatabaseMenuItemProps) {
                   className="bg-inherit justify-start hover:bg-neutral-200 flex gap-3"
                   onClick={async (e) => {
                     e.preventDefault()
-                    // check is user has a Supabase token, if not do OAuth flow
-                    // initiate Supabase Oauth flow
-                    setIsPopoverOpen(false)
+                    const params = new URLSearchParams({
+                      client_id: process.env.NEXT_PUBLIC_SUPABASE_OAUTH_CLIENT_ID!,
+                      redirect_uri: `${window.location.origin}/api/oauth/callback`,
+                      response_type: 'code',
+                      state: JSON.stringify({
+                        databaseId: database.id,
+                      }),
+                    })
+                    window.location.href =
+                      'https://api.supabase.com/v1/oauth/authorize' + '?' + params.toString()
                   }}
                   disabled={user === undefined}
                 >

package.json

@@ -3,8 +3,11 @@
   "scripts": {
     "dev": "npm run dev --workspace postgres-new"
   },
-  "workspaces": ["apps/*"],
+  "workspaces": [
+    "apps/*"
+  ],
   "devDependencies": {
     "supabase": "^1.191.3"
-  }
+  },
+  "packageManager": "[email protected]+sha512.e5a7e52a4183a02d5931057f7a0dbff9d5e9ce3161e33fa68ae392125b79282a8a8a470a51dfc8a0ed86221442eb2fb57019b0990ed24fab519bf0e1bc5ccfc4"
 }