commit 1a60bd6f0d3d31222cd4cabfdd3e2dab49c2a97d · cduck.me/statusphere-example-app-fork

+51 -51

package-lock.json

···

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     
···

       43
        
             }

     

       44
        
           },

     

       45
        
           "node_modules/@atproto-labs/did-resolver": {

     

       46
       -
             "version": "0.1.13",

     

       47
       -
             "resolved": "https://registry.npmjs.org/@atproto-labs/did-resolver/-/did-resolver-0.1.13.tgz",

     

       48
       -
             "integrity": "sha512-DG3YNaCKc6PAIv1Gsz3E1Kufw2t14OBxe4LdKK7KKLCNoex51hm+A5yMevShe3BSll+QosqWYIEgkPSc5xBoGQ==",

     

       49
        
             "license": "MIT",

     

       50
        
             "dependencies": {

     

       51
        
               "@atproto-labs/fetch": "0.2.3",

     
···

       90
        
             }

     

       91
        
           },

     

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

     

       93
       -
             "version": "0.1.8",

     

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

     

       95
       -
             "integrity": "sha512-Y0ckccoCGDo/3g4thPkgp9QcORmc+qqEaCBCYCZYtfLIQp4775u22wd+4fyEyJP4DqoReKacninkICgRGfs3dQ==",

     

       96
        
             "license": "MIT",

     

       97
        
             "dependencies": {

     

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

     
···

       102
        
             }

     

       103
        
           },

     

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

     

       105
       -
             "version": "0.1.16",

     

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

     

       107
       -
             "integrity": "sha512-i2F989zjyC7b/odrV3/tOpIT1IDIxR3F0khPG4REfOWcmJ89QcP8BiejJ6KFJk3hbTJHq6X9/pTG1vesCvyIKA==",

     

       108
        
             "license": "MIT",

     

       109
        
             "dependencies": {

     

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

     

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

     

       112
        
               "@atproto/did": "0.1.5"

     

       113
        
             },

     

       114
        
             "engines": {

     
···

       116
        
             }

     

       117
        
           },

     

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

     

       119
       -
             "version": "0.1.18",

     

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

     

       121
       -
             "integrity": "sha512-DArYXP1hzZJIBcojun0CWEF+TjAhlGKcVq/RwLiGfY1mKq2yPjCiXyHj+5L0+z9jBSZiAB7L65JgcjI2+MFiRg==",

     

       122
        
             "license": "MIT",

     

       123
        
             "dependencies": {

     

       124
       -
               "@atproto-labs/did-resolver": "0.1.13",

     

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

     

       126
        
               "@atproto/syntax": "0.4.0"

     

       127
        
             }

     

       128
        
           },

     
···

       277
        
             }

     

       278
        
           },

     

       279
        
           "node_modules/@atproto/jwk": {

     

       280
       -
             "version": "0.3.0",

     

       281
       -
             "resolved": "https://registry.npmjs.org/@atproto/jwk/-/jwk-0.3.0.tgz",

     

       282
       -
             "integrity": "sha512-MIAXyNMGu1tCNHjqW/8jqfE/wgWCIoK2cJ0mR6UxwhNPvkbe35TcpRYJdtQu/E6MUd7TziyDBa/GO4dKAiePhQ==",

     

       283
        
             "license": "MIT",

     

       284
        
             "dependencies": {

     

       285
        
               "multiformats": "^9.9.0",

     
···

       287
        
             }

     

       288
        
           },

     

       289
        
           "node_modules/@atproto/jwk-jose": {

     

       290
       -
             "version": "0.1.8",

     

       291
       -
             "resolved": "https://registry.npmjs.org/@atproto/jwk-jose/-/jwk-jose-0.1.8.tgz",

     

       292
       -
             "integrity": "sha512-aoU2Q0GpIl388KhCcv9YvAxNscALUv3xzLq5gjVPdJ+zmqw94nGZNcjiNvpnbfS+VQM9e2DrrTuwmDXnxfrrSA==",

     

       293
        
             "license": "MIT",

     

       294
        
             "dependencies": {

     

       295
       -
               "@atproto/jwk": "0.3.0",

     

       296
        
               "jose": "^5.2.0"

     

       297
        
             }

     

       298
        
           },

     

       299
        
           "node_modules/@atproto/jwk-webcrypto": {

     

       300
       -
             "version": "0.1.8",

     

       301
       -
             "resolved": "https://registry.npmjs.org/@atproto/jwk-webcrypto/-/jwk-webcrypto-0.1.8.tgz",

     

       302
       -
             "integrity": "sha512-oOW/G40f6M0NbTOo8uZgiSsFtcvlfNFldyxm+V+fVo5yKe6cvgvPNqckpqMsoBe6JYfImdc/zdVak9fCSSh41A==",

     

       303
        
             "license": "MIT",

     

       304
        
             "dependencies": {

     

       305
       -
               "@atproto/jwk": "0.3.0",

     

       306
       -
               "@atproto/jwk-jose": "0.1.8",

     

       307
        
               "zod": "^3.23.8"

     

       308
        
             }

     

       309
        
           },

     
···

       347
        
             }

     

       348
        
           },

     

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

     

       350
       -
             "version": "0.4.0",

     

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

     

       352
       -
             "integrity": "sha512-uWVnlhennWkgvzqP0l53sFaw6DM6B4zmq0fv1xs05vt56Sjly8YirAj0GVDXlb37/BQRJQ1WOBzJVYDI3bH9uw==",

     

       353
        
             "license": "MIT",

     

       354
        
             "dependencies": {

     

       355
       -
               "@atproto-labs/did-resolver": "0.1.13",

     

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

     

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

     

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

     

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

     

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

     

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

     

       362
       -
               "@atproto/jwk": "0.3.0",

     

       363
       -
               "@atproto/oauth-types": "0.3.0",

     

       364
        
               "@atproto/xrpc": "0.7.0",

     

       365
        
               "multiformats": "^9.9.0",

     

       366
        
               "zod": "^3.23.8"

     

       367
        
             }

     

       368
        
           },

     

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

     

       370
       -
             "version": "0.2.24",

     

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

     

       372
       -
             "integrity": "sha512-WsUiFkHjlm80J2d4czP7msYZoxvKB4hDpZGw34RgMD4VLA2jt03GMH4wTQPIZxfV3/9yrgMoOW/BDC9Iv4MavA==",

     

       373
        
             "license": "MIT",

     

       374
        
             "dependencies": {

     

       375
       -
               "@atproto-labs/did-resolver": "0.1.13",

     

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

     

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

     

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

     

       379
       -
               "@atproto/jwk": "0.3.0",

     

       380
       -
               "@atproto/jwk-jose": "0.1.8",

     

       381
       -
               "@atproto/jwk-webcrypto": "0.1.8",

     

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

     

       383
       -
               "@atproto/oauth-types": "0.3.0"

     

       384
        
             },

     

       385
        
             "engines": {

     

       386
        
               "node": ">=18.7.0"

     

       387
        
             }

     

       388
        
           },

     

       389
        
           "node_modules/@atproto/oauth-types": {

     

       390
       -
             "version": "0.3.0",

     

       391
       -
             "resolved": "https://registry.npmjs.org/@atproto/oauth-types/-/oauth-types-0.3.0.tgz",

     

       392
       -
             "integrity": "sha512-ptfsJARKODXfuOoDQag4a6PpEkDEj4Urz3jOmnQZy2YspPc/TNm1o0HglU0YehELv1vfhh9gEz40BJztPPhiLA==",

     

       393
        
             "license": "MIT",

     

       394
        
             "dependencies": {

     

       395
       -
               "@atproto/jwk": "0.3.0",

     

       396
        
               "zod": "^3.23.8"

     

       397
        
             }

     

       398
        
           },

···

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     
···

       43
        
             }

     

       44
        
           },

     

       45
        
           "node_modules/@atproto-labs/did-resolver": {

     

       46
       +
             "version": "0.2.0",

     

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

     

       48
       +
             "integrity": "sha512-y9GOx2gUETynDKmANnBrU5DTf+u0AwKBJpGns1vDDOYMdLdRCFIeYy3UH+TI8YOkcEazjgF5Q3m+LjwriE1KqQ==",

     

       49
        
             "license": "MIT",

     

       50
        
             "dependencies": {

     

       51
        
               "@atproto-labs/fetch": "0.2.3",

     
···

       90
        
             }

     

       91
        
           },

     

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

     

       93
       +
             "version": "0.2.0",

     

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

     

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

     

       96
        
             "license": "MIT",

     

       97
        
             "dependencies": {

     

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

     
···

       102
        
             }

     

       103
        
           },

     

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

     

       105
       +
             "version": "0.1.17",

     

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

     

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

     

       108
        
             "license": "MIT",

     

       109
        
             "dependencies": {

     

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

     

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

     

       112
        
               "@atproto/did": "0.1.5"

     

       113
        
             },

     

       114
        
             "engines": {

     
···

       116
        
             }

     

       117
        
           },

     

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

     

       119
       +
             "version": "0.1.19",

     

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

     

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

     

       122
        
             "license": "MIT",

     

       123
        
             "dependencies": {

     

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

     

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

     

       126
        
               "@atproto/syntax": "0.4.0"

     

       127
        
             }

     

       128
        
           },

     
···

       277
        
             }

     

       278
        
           },

     

       279
        
           "node_modules/@atproto/jwk": {

     

       280
       +
             "version": "0.4.0",

     

       281
       +
             "resolved": "https://registry.npmjs.org/@atproto/jwk/-/jwk-0.4.0.tgz",

     

       282
       +
             "integrity": "sha512-tvp4iZrzqEzKCeTOKz50/o6WdsZzOuWmWjF6On5QAp04fLwLpsFu2Hixgx/lA1KBO0O4sns7YSGcAqSSX6Rdog==",

     

       283
        
             "license": "MIT",

     

       284
        
             "dependencies": {

     

       285
        
               "multiformats": "^9.9.0",

     
···

       287
        
             }

     

       288
        
           },

     

       289
        
           "node_modules/@atproto/jwk-jose": {

     

       290
       +
             "version": "0.1.9",

     

       291
       +
             "resolved": "https://registry.npmjs.org/@atproto/jwk-jose/-/jwk-jose-0.1.9.tgz",

     

       292
       +
             "integrity": "sha512-HT9GcUe6htDxI5OSYXWdeS6QZ9lpuDDvJk508ppi8a48E/1f8eumoM0QhgbFRF9IKAnnFrtnZDOAvljQzFKwwQ==",

     

       293
        
             "license": "MIT",

     

       294
        
             "dependencies": {

     

       295
       +
               "@atproto/jwk": "0.4.0",

     

       296
        
               "jose": "^5.2.0"

     

       297
        
             }

     

       298
        
           },

     

       299
        
           "node_modules/@atproto/jwk-webcrypto": {

     

       300
       +
             "version": "0.1.9",

     

       301
       +
             "resolved": "https://registry.npmjs.org/@atproto/jwk-webcrypto/-/jwk-webcrypto-0.1.9.tgz",

     

       302
       +
             "integrity": "sha512-ecciePHT0JEDZNAbMKSkdqoBYsjvhwuVno0jsS600SZmuvi2fAMhGraDZ5ZOO5M0hHHBiDbN7Ar/qcnIwyoxsA==",

     

       303
        
             "license": "MIT",

     

       304
        
             "dependencies": {

     

       305
       +
               "@atproto/jwk": "0.4.0",

     

       306
       +
               "@atproto/jwk-jose": "0.1.9",

     

       307
        
               "zod": "^3.23.8"

     

       308
        
             }

     

       309
        
           },

     
···

       347
        
             }

     

       348
        
           },

     

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

     

       350
       +
             "version": "0.4.1",

     

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

     

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

     

       353
        
             "license": "MIT",

     

       354
        
             "dependencies": {

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

       362
       +
               "@atproto/jwk": "0.4.0",

     

       363
       +
               "@atproto/oauth-types": "0.3.1",

     

       364
        
               "@atproto/xrpc": "0.7.0",

     

       365
        
               "multiformats": "^9.9.0",

     

       366
        
               "zod": "^3.23.8"

     

       367
        
             }

     

       368
        
           },

     

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

     

       370
       +
             "version": "0.3.0",

     

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

     

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

     

       373
        
             "license": "MIT",

     

       374
        
             "dependencies": {

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

       384
        
             },

     

       385
        
             "engines": {

     

       386
        
               "node": ">=18.7.0"

     

       387
        
             }

     

       388
        
           },

     

       389
        
           "node_modules/@atproto/oauth-types": {

     

       390
       +
             "version": "0.3.1",

     

       391
       +
             "resolved": "https://registry.npmjs.org/@atproto/oauth-types/-/oauth-types-0.3.1.tgz",

     

       392
       +
             "integrity": "sha512-l8ahtm74lmBOs5boi5q7mqzF2D37+cIYqVmbCrpexNeJfg2BXu0sBxREt0ADxP25Td9pX+u6FnefCOQtI/YAZw==",

     

       393
        
             "license": "MIT",

     

       394
        
             "dependencies": {

     

       395
       +
               "@atproto/jwk": "0.4.0",

     

       396
        
               "zod": "^3.23.8"

     

       397
        
             }

     

       398
        
           },

+2 -2

package.json

···

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

···

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

+2 -4

src/auth/client.ts

···

       1
       -
       import assert from 'node:assert'

     

       2
        
       import { Keyset } from '@atproto/jwk'

     

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

     

       4
        
       import {

     

       5
       -
         AppViewHandleResolver,

     

       6
        
         atprotoLoopbackClientMetadata,

     

       7
       -
         DidResolverCommon,

     

       8
        
         NodeOAuthClient,

     

       9
        
         OAuthClientMetadataInput,

     

       10
        
       } from '@atproto/oauth-client-node'

     

       0
        
       
     

       11
        
       

     

       12
        
       import type { Database } from '#/db'

     

       13
        
       import { env } from '#/env'

     
···

       47
        
               response_types: ['code'],

     

       48
        
               application_type: 'web',

     

       49
        
               token_endpoint_auth_method: pk ? 'private_key_jwt' : 'none',

     

       50
       -
               token_endpoint_auth_signing_alg: pk ? pk[1] : undefined,

     

       51
        
               dpop_bound_access_tokens: true,

     

       52
        
             }

     

       53
        
           : atprotoLoopbackClientMetadata(

···

       0
        
       
     

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

     

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

     

       3
        
       import {

     

       0
        
       
     

       4
        
         atprotoLoopbackClientMetadata,

     

       0
        
       
     

       5
        
         NodeOAuthClient,

     

       6
        
         OAuthClientMetadataInput,

     

       7
        
       } from '@atproto/oauth-client-node'

     

       8
       +
       import assert from 'node:assert'

     

       9
        
       

     

       10
        
       import type { Database } from '#/db'

     

       11
        
       import { env } from '#/env'

     
···

       45
        
               response_types: ['code'],

     

       46
        
               application_type: 'web',

     

       47
        
               token_endpoint_auth_method: pk ? 'private_key_jwt' : 'none',

     

       48
       +
               token_endpoint_auth_signing_alg: pk ? pk.alg : undefined,

     

       49
        
               dpop_bound_access_tokens: true,

     

       50
        
             }

     

       51
        
           : atprotoLoopbackClientMetadata(