Skip to content

Commit 065207a

Browse files
committed
fix typecheck issues
1 parent a96e4d1 commit 065207a

2 files changed

Lines changed: 16 additions & 14 deletions

File tree

app/routes/app/connections.tsx

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { Info, Route } from './+types/connections'
1+
import type { Route } from './+types/connections'
22
import type { ProviderName } from '~/utils/connections'
33
import { invariantResponse } from '@epic-web/invariant'
44
import { useState } from 'react'
@@ -29,16 +29,18 @@ async function userCanDeleteConnections(userId: string) {
2929
return Boolean(connections && connections > 1)
3030
}
3131

32+
interface ConnectionData {
33+
providerName: ProviderName
34+
id: string
35+
displayName: string
36+
link?: string | null
37+
createdAtFormatted: string
38+
}
39+
3240
export async function loader({ request, params }: Route.LoaderArgs) {
3341
const { user } = await requireUserInOrganization(request, params.organizationId)
3442
const rawConnections = await repositoryFactory.getConnectionRepository().findByUserId(user.id)
35-
const connections: Array<{
36-
providerName: ProviderName
37-
id: string
38-
displayName: string
39-
link?: string | null
40-
createdAtFormatted: string
41-
}> = []
43+
const connections: Array<ConnectionData> = []
4244
for (const connection of rawConnections) {
4345
const r = ProviderNameSchema.safeParse(connection.providerName)
4446
if (!r.success)
@@ -131,7 +133,7 @@ function Connection({
131133
connection,
132134
canDelete,
133135
}: {
134-
connection: Info['loaderData']['connections'][number]
136+
connection: ConnectionData
135137
canDelete: boolean
136138
}) {
137139
const deleteFetcher = useFetcher<typeof action>()

app/routes/auth/webauthn/registration.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import {
55
verifyRegistrationResponse,
66
} from '@simplewebauthn/server'
77
import { repositoryFactory } from '~/data/factory'
8-
import { requireUserInOrganization } from '~/utils/auth/auth.server'
8+
import { requireUser } from '~/utils/auth/auth.server'
99
import { getDomainUrl, getErrorMessage } from '~/utils/misc'
1010
import { getWebAuthnConfig, passkeyCookie, PasskeyCookieSchema, RegistrationResponseSchema } from './utils.server'
1111

12-
export async function loader({ request, params }: Route.LoaderArgs) {
13-
const { user } = await requireUserInOrganization(request, params.organizationId)
12+
export async function loader({ request }: Route.LoaderArgs) {
13+
const user = await requireUser(request)
1414
const passkeys = await repositoryFactory.getPasskeyRepository().findByUserId(user.id)
1515

1616
const config = getWebAuthnConfig(request)
@@ -43,9 +43,9 @@ export async function loader({ request, params }: Route.LoaderArgs) {
4343
)
4444
}
4545

46-
export async function action({ request, params }: Route.ActionArgs) {
46+
export async function action({ request }: Route.ActionArgs) {
4747
try {
48-
const { user } = await requireUserInOrganization(request, params.organizationId)
48+
const user = await requireUser(request)
4949
const body = await request.json()
5050
const result = RegistrationResponseSchema.safeParse(body)
5151
if (!result.success) {

0 commit comments

Comments
 (0)