fix(sds): fix typing and linting errors

Author: Adam Spiers

packages/sds/tests/db.test.ts

@@ -1,6 +1,5 @@
 import { TestNetworkNoAppView } from '@atproto/dev-env'
-// Importing from `dist` to circumvent circular dependency typing issues
-import { AccountDb } from '../dist/account-manager/db'
+import type { AccountDb } from '../../pds/dist/account-manager/db'
 
 describe('db', () => {
   let network: TestNetworkNoAppView

packages/sds/tests/organization-creation.test.ts

@@ -1,9 +1,25 @@
 import { TestNetwork } from '@atproto/dev-env'
-import { SdsAppContext } from '../src/sds-context'
+
+interface MockSdsContext {
+  authVerifier: {
+    authorization: () => {
+      auth: { credentials: { did: string } }
+    }
+  }
+  accountManager: {
+    createAccount: jest.Mock
+  }
+  sharedRepoManager: {
+    grantAccess: jest.Mock
+  }
+  idResolver: {
+    resolveIdentity: jest.Mock
+  }
+}
 
 describe('organization creation', () => {
   let network: TestNetwork
-  let ctx: SdsAppContext
+  let ctx: MockSdsContext
 
   beforeAll(async () => {
     network = await TestNetwork.create({
@@ -34,7 +50,7 @@ describe('organization creation', () => {
           handle: 'test-org.sds.local',
         }),
       },
-    } as any
+    }
   })
 
   afterAll(async () => {

packages/sds/tests/recovery.test.ts

@@ -4,7 +4,10 @@ import AtpAgent from '@atproto/api'
 import { renameIfExists, rmIfExists } from '@atproto/common'
 import { SeedClient, TestNetworkNoAppView, basicSeed } from '@atproto/dev-env'
 import { verifyRepoCar } from '@atproto/repo'
-import { AppContext, scripts } from '../dist'
+import type { AppContext } from '../../pds/dist/context'
+import { scripts } from '../dist'
+import type { RecovererContextNoDb } from '../dist/scripts/sequencer-recovery/recoverer'
+import type { RotateKeysContext } from '../dist/scripts/rotate-keys'
 
 describe('recovery', () => {
   let network: TestNetworkNoAppView
@@ -135,7 +138,10 @@ describe('recovery', () => {
     await restore([alice, bob, elli])
 
     // run recovery operation
-    await scripts['sequencer-recovery'](network.pds.ctx, ['0', '10', 'true'])
+    await scripts['sequencer-recovery'](
+      network.pds.ctx as unknown as RecovererContextNoDb,
+      ['0', '10', 'true'],
+    )
 
     // ensure alice's CAR is exactly the same as before the loss, including intermediate states based on tracked revs
     const startCarAfter = await getCar(alice, startRev)
@@ -165,7 +171,10 @@ describe('recovery', () => {
   })
 
   it('rotates keys for users', async () => {
-    await scripts['rotate-keys'](network.pds.ctx, [elli])
+    await scripts['rotate-keys'](
+      network.pds.ctx as unknown as RotateKeysContext,
+      [elli],
+    )
     const elliKey = await ctx.actorStore.keypair(elli)
 
     const plcData = await ctx.plcClient.getDocumentData(elli)

packages/sds/tests/sds-auth-integration.test.ts

@@ -222,7 +222,11 @@ describe('SDS Auth Integration', () => {
 
     test('should handle admin permission inheritance', async () => {
       // Grant admin permissions
-      const permissions: RepositoryPermissions = { admin: true }
+      const permissions: RepositoryPermissions = {
+        read: true,
+        write: true,
+        admin: true,
+      }
       await permissionManager.grantAccess(
         testRepoDid,
         testUserDid,
@@ -254,7 +258,10 @@ describe('SDS Auth Integration', () => {
 
     test('should handle write permission inheritance', async () => {
       // Grant write permissions
-      const permissions: RepositoryPermissions = { write: true }
+      const permissions: RepositoryPermissions = {
+        read: true,
+        write: true,
+      }
       await permissionManager.grantAccess(
         testRepoDid,
         testUserDid,

packages/sds/tests/sds-endpoint-logic.test.ts

@@ -1,5 +1,7 @@
 import { TestNetworkWithSds } from '@atproto/dev-env'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import type { DatabaseSchema } from '../src/account-manager/db/schema'
+import type { Database } from '../src/db'
 import { SdsPermissionManager } from '../src/permission-manager'
 import { RepositoryPermissions } from '../src/types'
 
@@ -17,7 +19,7 @@ describe('SDS Endpoint Logic', () => {
       dbPostgresSchema: 'sds_endpoint_logic_test',
     })
     permissionManager = new SdsPermissionManager(
-      network.sds.ctx.accountManager.db,
+      network.sds.ctx.accountManager.db as unknown as Database<DatabaseSchema>,
     )
   })
 

packages/sds/tests/sds-endpoints-unit.test.ts

@@ -1,4 +1,6 @@
 import { TestNetworkWithSds } from '@atproto/dev-env'
+import type { DatabaseSchema } from '../src/account-manager/db/schema'
+import type { Database } from '../src/db'
 import { SdsPermissionManager } from '../src/permission-manager'
 import { RepositoryPermissions } from '../src/types'
 
@@ -15,7 +17,7 @@ describe('SDS Endpoints Unit Tests', () => {
       dbPostgresSchema: 'sds_endpoints_unit_test',
     })
     permissionManager = new SdsPermissionManager(
-      network.sds.ctx.accountManager.db,
+      network.sds.ctx.accountManager.db as unknown as Database<DatabaseSchema>,
     )
   })
 
@@ -374,7 +376,7 @@ describe('SDS Endpoints Unit Tests', () => {
     })
 
     test('should validate permission object structure', async () => {
-      const invalidPermissions = [
+      const invalidPermissions: unknown[] = [
         { read: 'true', write: 'false' }, // String instead of boolean
         { read: 1, write: 0 }, // Number instead of boolean
         { read: null, write: undefined }, // Null/undefined instead of boolean
@@ -386,7 +388,7 @@ describe('SDS Endpoints Unit Tests', () => {
           await permissionManager.grantAccess(
             testRepoDid,
             testUserDid,
-            _invalidPermissions,
+            _invalidPermissions as RepositoryPermissions,
             testOwnerDid,
           )
 
@@ -403,7 +405,7 @@ describe('SDS Endpoints Unit Tests', () => {
         write: true,
         admin: true,
         malicious: '"; DROP TABLE shared_repository_permissions; --',
-      } as any
+      } as unknown as RepositoryPermissions
 
       try {
         await permissionManager.grantAccess(