backfill improvements

Author: icecrasher321

apps/sim/app/api/credentials/route.ts

@@ -184,7 +184,7 @@ export async function GET(request: NextRequest) {
     }
 
     if (lookupCredentialId) {
-      const [row] = await db
+      let [row] = await db
         .select({
           id: credential.id,
           displayName: credential.displayName,
@@ -195,6 +195,24 @@ export async function GET(request: NextRequest) {
         .where(and(eq(credential.id, lookupCredentialId), eq(credential.workspaceId, workspaceId)))
         .limit(1)
 
+      if (!row) {
+        ;[row] = await db
+          .select({
+            id: credential.id,
+            displayName: credential.displayName,
+            type: credential.type,
+            providerId: credential.providerId,
+          })
+          .from(credential)
+          .where(
+            and(
+              eq(credential.accountId, lookupCredentialId),
+              eq(credential.workspaceId, workspaceId)
+            )
+          )
+          .limit(1)
+      }
+
       return NextResponse.json({ credential: row ?? null })
     }
 

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/credential-selector/credential-selector.tsx

@@ -133,6 +133,9 @@ export function CredentialSelector({
         if (!response.ok || cancelled) return
         const data = await response.json()
         if (!cancelled && data.credential?.displayName) {
+          if (data.credential.id !== selectedId) {
+            setStoreValue(data.credential.id)
+          }
           setInaccessibleCredentialName(data.credential.displayName)
         }
       } catch {

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/tools/credential-selector.tsx

@@ -109,6 +109,9 @@ export function ToolCredentialSelector({
         if (!response.ok || cancelled) return
         const data = await response.json()
         if (!cancelled && data.credential?.displayName) {
+          if (data.credential.id !== selectedId) {
+            onChange(data.credential.id)
+          }
           setInaccessibleCredentialName(data.credential.displayName)
         }
       } catch {

packages/db/migrations/0155_nebulous_rocket_raccoon.sql

@@ -145,14 +145,15 @@ oauth_creds AS (
 		'cred_' || md5(wua.workspace_id || ':' || a.id) AS id,
 		wua.workspace_id,
 		'oauth'::"credential_type",
-		'Default ' || COALESCE(pn.sname, a.provider_id) || ' Credential',
+		COALESCE(u.name, 'User') || '''s ' || COALESCE(pn.sname, a.provider_id),
 		a.provider_id,
 		a.id,
 		a.user_id,
 		now(),
 		now()
 	FROM "account" a
 	INNER JOIN workspace_user_access wua ON wua.user_id = a.user_id
+	INNER JOIN "user" u ON u.id = a.user_id
 	LEFT JOIN provider_names pn ON pn.pid = a.provider_id
 	WHERE a.provider_id != 'credential'
 	ON CONFLICT DO NOTHING