diff --git a/packages/backend/src/api/endpoints/JwtTemplatesApi.ts b/packages/backend/src/api/endpoints/JwtTemplatesApi.ts index 5a8df969d6c..30409026aba 100644 --- a/packages/backend/src/api/endpoints/JwtTemplatesApi.ts +++ b/packages/backend/src/api/endpoints/JwtTemplatesApi.ts @@ -1,5 +1,5 @@ import type { ClerkPaginationRequest } from '@clerk/shared/types'; -import { joinPaths } from 'src/util/path'; +import { joinPaths } from '../../util/path'; import type { DeletedObject, JwtTemplate } from '../resources'; import type { PaginatedResourceResponse } from '../resources/Deserializer'; diff --git a/packages/backend/src/api/endpoints/WaitlistEntryApi.ts b/packages/backend/src/api/endpoints/WaitlistEntryApi.ts index f0bc38062f2..0be292d687e 100644 --- a/packages/backend/src/api/endpoints/WaitlistEntryApi.ts +++ b/packages/backend/src/api/endpoints/WaitlistEntryApi.ts @@ -1,5 +1,5 @@ import type { ClerkPaginationRequest } from '@clerk/shared/types'; -import { joinPaths } from 'src/util/path'; +import { joinPaths } from '../../util/path'; import type { DeletedObject } from '../resources/DeletedObject'; import type { PaginatedResourceResponse } from '../resources/Deserializer'; diff --git a/packages/backend/src/jwt/cryptoKeys.ts b/packages/backend/src/jwt/cryptoKeys.ts index f3c2d27dcd1..bdc1f42d6f3 100644 --- a/packages/backend/src/jwt/cryptoKeys.ts +++ b/packages/backend/src/jwt/cryptoKeys.ts @@ -3,7 +3,7 @@ import { isomorphicAtob } from '@clerk/shared/isomorphicAtob'; import { runtime } from '../runtime'; // https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey#pkcs_8_import -function pemToBuffer(secret: string): ArrayBuffer { +function pemToBuffer(secret: string): Uint8Array { const trimmed = secret .replace(/-----BEGIN.*?-----/g, '') .replace(/-----END.*?-----/g, '') diff --git a/packages/backend/src/jwt/verifyJwt.ts b/packages/backend/src/jwt/verifyJwt.ts index 3070ddd5d6c..7b5a4fce019 100644 --- a/packages/backend/src/jwt/verifyJwt.ts +++ b/packages/backend/src/jwt/verifyJwt.ts @@ -28,7 +28,12 @@ export async function hasValidSignature(jwt: Jwt, key: JsonWebKey | string): Pro try { const cryptoKey = await importKey(key, algorithm, 'verify'); - const verified = await runtime.crypto.subtle.verify(algorithm.name, cryptoKey, signature, data); + const verified = await runtime.crypto.subtle.verify( + algorithm.name, + cryptoKey, + signature as Uint8Array, + data, + ); return { data: verified }; } catch (error) { return { diff --git a/packages/backend/src/tokens/__tests__/getAuth.test-d.ts b/packages/backend/src/tokens/__tests__/getAuth.test-d.ts index 3a22688e381..d1b17938069 100644 --- a/packages/backend/src/tokens/__tests__/getAuth.test-d.ts +++ b/packages/backend/src/tokens/__tests__/getAuth.test-d.ts @@ -1,4 +1,4 @@ -import { expectTypeOf, test } from 'vitest'; +import { expectTypeOf, test, describe } from 'vitest'; import type { RedirectFun } from '../../createRedirect'; import type { AuthObject, InvalidTokenAuthObject } from '../authObjects'; diff --git a/packages/backend/src/webhooks.ts b/packages/backend/src/webhooks.ts index 0cebb68e345..3af4b757bac 100644 --- a/packages/backend/src/webhooks.ts +++ b/packages/backend/src/webhooks.ts @@ -1,6 +1,6 @@ import { getEnvVariable } from '@clerk/shared/getEnvVariable'; -import { errorThrower } from 'src/util/shared'; import { Webhook } from 'standardwebhooks'; +import { errorThrower } from './util/shared'; import type { WebhookEvent } from './api/resources/Webhooks'; diff --git a/packages/backend/tsconfig.json b/packages/backend/tsconfig.json index 38f85bab2bc..219a5eaf3e1 100644 --- a/packages/backend/tsconfig.json +++ b/packages/backend/tsconfig.json @@ -1,7 +1,6 @@ { "compilerOptions": { "allowSyntheticDefaultImports": true, - "baseUrl": ".", "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "importHelpers": true,