tidy

packages/pds/package.json

@@ -84,12 +84,12 @@
     "@types/disposable-email": "^0.2.0",
     "@types/express": "^4.17.13",
     "@types/express-serve-static-core": "^4.17.36",
-    "@types/jsonwebtoken": "^8.5.9",
     "@types/nodemailer": "^6.4.6",
     "@types/pg": "^8.6.6",
     "@types/qs": "^6.9.7",
     "@types/sharp": "^0.31.0",
     "axios": "^0.27.2",
+    "get-port": "^6.1.2",
     "ws": "^8.12.0"
   }
 }

packages/pds/tests/app-passwords.test.ts

@@ -1,6 +1,6 @@
 import { TestNetworkNoAppView } from '@atproto/dev-env'
 import AtpAgent from '@atproto/api'
-import * as jwt from 'jsonwebtoken'
+import * as jose from 'jose'
 
 describe('app_passwords', () => {
   let network: TestNetworkNoAppView
@@ -44,9 +44,7 @@ describe('app_passwords', () => {
   })
 
   it('creates an access token for an app with a restricted scope', () => {
-    const decoded = jwt.decode(appAgent.session?.accessJwt ?? '', {
-      json: true,
-    })
+    const decoded = jose.decodeJwt(appAgent.session?.accessJwt ?? '')
     expect(decoded?.scope).toEqual('com.atproto.appPass')
   })
 

packages/pds/tests/auth.test.ts

@@ -1,4 +1,4 @@
-import * as jwt from 'jsonwebtoken'
+import * as jose from 'jose'
 import AtpAgent from '@atproto/api'
 import { TestNetworkNoAppView, SeedClient } from '@atproto/dev-env'
 import * as CreateSession from '@atproto/api/src/client/types/com/atproto/server/createSession'
@@ -157,9 +157,9 @@ describe('auth', () => {
     const refresh1 = await refreshSession(account.refreshJwt)
     const refresh2 = await refreshSession(account.refreshJwt)
 
-    const token0 = jwt.decode(account.refreshJwt, { json: true })
-    const token1 = jwt.decode(refresh1.refreshJwt, { json: true })
-    const token2 = jwt.decode(refresh2.refreshJwt, { json: true })
+    const token0 = jose.decodeJwt(account.refreshJwt)
+    const token1 = jose.decodeJwt(refresh1.refreshJwt)
+    const token2 = jose.decodeJwt(refresh2.refreshJwt)
 
     expect(typeof token1?.jti).toEqual('string')
     expect(token1?.jti).toEqual(token2?.jti)
@@ -175,7 +175,7 @@ describe('auth', () => {
       password: 'password',
     })
     await refreshSession(account.refreshJwt)
-    const token = jwt.decode(account.refreshJwt, { json: true })
+    const token = jose.decodeJwt(account.refreshJwt)
 
     // Update expiration (i.e. grace period) to end immediately
     const refreshUpdated = await db.db

packages/pds/tests/entryway.test.ts

@@ -6,6 +6,7 @@ import { Secp256k1Keypair, randomStr } from '@atproto/crypto'
 import { SeedClient, TestPds, TestPlc, mockResolvers } from '@atproto/dev-env'
 import * as pdsEntryway from '@atproto/pds-entryway'
 import * as ui8 from 'uint8arrays'
+import getPort from 'get-port'
 
 describe('entryway', () => {
   let plc: TestPlc
@@ -17,10 +18,10 @@ describe('entryway', () => {
   beforeAll(async () => {
     const jwtSigningKey = await Secp256k1Keypair.create({ exportable: true })
     const plcRotationKey = await Secp256k1Keypair.create({ exportable: true })
+    const entrywayPort = await getPort()
     plc = await TestPlc.create({})
     pds = await TestPds.create({
-      port: plc.port + 1,
-      entrywayUrl: `http://localhost:${plc.port + 2}`,
+      entrywayUrl: `http://localhost:${entrywayPort}`,
       entrywayJwtVerifyKeyK256PublicKeyHex: getPublicHex(jwtSigningKey),
       entrywayPlcRotationKeyK256PublicKeyHex: getPublicHex(plcRotationKey),
       adminPassword: 'admin-pass',
@@ -31,7 +32,7 @@ describe('entryway', () => {
     })
     entryway = await createEntryway({
       dbPostgresSchema: 'entryway',
-      port: plc.port + 2,
+      port: entrywayPort,
       adminPassword: 'admin-pass',
       jwtSigningKeyK256PrivateKeyHex: await getPrivateHex(jwtSigningKey),
       plcRotationKeyK256PrivateKeyHex: await getPrivateHex(plcRotationKey),