@atproto/pds 0.5.0 → 0.5.2

package/dist/api/com/atproto/admin/updateAccountHandle.js

@@ -1,49 +1,39 @@
 import { InvalidRequestError } from '@atproto/xrpc-server';
 import { com } from '../../../../lexicons/index.js';
-import { httpLogger } from '../../../../logger.js';
 export default function (server, ctx) {
-    server.add(com.atproto.admin.updateAccountHandle, {
-        auth: ctx.authVerifier.adminToken,
-        handler: async ({ input }) => {
-            const { did } = input.body;
-            const handle = await ctx.accountManager.normalizeAndValidateHandle(input.body.handle, {
-                did,
-                allowAnyValid: true,
-            });
-            // Pessimistic check to handle spam: also enforced by updateHandle() and the db.
-            const account = await ctx.accountManager.getAccount(handle, {
-                includeDeactivated: true,
-                includeTakenDown: true,
-            });
-            if (account) {
-                if (account.did !== did) {
-                    throw new InvalidRequestError(`Handle already taken: ${handle}`);
+    const { entrywayClient } = ctx;
+    if (entrywayClient) {
+        server.add(com.atproto.admin.updateAccountHandle, {
+            auth: ctx.authVerifier.adminToken,
+            handler: async ({ input: { body } }) => {
+                const { did, handle } = await ctx.accountManager.validateHandleUpdate(body.did, body.handle, { allowAnyValid: true });
+                // the pds defers to the entryway for updating the handle in the user's
+                // did doc. here was just check that the handle is already
+                // bidirectionally confirmed.
+                //
+                // -> entryway(identity.updateHandle) [update handle, submit plc op]
+                // -> pds(admin.updateAccountHandle)  [track handle, sequence handle update]
+                //
+                // @TODO if handle is taken according to this PDS, should we force-update?
+                const doc = await ctx.idResolver.did
+                    .resolveAtprotoData(did, true)
+                    .catch(() => undefined);
+                if (!doc || doc.handle !== handle) {
+                    throw new InvalidRequestError('Handle does not match DID doc');
                 }
-            }
-            else {
-                if (ctx.cfg.entryway) {
-                    // the pds defers to the entryway for updating the handle in the user's did doc.
-                    // here was just check that the handle is already bidirectionally confirmed.
-                    // @TODO if handle is taken according to this PDS, should we force-update?
-                    const doc = await ctx.idResolver.did
-                        .resolveAtprotoData(did, true)
-                        .catch(() => undefined);
-                    if (doc?.handle !== handle) {
-                        throw new InvalidRequestError('Handle does not match DID doc');
-                    }
-                }
-                else {
-                    await ctx.plcClient.updateHandle(did, ctx.plcRotationKey, handle);
-                }
-                await ctx.accountManager.updateHandle(did, handle);
-            }
-            try {
-                await ctx.sequencer.sequenceIdentityEvt(did, handle);
-            }
-            catch (err) {
-                httpLogger.error({ err, did, handle }, 'failed to sequence handle update');
-            }
-        },
-    });
+                await ctx.accountManager.updateAccountHandle(did, handle);
+            },
+        });
+    }
+    else {
+        server.add(com.atproto.admin.updateAccountHandle, {
+            auth: ctx.authVerifier.adminToken,
+            handler: async ({ input: { body } }) => {
+                await ctx.accountManager.updateHandle(body.did, body.handle, {
+                    allowAnyValid: true,
+                });
+            },
+        });
+    }
 }
 //# sourceMappingURL=updateAccountHandle.js.map

package/dist/api/com/atproto/admin/updateAccountHandle.js.map

@@ -1 +1 @@
-{"version":3,"file":"updateAccountHandle.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/admin/updateAccountHandle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAU,MAAM,sBAAsB,CAAA;AAElE,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAElD,MAAM,CAAC,OAAO,WAAW,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE;QAChD,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,UAAU;QACjC,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;YAC3B,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,IAAI,CAAA;YAC1B,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,0BAA0B,CAChE,KAAK,CAAC,IAAI,CAAC,MAAM,EACjB;gBACE,GAAG;gBACH,aAAa,EAAE,IAAI;aACpB,CACF,CAAA;YAED,gFAAgF;YAChF,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC1D,kBAAkB,EAAE,IAAI;gBACxB,gBAAgB,EAAE,IAAI;aACvB,CAAC,CAAA;YAEF,IAAI,OAAO,EAAE,CAAC;gBACZ,IAAI,OAAO,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;oBACxB,MAAM,IAAI,mBAAmB,CAAC,yBAAyB,MAAM,EAAE,CAAC,CAAA;gBAClE,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;oBACrB,gFAAgF;oBAChF,4EAA4E;oBAC5E,0EAA0E;oBAC1E,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,GAAG;yBACjC,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC;yBAC7B,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;oBACzB,IAAI,GAAG,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;wBAC3B,MAAM,IAAI,mBAAmB,CAAC,+BAA+B,CAAC,CAAA;oBAChE,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;gBACnE,CAAC;gBACD,MAAM,GAAG,CAAC,cAAc,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;YACpD,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,GAAG,CAAC,SAAS,CAAC,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;YACtD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,UAAU,CAAC,KAAK,CACd,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EACpB,kCAAkC,CACnC,CAAA;YACH,CAAC;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { InvalidRequestError, Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context.js'\nimport { com } from '../../../../lexicons/index.js'\nimport { httpLogger } from '../../../../logger.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(com.atproto.admin.updateAccountHandle, {\n    auth: ctx.authVerifier.adminToken,\n    handler: async ({ input }) => {\n      const { did } = input.body\n      const handle = await ctx.accountManager.normalizeAndValidateHandle(\n        input.body.handle,\n        {\n          did,\n          allowAnyValid: true,\n        },\n      )\n\n      // Pessimistic check to handle spam: also enforced by updateHandle() and the db.\n      const account = await ctx.accountManager.getAccount(handle, {\n        includeDeactivated: true,\n        includeTakenDown: true,\n      })\n\n      if (account) {\n        if (account.did !== did) {\n          throw new InvalidRequestError(`Handle already taken: ${handle}`)\n        }\n      } else {\n        if (ctx.cfg.entryway) {\n          // the pds defers to the entryway for updating the handle in the user's did doc.\n          // here was just check that the handle is already bidirectionally confirmed.\n          // @TODO if handle is taken according to this PDS, should we force-update?\n          const doc = await ctx.idResolver.did\n            .resolveAtprotoData(did, true)\n            .catch(() => undefined)\n          if (doc?.handle !== handle) {\n            throw new InvalidRequestError('Handle does not match DID doc')\n          }\n        } else {\n          await ctx.plcClient.updateHandle(did, ctx.plcRotationKey, handle)\n        }\n        await ctx.accountManager.updateHandle(did, handle)\n      }\n\n      try {\n        await ctx.sequencer.sequenceIdentityEvt(did, handle)\n      } catch (err) {\n        httpLogger.error(\n          { err, did, handle },\n          'failed to sequence handle update',\n        )\n      }\n    },\n  })\n}\n"]}
+{"version":3,"file":"updateAccountHandle.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/admin/updateAccountHandle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAU,MAAM,sBAAsB,CAAA;AAElE,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AAEnD,MAAM,CAAC,OAAO,WAAW,MAAc,EAAE,GAAe;IACtD,MAAM,EAAE,cAAc,EAAE,GAAG,GAAG,CAAA;IAE9B,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE;YAChD,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,UAAU;YACjC,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE;gBACrC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,oBAAoB,CACnE,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,MAAM,EACX,EAAE,aAAa,EAAE,IAAI,EAAE,CACxB,CAAA;gBAED,uEAAuE;gBACvE,0DAA0D;gBAC1D,6BAA6B;gBAC7B,EAAE;gBACF,oEAAoE;gBACpE,4EAA4E;gBAC5E,EAAE;gBACF,0EAA0E;gBAC1E,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,GAAG;qBACjC,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC;qBAC7B,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;gBAEzB,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;oBAClC,MAAM,IAAI,mBAAmB,CAAC,+BAA+B,CAAC,CAAA;gBAChE,CAAC;gBAED,MAAM,GAAG,CAAC,cAAc,CAAC,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;YAC3D,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE;YAChD,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,UAAU;YACjC,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE;gBACrC,MAAM,GAAG,CAAC,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE;oBAC3D,aAAa,EAAE,IAAI;iBACpB,CAAC,CAAA;YACJ,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;AACH,CAAC","sourcesContent":["import { InvalidRequestError, Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context.js'\nimport { com } from '../../../../lexicons/index.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const { entrywayClient } = ctx\n\n  if (entrywayClient) {\n    server.add(com.atproto.admin.updateAccountHandle, {\n      auth: ctx.authVerifier.adminToken,\n      handler: async ({ input: { body } }) => {\n        const { did, handle } = await ctx.accountManager.validateHandleUpdate(\n          body.did,\n          body.handle,\n          { allowAnyValid: true },\n        )\n\n        // the pds defers to the entryway for updating the handle in the user's\n        // did doc. here was just check that the handle is already\n        // bidirectionally confirmed.\n        //\n        // -> entryway(identity.updateHandle) [update handle, submit plc op]\n        // -> pds(admin.updateAccountHandle)  [track handle, sequence handle update]\n        //\n        // @TODO if handle is taken according to this PDS, should we force-update?\n        const doc = await ctx.idResolver.did\n          .resolveAtprotoData(did, true)\n          .catch(() => undefined)\n\n        if (!doc || doc.handle !== handle) {\n          throw new InvalidRequestError('Handle does not match DID doc')\n        }\n\n        await ctx.accountManager.updateAccountHandle(did, handle)\n      },\n    })\n  } else {\n    server.add(com.atproto.admin.updateAccountHandle, {\n      auth: ctx.authVerifier.adminToken,\n      handler: async ({ input: { body } }) => {\n        await ctx.accountManager.updateHandle(body.did, body.handle, {\n          allowAnyValid: true,\n        })\n      },\n    })\n  }\n}\n"]}

package/dist/api/com/atproto/identity/updateHandle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateHandle.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/identity/updateHandle.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAInD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QA0FvD"}
+{"version":3,"file":"updateHandle.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/identity/updateHandle.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAE9D,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAGnD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QA2DvD"}

package/dist/api/com/atproto/identity/updateHandle.js

@@ -1,75 +1,53 @@
 import { DAY, MINUTE } from '@atproto/common';
-import { InvalidRequestError } from '@atproto/xrpc-server';
 import { com } from '../../../../lexicons/index.js';
-import { httpLogger } from '../../../../logger.js';
 export default function (server, ctx) {
-    server.add(com.atproto.identity.updateHandle, {
-        auth: ctx.authVerifier.authorization({
-            checkTakedown: true,
-            authorize: (permissions) => {
-                permissions.assertIdentity({ attr: 'handle' });
-            },
-        }),
-        rateLimit: [
-            {
-                durationMs: 5 * MINUTE,
-                points: 10,
-                calcKey: ({ auth }) => auth.credentials.did,
-            },
-            {
-                durationMs: DAY,
-                points: 50,
-                calcKey: ({ auth }) => auth.credentials.did,
-            },
-        ],
-        handler: async ({ auth, input, req }) => {
-            const requester = auth.credentials.did;
-            if (ctx.entrywayClient) {
+    const { entrywayClient } = ctx;
+    const auth = ctx.authVerifier.authorization({
+        checkTakedown: true,
+        authorize: (permissions) => {
+            permissions.assertIdentity({ attr: 'handle' });
+        },
+    });
+    const rateLimit = [
+        {
+            durationMs: 5 * MINUTE,
+            points: 10,
+            calcKey: ({ auth }) => auth.credentials.did,
+        },
+        {
+            durationMs: DAY,
+            points: 50,
+            calcKey: ({ auth }) => auth.credentials.did,
+        },
+    ];
+    if (entrywayClient) {
+        server.add(com.atproto.identity.updateHandle, {
+            auth,
+            rateLimit,
+            handler: async ({ auth, input, req }) => {
                 const { headers } = await ctx.entrywayAuthHeaders(req, auth.credentials.did, com.atproto.identity.updateHandle.$lxm);
-                // the full flow is:
+                // The full flow is:
                 // -> entryway(identity.updateHandle) [update handle, submit plc op]
                 // -> pds(admin.updateAccountHandle)  [track handle, sequence handle update]
-                await ctx.entrywayClient.xrpc(com.atproto.identity.updateHandle, {
+                await entrywayClient.xrpc(com.atproto.identity.updateHandle, {
                     headers,
                     body: {
                         handle: input.body.handle,
                         // @ts-expect-error "did" is not in the schema
-                        did: requester,
+                        did: auth.credentials.did,
                     },
                 });
-                return;
-            }
-            const handle = await ctx.accountManager.normalizeAndValidateHandle(input.body.handle, { did: requester });
-            // Pessimistic check to handle spam: also enforced by updateHandle() and the db.
-            const account = await ctx.accountManager.getAccount(handle, {
-                includeDeactivated: true,
-            });
-            if (!account) {
-                if (requester.startsWith('did:plc:')) {
-                    await ctx.plcClient.updateHandle(requester, ctx.plcRotationKey, handle);
-                }
-                else {
-                    const resolved = await ctx.idResolver.did.resolveAtprotoData(requester, true);
-                    if (resolved.handle !== handle) {
-                        throw new InvalidRequestError('DID is not properly configured for handle');
-                    }
-                }
-                await ctx.accountManager.updateHandle(requester, handle);
-            }
-            else {
-                // if we found an account with matching handle, check if it is the same as requester
-                // if so emit an identity event, otherwise error.
-                if (account.did !== requester) {
-                    throw new InvalidRequestError(`Handle already taken: ${handle}`);
-                }
-            }
-            try {
-                await ctx.sequencer.sequenceIdentityEvt(requester, handle);
-            }
-            catch (err) {
-                httpLogger.error({ err, did: requester, handle }, 'failed to sequence handle update');
-            }
-        },
-    });
+            },
+        });
+    }
+    else {
+        server.add(com.atproto.identity.updateHandle, {
+            auth,
+            rateLimit,
+            handler: async ({ auth, input }) => {
+                await ctx.accountManager.updateHandle(auth.credentials.did, input.body.handle);
+            },
+        });
+    }
 }
 //# sourceMappingURL=updateHandle.js.map

package/dist/api/com/atproto/identity/updateHandle.js.map

@@ -1 +1 @@
-{"version":3,"file":"updateHandle.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/identity/updateHandle.ts"],"names":[],"mappings":"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","sourcesContent":["import { DAY, MINUTE } from '@atproto/common'\nimport { InvalidRequestError, Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context.js'\nimport { com } from '../../../../lexicons/index.js'\nimport { httpLogger } from '../../../../logger.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(com.atproto.identity.updateHandle, {\n    auth: ctx.authVerifier.authorization({\n      checkTakedown: true,\n      authorize: (permissions) => {\n        permissions.assertIdentity({ attr: 'handle' })\n      },\n    }),\n    rateLimit: [\n      {\n        durationMs: 5 * MINUTE,\n        points: 10,\n        calcKey: ({ auth }) => auth.credentials.did,\n      },\n      {\n        durationMs: DAY,\n        points: 50,\n        calcKey: ({ auth }) => auth.credentials.did,\n      },\n    ],\n    handler: async ({ auth, input, req }) => {\n      const requester = auth.credentials.did\n\n      if (ctx.entrywayClient) {\n        const { headers } = await ctx.entrywayAuthHeaders(\n          req,\n          auth.credentials.did,\n          com.atproto.identity.updateHandle.$lxm,\n        )\n        // the full flow is:\n        // -> entryway(identity.updateHandle) [update handle, submit plc op]\n        // -> pds(admin.updateAccountHandle)  [track handle, sequence handle update]\n        await ctx.entrywayClient.xrpc(com.atproto.identity.updateHandle, {\n          headers,\n          body: {\n            handle: input.body.handle,\n            // @ts-expect-error \"did\" is not in the schema\n            did: requester,\n          },\n        })\n        return\n      }\n\n      const handle = await ctx.accountManager.normalizeAndValidateHandle(\n        input.body.handle,\n        { did: requester },\n      )\n\n      // Pessimistic check to handle spam: also enforced by updateHandle() and the db.\n      const account = await ctx.accountManager.getAccount(handle, {\n        includeDeactivated: true,\n      })\n\n      if (!account) {\n        if (requester.startsWith('did:plc:')) {\n          await ctx.plcClient.updateHandle(\n            requester,\n            ctx.plcRotationKey,\n            handle,\n          )\n        } else {\n          const resolved = await ctx.idResolver.did.resolveAtprotoData(\n            requester,\n            true,\n          )\n          if (resolved.handle !== handle) {\n            throw new InvalidRequestError(\n              'DID is not properly configured for handle',\n            )\n          }\n        }\n        await ctx.accountManager.updateHandle(requester, handle)\n      } else {\n        // if we found an account with matching handle, check if it is the same as requester\n        // if so emit an identity event, otherwise error.\n        if (account.did !== requester) {\n          throw new InvalidRequestError(`Handle already taken: ${handle}`)\n        }\n      }\n\n      try {\n        await ctx.sequencer.sequenceIdentityEvt(requester, handle)\n      } catch (err) {\n        httpLogger.error(\n          { err, did: requester, handle },\n          'failed to sequence handle update',\n        )\n      }\n    },\n  })\n}\n"]}
+{"version":3,"file":"updateHandle.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/identity/updateHandle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAI7C,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AAEnD,MAAM,CAAC,OAAO,WAAW,MAAc,EAAE,GAAe;IACtD,MAAM,EAAE,cAAc,EAAE,GAAG,GAAG,CAAA;IAE9B,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC;QAC1C,aAAa,EAAE,IAAI;QACnB,SAAS,EAAE,CAAC,WAAW,EAAE,EAAE;YACzB,WAAW,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;QAChD,CAAC;KACF,CAAC,CAAA;IAEF,MAAM,SAAS,GAAgD;QAC7D;YACE,UAAU,EAAE,CAAC,GAAG,MAAM;YACtB,MAAM,EAAE,EAAE;YACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG;SAC5C;QACD;YACE,UAAU,EAAE,GAAG;YACf,MAAM,EAAE,EAAE;YACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG;SAC5C;KACF,CAAA;IAED,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE;YAC5C,IAAI;YACJ,SAAS;YACT,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE;gBACtC,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,GAAG,CAAC,mBAAmB,CAC/C,GAAG,EACH,IAAI,CAAC,WAAW,CAAC,GAAG,EACpB,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CACvC,CAAA;gBAED,oBAAoB;gBACpB,oEAAoE;gBACpE,4EAA4E;gBAC5E,MAAM,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE;oBAC3D,OAAO;oBACP,IAAI,EAAE;wBACJ,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM;wBACzB,8CAA8C;wBAC9C,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG;qBAC1B;iBACF,CAAC,CAAA;YACJ,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE;YAC5C,IAAI;YACJ,SAAS;YACT,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;gBACjC,MAAM,GAAG,CAAC,cAAc,CAAC,YAAY,CACnC,IAAI,CAAC,WAAW,CAAC,GAAG,EACpB,KAAK,CAAC,IAAI,CAAC,MAAM,CAClB,CAAA;YACH,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;AACH,CAAC","sourcesContent":["import { DAY, MINUTE } from '@atproto/common'\nimport { MethodRateLimit, Server } from '@atproto/xrpc-server'\nimport { AccessOutput, OAuthOutput } from '../../../../auth-output.js'\nimport { AppContext } from '../../../../context.js'\nimport { com } from '../../../../lexicons/index.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const { entrywayClient } = ctx\n\n  const auth = ctx.authVerifier.authorization({\n    checkTakedown: true,\n    authorize: (permissions) => {\n      permissions.assertIdentity({ attr: 'handle' })\n    },\n  })\n\n  const rateLimit: MethodRateLimit<AccessOutput | OAuthOutput> = [\n    {\n      durationMs: 5 * MINUTE,\n      points: 10,\n      calcKey: ({ auth }) => auth.credentials.did,\n    },\n    {\n      durationMs: DAY,\n      points: 50,\n      calcKey: ({ auth }) => auth.credentials.did,\n    },\n  ]\n\n  if (entrywayClient) {\n    server.add(com.atproto.identity.updateHandle, {\n      auth,\n      rateLimit,\n      handler: async ({ auth, input, req }) => {\n        const { headers } = await ctx.entrywayAuthHeaders(\n          req,\n          auth.credentials.did,\n          com.atproto.identity.updateHandle.$lxm,\n        )\n\n        // The full flow is:\n        // -> entryway(identity.updateHandle) [update handle, submit plc op]\n        // -> pds(admin.updateAccountHandle)  [track handle, sequence handle update]\n        await entrywayClient.xrpc(com.atproto.identity.updateHandle, {\n          headers,\n          body: {\n            handle: input.body.handle,\n            // @ts-expect-error \"did\" is not in the schema\n            did: auth.credentials.did,\n          },\n        })\n      },\n    })\n  } else {\n    server.add(com.atproto.identity.updateHandle, {\n      auth,\n      rateLimit,\n      handler: async ({ auth, input }) => {\n        await ctx.accountManager.updateHandle(\n          auth.credentials.did,\n          input.body.handle,\n        )\n      },\n    })\n  }\n}\n"]}

package/dist/api/com/atproto/repo/getRecord.js

@@ -1,4 +1,4 @@
-import { AtUri } from '@atproto/syntax';
+import { atUri } from '@atproto/lex';
 import { InvalidRequestError } from '@atproto/xrpc-server';
 import { com } from '../../../../lexicons/index.js';
 import { pipethrough } from '../../../../pipethrough.js';
@@ -8,7 +8,7 @@ export default function (server, ctx) {
         const did = await ctx.accountManager.getDidForActor(repo);
         // fetch from pds if available, if not then fetch from appview
         if (did) {
-            const uri = AtUri.make(did, collection, rkey);
+            const uri = atUri(did, collection, rkey);
             const record = await ctx.actorStore.read(did, (store) => store.record.getRecord(uri, cid ?? null));
             if (!record || record.takedownRef !== null) {
                 throw new InvalidRequestError(`Could not locate record: ${uri}`, 'RecordNotFound');
@@ -16,7 +16,7 @@ export default function (server, ctx) {
             return {
                 encoding: 'application/json',
                 body: {
-                    uri: uri.toString(),
+                    uri,
                     cid: record.cid,
                     value: record.value,
                 },

package/dist/api/com/atproto/repo/getRecord.js.map

@@ -1 +1 @@
-{"version":3,"file":"getRecord.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/repo/getRecord.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AACvC,OAAO,EAAE,mBAAmB,EAAU,MAAM,sBAAsB,CAAA;AAElE,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAExD,MAAM,CAAC,OAAO,WAAW,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE;QAC/D,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAAA;QAC9C,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;QAEzD,8DAA8D;QAC9D,IAAI,GAAG,EAAE,CAAC;YACR,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,CAAA;YAC7C,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE,CACtD,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,IAAI,IAAI,CAAC,CACzC,CAAA;YACD,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;gBAC3C,MAAM,IAAI,mBAAmB,CAC3B,4BAA4B,GAAG,EAAE,EACjC,gBAAgB,CACjB,CAAA;YACH,CAAC;YACD,OAAO;gBACL,QAAQ,EAAE,kBAA2B;gBACrC,IAAI,EAAE;oBACJ,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;oBACnB,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,KAAK,EAAE,MAAM,CAAC,KAAK;iBACpB;aACF,CAAA;QACH,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;YACzB,MAAM,IAAI,mBAAmB,CAAC,yBAAyB,CAAC,CAAA;QAC1D,CAAC;QAED,OAAO,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAC9B,CAAC,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { AtUri } from '@atproto/syntax'\nimport { InvalidRequestError, Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context.js'\nimport { com } from '../../../../lexicons/index.js'\nimport { pipethrough } from '../../../../pipethrough.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(com.atproto.repo.getRecord, async ({ req, params }) => {\n    const { repo, collection, rkey, cid } = params\n    const did = await ctx.accountManager.getDidForActor(repo)\n\n    // fetch from pds if available, if not then fetch from appview\n    if (did) {\n      const uri = AtUri.make(did, collection, rkey)\n      const record = await ctx.actorStore.read(did, (store) =>\n        store.record.getRecord(uri, cid ?? null),\n      )\n      if (!record || record.takedownRef !== null) {\n        throw new InvalidRequestError(\n          `Could not locate record: ${uri}`,\n          'RecordNotFound',\n        )\n      }\n      return {\n        encoding: 'application/json' as const,\n        body: {\n          uri: uri.toString(),\n          cid: record.cid,\n          value: record.value,\n        },\n      }\n    }\n\n    if (!ctx.cfg.bskyAppView) {\n      throw new InvalidRequestError(`Could not locate record`)\n    }\n\n    return pipethrough(ctx, req)\n  })\n}\n"]}
+{"version":3,"file":"getRecord.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/repo/getRecord.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AACpC,OAAO,EAAE,mBAAmB,EAAU,MAAM,sBAAsB,CAAA;AAElE,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAExD,MAAM,CAAC,OAAO,WAAW,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE;QAC/D,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAAA;QAC9C,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;QAEzD,8DAA8D;QAC9D,IAAI,GAAG,EAAE,CAAC;YACR,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,CAAA;YACxC,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE,CACtD,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,IAAI,IAAI,CAAC,CACzC,CAAA;YACD,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;gBAC3C,MAAM,IAAI,mBAAmB,CAC3B,4BAA4B,GAAG,EAAE,EACjC,gBAAgB,CACjB,CAAA;YACH,CAAC;YACD,OAAO;gBACL,QAAQ,EAAE,kBAA2B;gBACrC,IAAI,EAAE;oBACJ,GAAG;oBACH,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,KAAK,EAAE,MAAM,CAAC,KAAK;iBACpB;aACF,CAAA;QACH,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;YACzB,MAAM,IAAI,mBAAmB,CAAC,yBAAyB,CAAC,CAAA;QAC1D,CAAC;QAED,OAAO,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAC9B,CAAC,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { atUri } from '@atproto/lex'\nimport { InvalidRequestError, Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context.js'\nimport { com } from '../../../../lexicons/index.js'\nimport { pipethrough } from '../../../../pipethrough.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(com.atproto.repo.getRecord, async ({ req, params }) => {\n    const { repo, collection, rkey, cid } = params\n    const did = await ctx.accountManager.getDidForActor(repo)\n\n    // fetch from pds if available, if not then fetch from appview\n    if (did) {\n      const uri = atUri(did, collection, rkey)\n      const record = await ctx.actorStore.read(did, (store) =>\n        store.record.getRecord(uri, cid ?? null),\n      )\n      if (!record || record.takedownRef !== null) {\n        throw new InvalidRequestError(\n          `Could not locate record: ${uri}`,\n          'RecordNotFound',\n        )\n      }\n      return {\n        encoding: 'application/json' as const,\n        body: {\n          uri,\n          cid: record.cid,\n          value: record.value,\n        },\n      }\n    }\n\n    if (!ctx.cfg.bskyAppView) {\n      throw new InvalidRequestError(`Could not locate record`)\n    }\n\n    return pipethrough(ctx, req)\n  })\n}\n"]}

package/dist/api/com/atproto/repo/putRecord.js

@@ -1,5 +1,5 @@
+import { atUri } from '@atproto/lex';
 import { isLegacyBlobRef, parseCid, } from '@atproto/lex-data';
-import { AtUri } from '@atproto/syntax';
 import { AuthRequiredError, InvalidRequestError, } from '@atproto/xrpc-server';
 import { app, com } from '../../../../lexicons/index.js';
 import { dbLogger } from '../../../../logger.js';
@@ -56,7 +56,7 @@ export default function (server, ctx) {
                     collection,
                 });
             }
-            const uri = AtUri.make(did, collection, rkey);
+            const uri = atUri(did, collection, rkey);
             const swapCommitCid = swapCommit ? parseCid(swapCommit) : undefined;
             const swapRecordCid = typeof swapRecord === 'string' ? parseCid(swapRecord) : swapRecord;
             const { commit, write } = await ctx.actorStore.transact(did, async (actorTxn) => {

package/dist/api/com/atproto/repo/putRecord.js.map

@@ -1 +1 @@
-{"version":3,"file":"putRecord.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/repo/putRecord.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  LegacyBlobRef,\n  LexMap,\n  TypedBlobRef,\n  isLegacyBlobRef,\n  parseCid,\n} from '@atproto/lex-data'\nimport { AtUri } from '@atproto/syntax'\nimport {\n  AuthRequiredError,\n  InvalidRequestError,\n  Server,\n} from '@atproto/xrpc-server'\nimport { ActorStoreTransactor } from '../../../../actor-store/actor-store-transactor.js'\nimport { AppContext } from '../../../../context.js'\nimport { app, com } from '../../../../lexicons/index.js'\nimport { dbLogger } from '../../../../logger.js'\nimport {\n  BadCommitSwapError,\n  BadRecordSwapError,\n  InvalidRecordError,\n  PreparedCreate,\n  PreparedUpdate,\n  prepareCreate,\n  prepareUpdate,\n} from '../../../../repo/index.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(com.atproto.repo.putRecord, {\n    auth: ctx.authVerifier.authorization({\n      // @NOTE the \"checkTakedown\" and \"checkDeactivated\" checks are typically\n      // performed during auth. However, since this method's \"repo\" parameter\n      // can be a handle, we will need to fetch the account again to ensure that\n      // the handle matches the DID from the request's credentials. In order to\n      // avoid fetching the account twice (during auth, and then again in the\n      // controller), the checks are disabled here:\n\n      // checkTakedown: true,\n      // checkDeactivated: true,\n      authorize: () => {\n        // Performed in the handler as it requires the request body\n      },\n    }),\n    rateLimit: [\n      {\n        name: 'repo-write-hour',\n        calcKey: ({ auth }) => auth.credentials.did,\n        calcPoints: () => 2,\n      },\n      {\n        name: 'repo-write-day',\n        calcKey: ({ auth }) => auth.credentials.did,\n        calcPoints: () => 2,\n      },\n    ],\n    opts: {\n      jsonLimit: 1_000_000,\n    },\n    handler: async ({ auth, input }) => {\n      const {\n        repo,\n        collection,\n        rkey,\n        record,\n        validate,\n        swapCommit,\n        swapRecord,\n      } = input.body\n\n      const account = await ctx.authVerifier.findAccount(repo, {\n        checkDeactivated: true,\n        checkTakedown: true,\n      })\n\n      const did = account.did\n      if (did !== auth.credentials.did) {\n        throw new AuthRequiredError()\n      }\n\n      // We can't compute permissions based on the request payload (\"input\") in\n      // the 'auth' phase, so we do it here.\n      if (auth.credentials.type === 'oauth') {\n        auth.credentials.permissions.assertRepo({\n          action: 'create',\n          collection,\n        })\n        auth.credentials.permissions.assertRepo({\n          action: 'update',\n          collection,\n        })\n      }\n\n      const uri = AtUri.make(did, collection, rkey)\n      const swapCommitCid = swapCommit ? parseCid(swapCommit) : undefined\n      const swapRecordCid =\n        typeof swapRecord === 'string' ? parseCid(swapRecord) : swapRecord\n\n      const { commit, write } = await ctx.actorStore.transact(\n        did,\n        async (actorTxn) => {\n          const current = await actorTxn.record.getRecord(uri, null, true)\n          const isUpdate = current !== null\n\n          // @TODO temporaray hack for legacy blob refs in profiles - remove after migrating legacy blobs\n          if (isUpdate && collection === app.bsky.actor.profile.$type) {\n            await updateProfileLegacyBlobRef(actorTxn, record)\n          }\n\n          const writeInfo = {\n            did,\n            collection,\n            rkey,\n            record,\n            swapCid: swapRecordCid,\n            validate,\n          }\n\n          let write: PreparedCreate | PreparedUpdate\n          try {\n            write = isUpdate\n              ? await prepareUpdate(writeInfo)\n              : await prepareCreate(writeInfo)\n          } catch (err) {\n            if (err instanceof InvalidRecordError) {\n              throw new InvalidRequestError(err.message)\n            }\n            throw err\n          }\n\n          // no-op\n          if (current && current.cid === write.cid.toString()) {\n            return {\n              commit: null,\n              write,\n            }\n          }\n\n          const commit = await actorTxn.repo\n            .processWrites([write], swapCommitCid)\n            .catch((err) => {\n              if (\n                err instanceof BadCommitSwapError ||\n                err instanceof BadRecordSwapError\n              ) {\n                throw new InvalidRequestError(err.message, 'InvalidSwap')\n              } else {\n                throw err\n              }\n            })\n\n          await ctx.sequencer.sequenceCommit(did, commit)\n\n          return { commit, write }\n        },\n      )\n\n      if (commit !== null) {\n        await ctx.accountManager\n          .updateRepoRoot(did, commit.cid, commit.rev)\n          .catch((err) => {\n            dbLogger.error(\n              { err, did, cid: commit.cid, rev: commit.rev },\n              'failed to update account root',\n            )\n          })\n      }\n\n      return {\n        encoding: 'application/json',\n        body: {\n          uri: write.uri.toString(),\n          cid: write.cid.toString(),\n          commit: commit\n            ? {\n                cid: commit.cid.toString(),\n                rev: commit.rev,\n              }\n            : undefined,\n          validationStatus: write.validationStatus,\n        },\n      }\n    },\n  })\n}\n\n// WARNING: mutates object\nasync function updateProfileLegacyBlobRef(\n  actorStore: ActorStoreTransactor,\n  record: LexMap,\n): Promise<void> {\n  if (isLegacyBlobRef(record.avatar)) {\n    record.avatar = await upgradeLegacyBlob(actorStore, record.avatar)\n  }\n  if (isLegacyBlobRef(record.banner)) {\n    record.banner = await upgradeLegacyBlob(actorStore, record.banner)\n  }\n}\n\nasync function upgradeLegacyBlob(\n  actorStore: ActorStoreTransactor,\n  legacyBlob: LegacyBlobRef,\n): Promise<TypedBlobRef> {\n  const ref = parseCid(legacyBlob.cid)\n  const blob = await actorStore.repo.blob.getBlobMetadata(ref)\n  return {\n    $type: 'blob',\n    mimeType: legacyBlob.mimeType,\n    ref,\n    size: blob.size,\n  }\n}\n"]}
+{"version":3,"file":"putRecord.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/repo/putRecord.ts"],"names":[],"mappings":"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","sourcesContent":["import { atUri } from '@atproto/lex'\nimport {\n  LegacyBlobRef,\n  LexMap,\n  TypedBlobRef,\n  isLegacyBlobRef,\n  parseCid,\n} from '@atproto/lex-data'\nimport {\n  AuthRequiredError,\n  InvalidRequestError,\n  Server,\n} from '@atproto/xrpc-server'\nimport { ActorStoreTransactor } from '../../../../actor-store/actor-store-transactor.js'\nimport { AppContext } from '../../../../context.js'\nimport { app, com } from '../../../../lexicons/index.js'\nimport { dbLogger } from '../../../../logger.js'\nimport {\n  BadCommitSwapError,\n  BadRecordSwapError,\n  InvalidRecordError,\n  PreparedCreate,\n  PreparedUpdate,\n  prepareCreate,\n  prepareUpdate,\n} from '../../../../repo/index.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(com.atproto.repo.putRecord, {\n    auth: ctx.authVerifier.authorization({\n      // @NOTE the \"checkTakedown\" and \"checkDeactivated\" checks are typically\n      // performed during auth. However, since this method's \"repo\" parameter\n      // can be a handle, we will need to fetch the account again to ensure that\n      // the handle matches the DID from the request's credentials. In order to\n      // avoid fetching the account twice (during auth, and then again in the\n      // controller), the checks are disabled here:\n\n      // checkTakedown: true,\n      // checkDeactivated: true,\n      authorize: () => {\n        // Performed in the handler as it requires the request body\n      },\n    }),\n    rateLimit: [\n      {\n        name: 'repo-write-hour',\n        calcKey: ({ auth }) => auth.credentials.did,\n        calcPoints: () => 2,\n      },\n      {\n        name: 'repo-write-day',\n        calcKey: ({ auth }) => auth.credentials.did,\n        calcPoints: () => 2,\n      },\n    ],\n    opts: {\n      jsonLimit: 1_000_000,\n    },\n    handler: async ({ auth, input }) => {\n      const {\n        repo,\n        collection,\n        rkey,\n        record,\n        validate,\n        swapCommit,\n        swapRecord,\n      } = input.body\n\n      const account = await ctx.authVerifier.findAccount(repo, {\n        checkDeactivated: true,\n        checkTakedown: true,\n      })\n\n      const did = account.did\n      if (did !== auth.credentials.did) {\n        throw new AuthRequiredError()\n      }\n\n      // We can't compute permissions based on the request payload (\"input\") in\n      // the 'auth' phase, so we do it here.\n      if (auth.credentials.type === 'oauth') {\n        auth.credentials.permissions.assertRepo({\n          action: 'create',\n          collection,\n        })\n        auth.credentials.permissions.assertRepo({\n          action: 'update',\n          collection,\n        })\n      }\n\n      const uri = atUri(did, collection, rkey)\n      const swapCommitCid = swapCommit ? parseCid(swapCommit) : undefined\n      const swapRecordCid =\n        typeof swapRecord === 'string' ? parseCid(swapRecord) : swapRecord\n\n      const { commit, write } = await ctx.actorStore.transact(\n        did,\n        async (actorTxn) => {\n          const current = await actorTxn.record.getRecord(uri, null, true)\n          const isUpdate = current !== null\n\n          // @TODO temporaray hack for legacy blob refs in profiles - remove after migrating legacy blobs\n          if (isUpdate && collection === app.bsky.actor.profile.$type) {\n            await updateProfileLegacyBlobRef(actorTxn, record)\n          }\n\n          const writeInfo = {\n            did,\n            collection,\n            rkey,\n            record,\n            swapCid: swapRecordCid,\n            validate,\n          }\n\n          let write: PreparedCreate | PreparedUpdate\n          try {\n            write = isUpdate\n              ? await prepareUpdate(writeInfo)\n              : await prepareCreate(writeInfo)\n          } catch (err) {\n            if (err instanceof InvalidRecordError) {\n              throw new InvalidRequestError(err.message)\n            }\n            throw err\n          }\n\n          // no-op\n          if (current && current.cid === write.cid.toString()) {\n            return {\n              commit: null,\n              write,\n            }\n          }\n\n          const commit = await actorTxn.repo\n            .processWrites([write], swapCommitCid)\n            .catch((err) => {\n              if (\n                err instanceof BadCommitSwapError ||\n                err instanceof BadRecordSwapError\n              ) {\n                throw new InvalidRequestError(err.message, 'InvalidSwap')\n              } else {\n                throw err\n              }\n            })\n\n          await ctx.sequencer.sequenceCommit(did, commit)\n\n          return { commit, write }\n        },\n      )\n\n      if (commit !== null) {\n        await ctx.accountManager\n          .updateRepoRoot(did, commit.cid, commit.rev)\n          .catch((err) => {\n            dbLogger.error(\n              { err, did, cid: commit.cid, rev: commit.rev },\n              'failed to update account root',\n            )\n          })\n      }\n\n      return {\n        encoding: 'application/json',\n        body: {\n          uri: write.uri.toString(),\n          cid: write.cid.toString(),\n          commit: commit\n            ? {\n                cid: commit.cid.toString(),\n                rev: commit.rev,\n              }\n            : undefined,\n          validationStatus: write.validationStatus,\n        },\n      }\n    },\n  })\n}\n\n// WARNING: mutates object\nasync function updateProfileLegacyBlobRef(\n  actorStore: ActorStoreTransactor,\n  record: LexMap,\n): Promise<void> {\n  if (isLegacyBlobRef(record.avatar)) {\n    record.avatar = await upgradeLegacyBlob(actorStore, record.avatar)\n  }\n  if (isLegacyBlobRef(record.banner)) {\n    record.banner = await upgradeLegacyBlob(actorStore, record.banner)\n  }\n}\n\nasync function upgradeLegacyBlob(\n  actorStore: ActorStoreTransactor,\n  legacyBlob: LegacyBlobRef,\n): Promise<TypedBlobRef> {\n  const ref = parseCid(legacyBlob.cid)\n  const blob = await actorStore.repo.blob.getBlobMetadata(ref)\n  return {\n    $type: 'blob',\n    mimeType: legacyBlob.mimeType,\n    ref,\n    size: blob.size,\n  }\n}\n"]}

package/dist/api/com/atproto/server/getServiceAuth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getServiceAuth.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/getServiceAuth.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,MAAM,EAEP,MAAM,sBAAsB,CAAA;AAM7B,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAOnD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAoFvD"}
+{"version":3,"file":"getServiceAuth.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/getServiceAuth.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,MAAM,EAEP,MAAM,sBAAsB,CAAA;AAM7B,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAOnD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QA0FvD"}

package/dist/api/com/atproto/server/getServiceAuth.js

@@ -1,4 +1,5 @@
 import { HOUR, MINUTE } from '@atproto/common';
+import { isAtprotoDid, isAtprotoDidRefAbsolute } from '@atproto/did';
 import { InvalidRequestError, createServiceJwt, } from '@atproto/xrpc-server';
 import { AuthScope, isAccessPrivileged, isTakendown, } from '../../../../auth-scope.js';
 import { com } from '../../../../lexicons/index.js';
@@ -16,6 +17,9 @@ export default function (server, ctx) {
             const did = auth.credentials.did;
             // @NOTE "exp" is expressed in seconds since epoch, not milliseconds
             const { aud, exp, lxm = null } = params;
+            if (!isAtprotoDid(aud) && !isAtprotoDidRefAbsolute(aud)) {
+                throw new InvalidRequestError('aud must be a valid atproto DID or did#serviceId reference');
+            }
             // Takendown accounts should not be able to generate service auth tokens except for methods necessary for account migration
             if (auth.credentials.type === 'access') {
                 // @NOTE We should probably use "ForbiddenError" here. Using

package/dist/api/com/atproto/server/getServiceAuth.js.map

@@ -1 +1 @@
-{"version":3,"file":"getServiceAuth.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/getServiceAuth.ts"],"names":[],"mappings":"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","sourcesContent":["import { HOUR, MINUTE } from '@atproto/common'\nimport { l } from '@atproto/lex'\nimport {\n  InvalidRequestError,\n  Server,\n  createServiceJwt,\n} from '@atproto/xrpc-server'\nimport {\n  AuthScope,\n  isAccessPrivileged,\n  isTakendown,\n} from '../../../../auth-scope.js'\nimport { AppContext } from '../../../../context.js'\nimport { com } from '../../../../lexicons/index.js'\nimport {\n  PRIVILEGED_METHODS,\n  PROTECTED_METHODS,\n} from '../../../../pipethrough.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(com.atproto.server.getServiceAuth, {\n    auth: ctx.authVerifier.authorization<\n      l.InferMethodParams<typeof com.atproto.server.getServiceAuth.main>\n    >({\n      additional: [AuthScope.Takendown],\n      authorize: (permissions, { params }) => {\n        const { aud, lxm = '*' } = params\n        permissions.assertRpc({ aud, lxm })\n      },\n    }),\n    handler: async ({ params, auth }) => {\n      const did = auth.credentials.did\n\n      // @NOTE \"exp\" is expressed in seconds since epoch, not milliseconds\n      const { aud, exp, lxm = null } = params\n\n      // Takendown accounts should not be able to generate service auth tokens except for methods necessary for account migration\n      if (auth.credentials.type === 'access') {\n        // @NOTE We should probably use \"ForbiddenError\" here. Using\n        // \"InvalidRequestError\" for legacy reasons.\n        if (\n          isTakendown(auth.credentials.scope) &&\n          lxm !== com.atproto.server.createAccount.$lxm\n        ) {\n          throw new InvalidRequestError('Bad token scope', 'InvalidToken')\n        }\n\n        // @NOTE \"oauth\" based credentials already checked through permission\n        // set in \"authorize\" method above.\n        if (\n          lxm != null &&\n          PRIVILEGED_METHODS.has(lxm) &&\n          !isAccessPrivileged(auth.credentials.scope)\n        ) {\n          throw new InvalidRequestError(\n            `insufficient access to request a service auth token for the following method: ${lxm}`,\n          )\n        }\n      }\n\n      if (exp) {\n        const diff = exp * 1000 - Date.now()\n        if (diff < 0) {\n          throw new InvalidRequestError(\n            'expiration is in past',\n            'BadExpiration',\n          )\n        } else if (diff > HOUR) {\n          throw new InvalidRequestError(\n            'cannot request a token with an expiration more than an hour in the future',\n            'BadExpiration',\n          )\n        } else if (!lxm && diff > MINUTE) {\n          throw new InvalidRequestError(\n            'cannot request a method-less token with an expiration more than a minute in the future',\n            'BadExpiration',\n          )\n        }\n      }\n\n      if (lxm && PROTECTED_METHODS.has(lxm)) {\n        throw new InvalidRequestError(\n          `cannot request a service auth token for the following protected method: ${lxm}`,\n        )\n      }\n\n      const keypair = await ctx.actorStore.keypair(did)\n\n      const token = await createServiceJwt({\n        iss: did,\n        aud,\n        exp,\n        lxm,\n        keypair,\n      })\n      return {\n        encoding: 'application/json' as const,\n        body: {\n          token,\n        },\n      }\n    },\n  })\n}\n"]}
+{"version":3,"file":"getServiceAuth.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/getServiceAuth.ts"],"names":[],"mappings":"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","sourcesContent":["import { HOUR, MINUTE } from '@atproto/common'\nimport { isAtprotoDid, isAtprotoDidRefAbsolute } from '@atproto/did'\nimport { l } from '@atproto/lex'\nimport {\n  InvalidRequestError,\n  Server,\n  createServiceJwt,\n} from '@atproto/xrpc-server'\nimport {\n  AuthScope,\n  isAccessPrivileged,\n  isTakendown,\n} from '../../../../auth-scope.js'\nimport { AppContext } from '../../../../context.js'\nimport { com } from '../../../../lexicons/index.js'\nimport {\n  PRIVILEGED_METHODS,\n  PROTECTED_METHODS,\n} from '../../../../pipethrough.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(com.atproto.server.getServiceAuth, {\n    auth: ctx.authVerifier.authorization<\n      l.InferMethodParams<typeof com.atproto.server.getServiceAuth.main>\n    >({\n      additional: [AuthScope.Takendown],\n      authorize: (permissions, { params }) => {\n        const { aud, lxm = '*' } = params\n        permissions.assertRpc({ aud, lxm })\n      },\n    }),\n    handler: async ({ params, auth }) => {\n      const did = auth.credentials.did\n\n      // @NOTE \"exp\" is expressed in seconds since epoch, not milliseconds\n      const { aud, exp, lxm = null } = params\n\n      if (!isAtprotoDid(aud) && !isAtprotoDidRefAbsolute(aud)) {\n        throw new InvalidRequestError(\n          'aud must be a valid atproto DID or did#serviceId reference',\n        )\n      }\n\n      // Takendown accounts should not be able to generate service auth tokens except for methods necessary for account migration\n      if (auth.credentials.type === 'access') {\n        // @NOTE We should probably use \"ForbiddenError\" here. Using\n        // \"InvalidRequestError\" for legacy reasons.\n        if (\n          isTakendown(auth.credentials.scope) &&\n          lxm !== com.atproto.server.createAccount.$lxm\n        ) {\n          throw new InvalidRequestError('Bad token scope', 'InvalidToken')\n        }\n\n        // @NOTE \"oauth\" based credentials already checked through permission\n        // set in \"authorize\" method above.\n        if (\n          lxm != null &&\n          PRIVILEGED_METHODS.has(lxm) &&\n          !isAccessPrivileged(auth.credentials.scope)\n        ) {\n          throw new InvalidRequestError(\n            `insufficient access to request a service auth token for the following method: ${lxm}`,\n          )\n        }\n      }\n\n      if (exp) {\n        const diff = exp * 1000 - Date.now()\n        if (diff < 0) {\n          throw new InvalidRequestError(\n            'expiration is in past',\n            'BadExpiration',\n          )\n        } else if (diff > HOUR) {\n          throw new InvalidRequestError(\n            'cannot request a token with an expiration more than an hour in the future',\n            'BadExpiration',\n          )\n        } else if (!lxm && diff > MINUTE) {\n          throw new InvalidRequestError(\n            'cannot request a method-less token with an expiration more than a minute in the future',\n            'BadExpiration',\n          )\n        }\n      }\n\n      if (lxm && PROTECTED_METHODS.has(lxm)) {\n        throw new InvalidRequestError(\n          `cannot request a service auth token for the following protected method: ${lxm}`,\n        )\n      }\n\n      const keypair = await ctx.actorStore.keypair(did)\n\n      const token = await createServiceJwt({\n        iss: did,\n        aud,\n        exp,\n        lxm,\n        keypair,\n      })\n      return {\n        encoding: 'application/json' as const,\n        body: {\n          token,\n        },\n      }\n    },\n  })\n}\n"]}

package/dist/config/config.d.ts

@@ -1,5 +1,6 @@
-import { BrandingInput, HcaptchaConfig } from '@atproto/oauth-provider';
+import { BrandingInput as BrandingConfig, HcaptchaConfig } from '@atproto/oauth-provider';
 import { ServerEnvironment } from './env.js';
+export type { BrandingConfig };
 export declare const envToCfg: (env: ServerEnvironment) => ServerConfig;
 export type ServerConfig = {
     service: ServiceConfig;
@@ -20,6 +21,7 @@ export type ServerConfig = {
     crawlers: string[];
     fetch: FetchConfig;
     proxy: ProxyConfig;
+    branding: BrandingConfig;
     oauth: OAuthConfig;
     lexicon: LexiconResolverConfig;
 };
@@ -105,7 +107,7 @@ export type OAuthConfig = {
     issuer: string;
     provider?: {
         hcaptcha?: HcaptchaConfig;
-        branding: BrandingInput;
+        branding: BrandingConfig;
         trustedClients?: string[];
     };
 };
@@ -122,6 +124,7 @@ export type InvitesConfig = {
 export type EmailConfig = {
     smtpUrl: string;
     fromAddress: string;
+    disableConfirmationLink: boolean;
 };
 export type SubscriptionConfig = {
     maxBuffer: number;

package/dist/config/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"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"}

package/dist/config/config.js

@@ -132,6 +132,7 @@ export const envToCfg = (env) => {
         emailCfg = {
             smtpUrl: env.emailSmtpUrl,
             fromAddress: env.emailFromAddress,
+            disableConfirmationLink: env.emailDisableConfirmationLink ?? false,
         };
     }
     let moderationEmailCfg;
@@ -145,6 +146,7 @@ export const envToCfg = (env) => {
         moderationEmailCfg = {
             smtpUrl: env.moderationEmailSmtpUrl,
             fromAddress: env.moderationEmailAddress,
+            disableConfirmationLink: false,
         };
     }
     const subscriptionCfg = {
@@ -209,6 +211,52 @@ export const envToCfg = (env) => {
             : 0,
         preferCompressed: env.proxyPreferCompressed ?? false,
     };
+    const brandingCfg = {
+        name: env.serviceName ?? `${hostname} PDS`,
+        logo: env.logoUrl,
+        colors: {
+            light: env.lightColor,
+            dark: env.darkColor,
+            contrastSaturation: env.contrastSaturation,
+            primary: env.primaryColor,
+            primaryContrast: env.primaryColorContrast,
+            primaryHue: env.primaryColorHue,
+            error: env.errorColor,
+            errorContrast: env.errorColorContrast,
+            errorHue: env.errorColorHue,
+            warning: env.warningColor,
+            warningContrast: env.warningColorContrast,
+            warningHue: env.warningColorHue,
+            info: env.infoColor,
+            infoContrast: env.infoColorContrast,
+            infoHue: env.infoColorHue,
+            success: env.successColor,
+            successContrast: env.successColorContrast,
+            successHue: env.successColorHue,
+        },
+        links: [
+            {
+                title: { en: 'Home', fr: 'Accueil' },
+                href: env.homeUrl,
+                rel: 'canonical', // Prevents login page from being indexed
+            },
+            {
+                title: { en: 'Terms of Service' },
+                href: env.termsOfServiceUrl,
+                rel: 'terms-of-service',
+            },
+            {
+                title: { en: 'Privacy Policy' },
+                href: env.privacyPolicyUrl,
+                rel: 'privacy-policy',
+            },
+            {
+                title: { en: 'Support' },
+                href: env.supportUrl,
+                rel: 'help',
+            },
+        ].filter((f) => f.href != null && f.href !== ''),
+    };
     const oauthCfg = entrywayCfg
         ? {
             issuer: entrywayCfg.url,
@@ -226,52 +274,7 @@ export const envToCfg = (env) => {
                         tokenSalt: env.hcaptchaTokenSalt,
                     }
                     : undefined,
-                branding: {
-                    name: env.serviceName ?? `${hostname} PDS`,
-                    logo: env.logoUrl,
-                    colors: {
-                        light: env.lightColor,
-                        dark: env.darkColor,
-                        contrastSaturation: env.contrastSaturation,
-                        primary: env.primaryColor,
-                        primaryContrast: env.primaryColorContrast,
-                        primaryHue: env.primaryColorHue,
-                        error: env.errorColor,
-                        errorContrast: env.errorColorContrast,
-                        errorHue: env.errorColorHue,
-                        warning: env.warningColor,
-                        warningContrast: env.warningColorContrast,
-                        warningHue: env.warningColorHue,
-                        info: env.infoColor,
-                        infoContrast: env.infoColorContrast,
-                        infoHue: env.infoColorHue,
-                        success: env.successColor,
-                        successContrast: env.successColorContrast,
-                        successHue: env.successColorHue,
-                    },
-                    links: [
-                        {
-                            title: { en: 'Home', fr: 'Accueil' },
-                            href: env.homeUrl,
-                            rel: 'canonical', // Prevents login page from being indexed
-                        },
-                        {
-                            title: { en: 'Terms of Service' },
-                            href: env.termsOfServiceUrl,
-                            rel: 'terms-of-service',
-                        },
-                        {
-                            title: { en: 'Privacy Policy' },
-                            href: env.privacyPolicyUrl,
-                            rel: 'privacy-policy',
-                        },
-                        {
-                            title: { en: 'Support' },
-                            href: env.supportUrl,
-                            rel: 'help',
-                        },
-                    ].filter((f) => f.href != null && f.href !== ''),
-                },
+                branding: brandingCfg,
                 trustedClients: env.trustedOAuthClients,
             },
         };
@@ -300,6 +303,7 @@ export const envToCfg = (env) => {
         fetch: fetchCfg,
         lexicon: lexiconCfg,
         proxy: proxyCfg,
+        branding: brandingCfg,
         oauth: oauthCfg,
     };
 };