fix some issues

epicweb-dev · Sep 9, 2023 · 113d256 · 113d256
1 parent fb59970
commit 113d256
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/routes/_auth+/auth.$provider.callback.ts b/app/routes/_auth+/auth.$provider.callback.ts
@@ -56,7 +56,9 @@ export async function loader({ request, params }: DataFunctionArgs) {
 
 	const existingConnection = await prisma.connection.findUnique({
 		select: { userId: true },
-		where: { providerId: profile.id },
+		where: {
+			providerName_providerId: { providerName, providerId: profile.id },
+		},
 	})
 
 	const userId = await getUserId(request)

diff --git a/app/routes/settings+/profile.connections.tsx b/app/routes/settings+/profile.connections.tsx
@@ -14,11 +14,11 @@ import {
 	TooltipTrigger,
 } from '#app/components/ui/tooltip.tsx'
 import { requireUserId } from '#app/utils/auth.server.ts'
+import { resolveConnectionData } from '#app/utils/connections.server.ts'
 import { ProviderNameSchema } from '#app/utils/connections.tsx'
 import { prisma } from '#app/utils/db.server.ts'
 import { invariantResponse, useIsPending } from '#app/utils/misc.tsx'
 import { createToastHeaders } from '#app/utils/toast.server.ts'
-import { resolveConnectionData } from '#app/utils/connections.server.ts'
 
 export const handle = {
 	breadcrumb: <Icon name="link-2">Connections</Icon>,

diff --git a/tests/mocks/github.ts b/tests/mocks/github.ts
@@ -1,7 +1,7 @@
-import { fileURLToPath } from 'node:url'
 import path from 'node:path'
-import fsExtra from 'fs-extra'
+import { fileURLToPath } from 'node:url'
 import { faker } from '@faker-js/faker'
+import fsExtra from 'fs-extra'
 import { HttpResponse, passthrough, http, type HttpHandler } from 'msw'
 
 const { json } = HttpResponse