commit af8a034d60a55392885285548d1cc94b58f89d38 · cduck.me/statusphere-example-app-fork

+1 -1

bin/gen-jwk

···

       2
       2
        
       

     

       3
       3
        
       'use strict'

     

       4
       4
        
       

     

       5
       5
       -
       const { JoseKey } = require('@atproto/jwk-jose')

     

       5
       5
       +
       const { JoseKey } = require('@atproto/oauth-client-node')

     

       6
       6
        
       

     

       7
       7
        
       async function main() {

     

       8
       8
        
         const kid = Date.now().toString()

+22 -24

package-lock.json

···

       12
       12
        
               "@atproto/api": "^0.15.6",

     

       13
       13
        
               "@atproto/common": "^0.4.11",

     

       14
       14
        
               "@atproto/identity": "^0.4.8",

     

       15
       15
       -
               "@atproto/jwk-jose": "^0.1.9",

     

       16
       15
        
               "@atproto/lexicon": "^0.4.11",

     

       17
       17
       -
               "@atproto/oauth-client-node": "^0.3.0",

     

       16
       16
       +
               "@atproto/oauth-client-node": "^0.3.1",

     

       18
       17
        
               "@atproto/sync": "^0.1.26",

     

       19
       18
        
               "@atproto/syntax": "^0.4.0",

     

       20
       19
        
               "@atproto/xrpc-server": "^0.8.0",

     
···

       90
       89
        
             }

     

       91
       90
        
           },

     

       92
       91
        
           "node_modules/@atproto-labs/handle-resolver": {

     

       93
       93
       -
             "version": "0.2.0",

     

       94
       94
       -
             "resolved": "https://registry.npmjs.org/@atproto-labs/handle-resolver/-/handle-resolver-0.2.0.tgz",

     

       95
       95
       -
             "integrity": "sha512-oq9NVr6GMh4r/isk6kbEHDH+pUTUYmKb/kGc8hpk430U/xF9A3OAT1L6ySZvAc7SE1MXx4kFDZYfZ5Aop3vrgQ==",

     

       92
       92
       +
             "version": "0.3.0",

     

       93
       93
       +
             "resolved": "https://registry.npmjs.org/@atproto-labs/handle-resolver/-/handle-resolver-0.3.0.tgz",

     

       94
       94
       +
             "integrity": "sha512-TREelvXB6P2eHxx6QjINRkBzUZu/aXWrdY9iN57shQe3C8rzsHNEHHuTVvRa33Hc7vFdQbZN0TnCgKveoyiL/A==",

     

       96
       95
        
             "license": "MIT",

     

       97
       96
        
             "dependencies": {

     

       98
       97
        
               "@atproto-labs/simple-store": "0.2.0",

     
···

       102
       101
        
             }

     

       103
       102
        
           },

     

       104
       103
        
           "node_modules/@atproto-labs/handle-resolver-node": {

     

       105
       105
       -
             "version": "0.1.17",

     

       106
       106
       -
             "resolved": "https://registry.npmjs.org/@atproto-labs/handle-resolver-node/-/handle-resolver-node-0.1.17.tgz",

     

       107
       107
       -
             "integrity": "sha512-msJql8R5t6QAoU5SlT8/7W34B3CQEtAo62u+OlYlY74jmGmJOst8neLuor7WpkoN/Ucn8opVgEV/g9RtwGm1IA==",

     

       104
       104
       +
             "version": "0.1.18",

     

       105
       105
       +
             "resolved": "https://registry.npmjs.org/@atproto-labs/handle-resolver-node/-/handle-resolver-node-0.1.18.tgz",

     

       106
       106
       +
             "integrity": "sha512-/qo14c3I+kagT1UWSp3lTIzwDetfkxvF3Y3VlX2NyQ2jHwgtIAJ81KFNqe7t82NpQDjWiM5h4bdjvdbFIh5djQ==",

     

       108
       107
        
             "license": "MIT",

     

       109
       108
        
             "dependencies": {

     

       110
       109
        
               "@atproto-labs/fetch-node": "0.1.9",

     

       111
       111
       -
               "@atproto-labs/handle-resolver": "0.2.0",

     

       110
       110
       +
               "@atproto-labs/handle-resolver": "0.3.0",

     

       112
       111
        
               "@atproto/did": "0.1.5"

     

       113
       112
        
             },

     

       114
       113
        
             "engines": {

     
···

       116
       115
        
             }

     

       117
       116
        
           },

     

       118
       117
        
           "node_modules/@atproto-labs/identity-resolver": {

     

       119
       119
       -
             "version": "0.1.19",

     

       120
       120
       -
             "resolved": "https://registry.npmjs.org/@atproto-labs/identity-resolver/-/identity-resolver-0.1.19.tgz",

     

       121
       121
       -
             "integrity": "sha512-m4wDm7+0Szc6IO+4e+tstXZl68leAGSr+xG/eeKh9UfgTCsh41mwUM1fTufgTQezoBQO2bChpxxHEztX5Hau+w==",

     

       118
       118
       +
             "version": "0.2.0",

     

       119
       119
       +
             "resolved": "https://registry.npmjs.org/@atproto-labs/identity-resolver/-/identity-resolver-0.2.0.tgz",

     

       120
       120
       +
             "integrity": "sha512-X4UpU9qSgbuBVRXw0kpYqdVRtjNGezmaetyQIwWHNdUl1+ILu4GhinSk1MBXamzgg/07/BVCU0r4LRIPg2Wiow==",

     

       122
       121
        
             "license": "MIT",

     

       123
       122
        
             "dependencies": {

     

       124
       123
        
               "@atproto-labs/did-resolver": "0.2.0",

     

       125
       125
       -
               "@atproto-labs/handle-resolver": "0.2.0",

     

       126
       126
       -
               "@atproto/syntax": "0.4.0"

     

       124
       124
       +
               "@atproto-labs/handle-resolver": "0.3.0"

     

       127
       125
        
             }

     

       128
       126
        
           },

     

       129
       127
        
           "node_modules/@atproto-labs/pipe": {

     
···

       347
       345
        
             }

     

       348
       346
        
           },

     

       349
       347
        
           "node_modules/@atproto/oauth-client": {

     

       350
       350
       -
             "version": "0.4.1",

     

       351
       351
       -
             "resolved": "https://registry.npmjs.org/@atproto/oauth-client/-/oauth-client-0.4.1.tgz",

     

       352
       352
       -
             "integrity": "sha512-gLgaaXchDzMRgeJZaZnkDSso6fBLwBJAlLycAthVSCs/NFw9VPkFIYlZ1gkN1ehvPcU3eKtsh64SNllGZMDKSg==",

     

       348
       348
       +
             "version": "0.4.2",

     

       349
       349
       +
             "resolved": "https://registry.npmjs.org/@atproto/oauth-client/-/oauth-client-0.4.2.tgz",

     

       350
       350
       +
             "integrity": "sha512-wHRYcrh+iKQvMramYqE6PHs5Y/L2LYFzrEnyUMf83CjD3GYFwbSN5pwot6EFXONxRwuRjxpXsCSlFzZwx9YFvw==",

     

       353
       351
        
             "license": "MIT",

     

       354
       352
        
             "dependencies": {

     

       355
       353
        
               "@atproto-labs/did-resolver": "0.2.0",

     

       356
       354
        
               "@atproto-labs/fetch": "0.2.3",

     

       357
       357
       -
               "@atproto-labs/handle-resolver": "0.2.0",

     

       358
       358
       -
               "@atproto-labs/identity-resolver": "0.1.19",

     

       355
       355
       +
               "@atproto-labs/handle-resolver": "0.3.0",

     

       356
       356
       +
               "@atproto-labs/identity-resolver": "0.2.0",

     

       359
       357
        
               "@atproto-labs/simple-store": "0.2.0",

     

       360
       358
        
               "@atproto-labs/simple-store-memory": "0.1.3",

     

       361
       359
        
               "@atproto/did": "0.1.5",

     
···

       367
       365
        
             }

     

       368
       366
        
           },

     

       369
       367
        
           "node_modules/@atproto/oauth-client-node": {

     

       370
       370
       -
             "version": "0.3.0",

     

       371
       371
       -
             "resolved": "https://registry.npmjs.org/@atproto/oauth-client-node/-/oauth-client-node-0.3.0.tgz",

     

       372
       372
       -
             "integrity": "sha512-oIFrKyc9UeDOj3m2dLD5irAvsCVKhvY2drDnFpfoKqVbO+3OulE9KNERkaDRjJKllU92pyUs9p1aSnJBTtAvQw==",

     

       368
       368
       +
             "version": "0.3.1",

     

       369
       369
       +
             "resolved": "https://registry.npmjs.org/@atproto/oauth-client-node/-/oauth-client-node-0.3.1.tgz",

     

       370
       370
       +
             "integrity": "sha512-k37YC7Ke4+btX05oAqHqkkM8r2Ya/tssWANx7/GMwN3PXPP5PK1C/pkxJrGsN/hpjn3I4W9lVTOlC7nigEX7sw==",

     

       373
       371
        
             "license": "MIT",

     

       374
       372
        
             "dependencies": {

     

       375
       373
        
               "@atproto-labs/did-resolver": "0.2.0",

     

       376
       376
       -
               "@atproto-labs/handle-resolver-node": "0.1.17",

     

       374
       374
       +
               "@atproto-labs/handle-resolver-node": "0.1.18",

     

       377
       375
        
               "@atproto-labs/simple-store": "0.2.0",

     

       378
       376
        
               "@atproto/did": "0.1.5",

     

       379
       377
        
               "@atproto/jwk": "0.4.0",

     

       380
       378
        
               "@atproto/jwk-jose": "0.1.9",

     

       381
       379
        
               "@atproto/jwk-webcrypto": "0.1.9",

     

       382
       382
       -
               "@atproto/oauth-client": "0.4.1",

     

       380
       380
       +
               "@atproto/oauth-client": "0.4.2",

     

       383
       381
        
               "@atproto/oauth-types": "0.3.1"

     

       384
       382
        
             },

     

       385
       383
        
             "engines": {

+1 -2

package.json

···

       17
       17
        
           "@atproto/api": "^0.15.6",

     

       18
       18
        
           "@atproto/common": "^0.4.11",

     

       19
       19
        
           "@atproto/identity": "^0.4.8",

     

       20
       20
       -
           "@atproto/jwk-jose": "^0.1.9",

     

       21
       20
        
           "@atproto/lexicon": "^0.4.11",

     

       22
       22
       -
           "@atproto/oauth-client-node": "^0.3.0",

     

       21
       21
       +
           "@atproto/oauth-client-node": "^0.3.1",

     

       23
       22
        
           "@atproto/sync": "^0.1.26",

     

       24
       23
        
           "@atproto/syntax": "^0.4.0",

     

       25
       24
        
           "@atproto/xrpc-server": "^0.8.0",

+6 -2

src/auth/client.ts

···

       1
       1
       -
       import { Keyset } from '@atproto/jwk'

     

       2
       2
       -
       import { JoseKey } from '@atproto/jwk-jose'

     

       3
       1
        
       import {

     

       2
       2
       +
         Keyset,

     

       3
       3
       +
         JoseKey,

     

       4
       4
        
         atprotoLoopbackClientMetadata,

     

       5
       5
        
         NodeOAuthClient,

     

       6
       6
        
         OAuthClientMetadataInput,

     
···

       60
       60
        
           clientMetadata,

     

       61
       61
        
           stateStore: new StateStore(db),

     

       62
       62
        
           sessionStore: new SessionStore(db),

     

       63
       63
       +
       

     

       64
       64
       +
           // XXX Staging

     

       65
       65
       +
           plcDirectoryUrl: 'https://plc.staging.bsky.dev',

     

       66
       66
       +
           handleResolver: 'https://staging.bsky.dev',

     

       63
       67
        
         })

     

       64
       68
        
       }

+2 -2

src/lib/envalid-private-keys.ts

···

       1
       1
       -
       import { Jwk, jwkValidator } from '@atproto/jwk'

     

       1
       1
       +
       import { Jwk, jwkValidator } from '@atproto/oauth-client-node'

     

       2
       2
        
       import { makeValidator } from 'envalid'

     

       3
       3
        
       import { z } from 'zod'

     

       4
       4
        
       

     
···

       6
       6
        
       

     

       7
       7
        
       const privateKeySchema = z.intersection(

     

       8
       8
        
         jwkValidator,

     

       9
       9
       -
         z.object({ kid: z.string().nonempty() })

     

       9
       9
       +
         z.object({ kid: z.string().nonempty() }),

     

       10
       10
        
       ) satisfies z.ZodType<PrivateKey>

     

       11
       11
        
       

     

       12
       12
        
       const privateKeysSchema = z.array(privateKeySchema).nonempty()