@atproto/pds 0.4.216 → 0.4.218

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

@@ -3,11 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const xrpc_server_1 = require("@atproto/xrpc-server");
 const auth_scope_1 = require("../../../../auth-scope");
-const lexicons_1 = require("../../../../lexicon/lexicons");
-const proxy_1 = require("../../../proxy");
+const index_js_1 = require("../../../../lexicons/index.js");
 const util_1 = require("./util");
 function default_1(server, ctx) {
-    server.com.atproto.server.getAccountInviteCodes({
+    server.add(index_js_1.com.atproto.server.getAccountInviteCodes, {
         auth: ctx.authVerifier.authorization({
             checkTakedown: true,
             scopes: auth_scope_1.ACCESS_FULL,
@@ -16,8 +15,9 @@ function default_1(server, ctx) {
             },
         }),
         handler: async ({ params, auth, req }) => {
-            if (ctx.entrywayAgent) {
-                return (0, proxy_1.resultPassthru)(await ctx.entrywayAgent.com.atproto.server.getAccountInviteCodes(params, await ctx.entrywayAuthHeaders(req, auth.credentials.did, lexicons_1.ids.ComAtprotoServerGetAccountInviteCodes)));
+            if (ctx.entrywayClient) {
+                const { headers } = await ctx.entrywayAuthHeaders(req, auth.credentials.did, index_js_1.com.atproto.server.getAccountInviteCodes.$lxm);
+                return ctx.entrywayClient.xrpc(index_js_1.com.atproto.server.getAccountInviteCodes, { params, headers });
             }
             const requester = auth.credentials.did;
             const { includeUsed, createAvailable } = params;
@@ -54,9 +54,7 @@ function default_1(server, ctx) {
             });
             return {
                 encoding: 'application/json',
-                body: {
-                    codes: filtered,
-                },
+                body: { codes: filtered },
             };
         },
     });

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

@@ -1 +1 @@
-{"version":3,"file":"getAccountInviteCodes.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/getAccountInviteCodes.ts"],"names":[],"mappings":"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","sourcesContent":["import { ForbiddenError, InvalidRequestError } from '@atproto/xrpc-server'\nimport { CodeDetail } from '../../../../account-manager/helpers/invite'\nimport { ACCESS_FULL } from '../../../../auth-scope'\nimport { AppContext } from '../../../../context'\nimport { Server } from '../../../../lexicon'\nimport { ids } from '../../../../lexicon/lexicons'\nimport { resultPassthru } from '../../../proxy'\nimport { genInvCodes } from './util'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.com.atproto.server.getAccountInviteCodes({\n    auth: ctx.authVerifier.authorization({\n      checkTakedown: true,\n      scopes: ACCESS_FULL,\n      authorize: () => {\n        throw new ForbiddenError(\n          'OAuth credentials are not supported for this endpoint',\n        )\n      },\n    }),\n    handler: async ({ params, auth, req }) => {\n      if (ctx.entrywayAgent) {\n        return resultPassthru(\n          await ctx.entrywayAgent.com.atproto.server.getAccountInviteCodes(\n            params,\n            await ctx.entrywayAuthHeaders(\n              req,\n              auth.credentials.did,\n              ids.ComAtprotoServerGetAccountInviteCodes,\n            ),\n          ),\n        )\n      }\n\n      const requester = auth.credentials.did\n      const { includeUsed, createAvailable } = params\n\n      const [account, userCodes] = await Promise.all([\n        ctx.accountManager.getAccount(requester),\n        ctx.accountManager.getAccountInvitesCodes(requester),\n      ])\n      if (!account) {\n        throw new InvalidRequestError('Account not found', 'NotFound')\n      }\n\n      let created: CodeDetail[] = []\n\n      if (\n        createAvailable &&\n        ctx.cfg.invites.required &&\n        ctx.cfg.invites.interval !== null\n      ) {\n        const { toCreate, total } = calculateCodesToCreate({\n          did: requester,\n          userCreatedAt: new Date(account.createdAt).getTime(),\n          codes: userCodes,\n          epoch: ctx.cfg.invites.epoch,\n          interval: ctx.cfg.invites.interval,\n        })\n        if (toCreate > 0) {\n          const codes = genInvCodes(ctx.cfg, toCreate)\n          created = await ctx.accountManager.createAccountInviteCodes(\n            requester,\n            codes,\n            total,\n            account.invitesDisabled ?? 0,\n          )\n        }\n      }\n\n      const allCodes = [...userCodes, ...created]\n\n      const filtered = allCodes.filter((code) => {\n        if (code.disabled) return false\n        if (!includeUsed && code.uses.length >= code.available) return false\n        return true\n      })\n\n      return {\n        encoding: 'application/json',\n        body: {\n          codes: filtered,\n        },\n      }\n    },\n  })\n}\n\n/**\n * WARNING: TRICKY SUBTLE MATH - DONT MESS WITH THIS FUNCTION UNLESS YOUR'RE VERY CONFIDENT\n * if the user wishes to create available codes & the server allows that,\n * we determine the number to create by dividing their account lifetime by the interval at which they can create codes\n * if an invite epoch is provided, we only calculate available invites since that epoch\n * we allow a max of 5 open codes at a given time\n * note: even if a user is disabled from future invites, we still create the invites for bookkeeping, we just immediately disable them as well\n */\nconst calculateCodesToCreate = (opts: {\n  did: string\n  userCreatedAt: number\n  codes: CodeDetail[]\n  epoch: number\n  interval: number\n}): { toCreate: number; total: number } => {\n  // for the sake of generating routine interval codes, we do not count explicitly gifted admin codes\n  const routineCodes = opts.codes.filter((code) => code.createdBy !== 'admin')\n  const unusedRoutineCodes = routineCodes.filter(\n    (row) => !row.disabled && row.available > row.uses.length,\n  )\n\n  const userLifespan = Date.now() - opts.userCreatedAt\n\n  // how many codes a user could create within the current epoch if they have 0\n  let couldCreate: number\n\n  if (opts.userCreatedAt >= opts.epoch) {\n    // if the user was created after the epoch, then they can create a code for each interval since the epoch\n    couldCreate = Math.floor(userLifespan / opts.interval)\n  } else {\n    // if the user was created before the epoch, we:\n    // - calculate the total intervals since account creation\n    // - calculate the total intervals before the epoch\n    // - subtract the two\n    const couldCreateTotal = Math.floor(userLifespan / opts.interval)\n    const userPreEpochLifespan = opts.epoch - opts.userCreatedAt\n    const couldCreateBeforeEpoch = Math.floor(\n      userPreEpochLifespan / opts.interval,\n    )\n    couldCreate = couldCreateTotal - couldCreateBeforeEpoch\n  }\n  // we count the codes that the user has created within the current epoch\n  const epochCodes = routineCodes.filter(\n    (code) => new Date(code.createdAt).getTime() > opts.epoch,\n  )\n  // finally we the number of codes they currently have from the number that they could create, and take a max of 5\n  const toCreate = Math.min(\n    5 - unusedRoutineCodes.length,\n    couldCreate - epochCodes.length,\n  )\n  return {\n    toCreate,\n    total: routineCodes.length + toCreate,\n  }\n}\n"]}
+{"version":3,"file":"getAccountInviteCodes.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/getAccountInviteCodes.ts"],"names":[],"mappings":";;AAWA,4BA0EC;AArFD,sDAI6B;AAE7B,uDAAoD;AAEpD,4DAAmD;AACnD,iCAAoC;AAEpC,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,cAAG,CAAC,OAAO,CAAC,MAAM,CAAC,qBAAqB,EAAE;QACnD,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC;YACnC,aAAa,EAAE,IAAI;YACnB,MAAM,EAAE,wBAAW;YACnB,SAAS,EAAE,GAAG,EAAE;gBACd,MAAM,IAAI,4BAAc,CACtB,uDAAuD,CACxD,CAAA;YACH,CAAC;SACF,CAAC;QACF,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YACvC,IAAI,GAAG,CAAC,cAAc,EAAE,CAAC;gBACvB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,GAAG,CAAC,mBAAmB,CAC/C,GAAG,EACH,IAAI,CAAC,WAAW,CAAC,GAAG,EACpB,cAAG,CAAC,OAAO,CAAC,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAC9C,CAAA;gBACD,OAAO,GAAG,CAAC,cAAc,CAAC,IAAI,CAC5B,cAAG,CAAC,OAAO,CAAC,MAAM,CAAC,qBAAqB,EACxC,EAAE,MAAM,EAAE,OAAO,EAAE,CACpB,CAAA;YACH,CAAC;YAED,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YACtC,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,MAAM,CAAA;YAE/C,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBAC7C,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,SAAS,CAAC;gBACxC,GAAG,CAAC,cAAc,CAAC,sBAAsB,CAAC,SAAS,CAAC;aACrD,CAAC,CAAA;YACF,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,iCAAmB,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAA;YAChE,CAAC;YAED,IAAI,OAAO,GAAiB,EAAE,CAAA;YAE9B,IACE,eAAe;gBACf,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ;gBACxB,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,KAAK,IAAI,EACjC,CAAC;gBACD,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,sBAAsB,CAAC;oBACjD,GAAG,EAAE,SAAS;oBACd,aAAa,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE;oBACpD,KAAK,EAAE,SAAS;oBAChB,KAAK,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK;oBAC5B,QAAQ,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ;iBACnC,CAAC,CAAA;gBACF,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;oBACjB,MAAM,KAAK,GAAG,IAAA,kBAAW,EAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;oBAC5C,OAAO,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,wBAAwB,CACzD,SAAS,EACT,KAAK,EACL,KAAK,EACL,OAAO,CAAC,eAAe,IAAI,CAAC,CAC7B,CAAA;gBACH,CAAC;YACH,CAAC;YAED,MAAM,QAAQ,GAAG,CAAC,GAAG,SAAS,EAAE,GAAG,OAAO,CAAC,CAAA;YAE3C,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;gBACxC,IAAI,IAAI,CAAC,QAAQ;oBAAE,OAAO,KAAK,CAAA;gBAC/B,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,SAAS;oBAAE,OAAO,KAAK,CAAA;gBACpE,OAAO,IAAI,CAAA;YACb,CAAC,CAAC,CAAA;YAEF,OAAO;gBACL,QAAQ,EAAE,kBAA2B;gBACrC,IAAI,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;aAC1B,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,sBAAsB,GAAG,CAAC,IAM/B,EAAuC,EAAE;IACxC,mGAAmG;IACnG,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,KAAK,OAAO,CAAC,CAAA;IAC5E,MAAM,kBAAkB,GAAG,YAAY,CAAC,MAAM,CAC5C,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAC1D,CAAA;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,aAAa,CAAA;IAEpD,6EAA6E;IAC7E,IAAI,WAAmB,CAAA;IAEvB,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACrC,yGAAyG;QACzG,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAA;IACxD,CAAC;SAAM,CAAC;QACN,gDAAgD;QAChD,yDAAyD;QACzD,mDAAmD;QACnD,qBAAqB;QACrB,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAA;QACjE,MAAM,oBAAoB,GAAG,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,aAAa,CAAA;QAC5D,MAAM,sBAAsB,GAAG,IAAI,CAAC,KAAK,CACvC,oBAAoB,GAAG,IAAI,CAAC,QAAQ,CACrC,CAAA;QACD,WAAW,GAAG,gBAAgB,GAAG,sBAAsB,CAAA;IACzD,CAAC;IACD,wEAAwE;IACxE,MAAM,UAAU,GAAG,YAAY,CAAC,MAAM,CACpC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAC1D,CAAA;IACD,iHAAiH;IACjH,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CACvB,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAC7B,WAAW,GAAG,UAAU,CAAC,MAAM,CAChC,CAAA;IACD,OAAO;QACL,QAAQ;QACR,KAAK,EAAE,YAAY,CAAC,MAAM,GAAG,QAAQ;KACtC,CAAA;AACH,CAAC,CAAA","sourcesContent":["import {\n  ForbiddenError,\n  InvalidRequestError,\n  Server,\n} from '@atproto/xrpc-server'\nimport { CodeDetail } from '../../../../account-manager/helpers/invite'\nimport { ACCESS_FULL } from '../../../../auth-scope'\nimport { AppContext } from '../../../../context'\nimport { com } from '../../../../lexicons/index.js'\nimport { genInvCodes } from './util'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(com.atproto.server.getAccountInviteCodes, {\n    auth: ctx.authVerifier.authorization({\n      checkTakedown: true,\n      scopes: ACCESS_FULL,\n      authorize: () => {\n        throw new ForbiddenError(\n          'OAuth credentials are not supported for this endpoint',\n        )\n      },\n    }),\n    handler: async ({ params, auth, req }) => {\n      if (ctx.entrywayClient) {\n        const { headers } = await ctx.entrywayAuthHeaders(\n          req,\n          auth.credentials.did,\n          com.atproto.server.getAccountInviteCodes.$lxm,\n        )\n        return ctx.entrywayClient.xrpc(\n          com.atproto.server.getAccountInviteCodes,\n          { params, headers },\n        )\n      }\n\n      const requester = auth.credentials.did\n      const { includeUsed, createAvailable } = params\n\n      const [account, userCodes] = await Promise.all([\n        ctx.accountManager.getAccount(requester),\n        ctx.accountManager.getAccountInvitesCodes(requester),\n      ])\n      if (!account) {\n        throw new InvalidRequestError('Account not found', 'NotFound')\n      }\n\n      let created: CodeDetail[] = []\n\n      if (\n        createAvailable &&\n        ctx.cfg.invites.required &&\n        ctx.cfg.invites.interval !== null\n      ) {\n        const { toCreate, total } = calculateCodesToCreate({\n          did: requester,\n          userCreatedAt: new Date(account.createdAt).getTime(),\n          codes: userCodes,\n          epoch: ctx.cfg.invites.epoch,\n          interval: ctx.cfg.invites.interval,\n        })\n        if (toCreate > 0) {\n          const codes = genInvCodes(ctx.cfg, toCreate)\n          created = await ctx.accountManager.createAccountInviteCodes(\n            requester,\n            codes,\n            total,\n            account.invitesDisabled ?? 0,\n          )\n        }\n      }\n\n      const allCodes = [...userCodes, ...created]\n\n      const filtered = allCodes.filter((code) => {\n        if (code.disabled) return false\n        if (!includeUsed && code.uses.length >= code.available) return false\n        return true\n      })\n\n      return {\n        encoding: 'application/json' as const,\n        body: { codes: filtered },\n      }\n    },\n  })\n}\n\n/**\n * WARNING: TRICKY SUBTLE MATH - DONT MESS WITH THIS FUNCTION UNLESS YOUR'RE VERY CONFIDENT\n * if the user wishes to create available codes & the server allows that,\n * we determine the number to create by dividing their account lifetime by the interval at which they can create codes\n * if an invite epoch is provided, we only calculate available invites since that epoch\n * we allow a max of 5 open codes at a given time\n * note: even if a user is disabled from future invites, we still create the invites for bookkeeping, we just immediately disable them as well\n */\nconst calculateCodesToCreate = (opts: {\n  did: string\n  userCreatedAt: number\n  codes: CodeDetail[]\n  epoch: number\n  interval: number\n}): { toCreate: number; total: number } => {\n  // for the sake of generating routine interval codes, we do not count explicitly gifted admin codes\n  const routineCodes = opts.codes.filter((code) => code.createdBy !== 'admin')\n  const unusedRoutineCodes = routineCodes.filter(\n    (row) => !row.disabled && row.available > row.uses.length,\n  )\n\n  const userLifespan = Date.now() - opts.userCreatedAt\n\n  // how many codes a user could create within the current epoch if they have 0\n  let couldCreate: number\n\n  if (opts.userCreatedAt >= opts.epoch) {\n    // if the user was created after the epoch, then they can create a code for each interval since the epoch\n    couldCreate = Math.floor(userLifespan / opts.interval)\n  } else {\n    // if the user was created before the epoch, we:\n    // - calculate the total intervals since account creation\n    // - calculate the total intervals before the epoch\n    // - subtract the two\n    const couldCreateTotal = Math.floor(userLifespan / opts.interval)\n    const userPreEpochLifespan = opts.epoch - opts.userCreatedAt\n    const couldCreateBeforeEpoch = Math.floor(\n      userPreEpochLifespan / opts.interval,\n    )\n    couldCreate = couldCreateTotal - couldCreateBeforeEpoch\n  }\n  // we count the codes that the user has created within the current epoch\n  const epochCodes = routineCodes.filter(\n    (code) => new Date(code.createdAt).getTime() > opts.epoch,\n  )\n  // finally we the number of codes they currently have from the number that they could create, and take a max of 5\n  const toCreate = Math.min(\n    5 - unusedRoutineCodes.length,\n    couldCreate - epochCodes.length,\n  )\n  return {\n    toCreate,\n    total: routineCodes.length + toCreate,\n  }\n}\n"]}

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

@@ -1,4 +1,4 @@
+import { Server } from '@atproto/xrpc-server';
 import { AppContext } from '../../../../context';
-import { Server } from '../../../../lexicon';
 export default function (server: Server, ctx: AppContext): void;
 //# sourceMappingURL=getServiceAuth.d.ts.map

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":"AAOA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAI5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAkFvD"}
+{"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,qBAAqB,CAAA;AAIhD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAoFvD"}

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

@@ -4,14 +4,14 @@ exports.default = default_1;
 const common_1 = require("@atproto/common");
 const xrpc_server_1 = require("@atproto/xrpc-server");
 const auth_scope_1 = require("../../../../auth-scope");
-const lexicons_1 = require("../../../../lexicon/lexicons");
+const index_js_1 = require("../../../../lexicons/index.js");
 const pipethrough_1 = require("../../../../pipethrough");
 function default_1(server, ctx) {
-    server.com.atproto.server.getServiceAuth({
+    server.add(index_js_1.com.atproto.server.getServiceAuth, {
         auth: ctx.authVerifier.authorization({
             additional: [auth_scope_1.AuthScope.Takendown],
-            authorize: (permissions, ctx) => {
-                const { aud, lxm = '*' } = ctx.params;
+            authorize: (permissions, { params }) => {
+                const { aud, lxm = '*' } = params;
                 permissions.assertRpc({ aud, lxm });
             },
         }),
@@ -24,7 +24,7 @@ function default_1(server, ctx) {
                 // @NOTE We should probably use "ForbiddenError" here. Using
                 // "InvalidRequestError" for legacy reasons.
                 if ((0, auth_scope_1.isTakendown)(auth.credentials.scope) &&
-                    lxm !== lexicons_1.ids.ComAtprotoServerCreateAccount) {
+                    lxm !== index_js_1.com.atproto.server.createAccount.$lxm) {
                     throw new xrpc_server_1.InvalidRequestError('Bad token scope', 'InvalidToken');
                 }
                 // @NOTE "oauth" based credentials already checked through permission

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 { InvalidRequestError, createServiceJwt } from '@atproto/xrpc-server'\nimport {\n  AuthScope,\n  isAccessPrivileged,\n  isTakendown,\n} from '../../../../auth-scope'\nimport { AppContext } from '../../../../context'\nimport { Server } from '../../../../lexicon'\nimport { ids } from '../../../../lexicon/lexicons'\nimport { PRIVILEGED_METHODS, PROTECTED_METHODS } from '../../../../pipethrough'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.com.atproto.server.getServiceAuth({\n    auth: ctx.authVerifier.authorization({\n      additional: [AuthScope.Takendown],\n      authorize: (permissions, ctx) => {\n        const { aud, lxm = '*' } = ctx.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 !== ids.ComAtprotoServerCreateAccount\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',\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 { 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'\nimport { AppContext } from '../../../../context'\nimport { com } from '../../../../lexicons/index.js'\nimport { PRIVILEGED_METHODS, PROTECTED_METHODS } from '../../../../pipethrough'\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"]}

package/dist/api/com/atproto/server/getSession.d.ts

@@ -1,4 +1,4 @@
+import { Server } from '@atproto/xrpc-server';
 import { AppContext } from '../../../../context';
-import { Server } from '../../../../lexicon';
 export default function (server: Server, ctx: AppContext): void;
 //# sourceMappingURL=getSession.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getSession.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/getSession.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAG5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAsDvD"}
+{"version":3,"file":"getSession.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/getSession.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAIlE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAIhD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAuDvD"}

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

@@ -5,9 +5,10 @@ const syntax_1 = require("@atproto/syntax");
 const xrpc_server_1 = require("@atproto/xrpc-server");
 const account_manager_1 = require("../../../../account-manager/account-manager");
 const auth_scope_1 = require("../../../../auth-scope");
+const index_js_1 = require("../../../../lexicons/index.js");
 const util_1 = require("./util");
 function default_1(server, ctx) {
-    server.com.atproto.server.getSession({
+    server.add(index_js_1.com.atproto.server.getSession, {
         auth: ctx.authVerifier.authorization({
             additional: [auth_scope_1.AuthScope.SignupQueued],
             authorize: () => {
@@ -15,12 +16,12 @@ function default_1(server, ctx) {
             },
         }),
         handler: async ({ auth, req }) => {
-            if (ctx.entrywayAgent) {
-                const headers = await ctx.entrywayAuthHeaders(req, auth.credentials.did, 'com.atproto.server.getSession');
-                const res = await ctx.entrywayAgent.com.atproto.server.getSession(undefined, headers);
+            if (ctx.entrywayClient) {
+                const { headers } = await ctx.entrywayAuthHeaders(req, auth.credentials.did, 'com.atproto.server.getSession');
+                const { body } = await ctx.entrywayClient.xrpc(index_js_1.com.atproto.server.getSession, { headers });
                 return {
                     encoding: 'application/json',
-                    body: output(auth, res.data),
+                    body: output(auth, body),
                 };
             }
             const did = auth.credentials.did;
@@ -36,8 +37,9 @@ function default_1(server, ctx) {
                 encoding: 'application/json',
                 body: output(auth, {
                     did: user.did,
+                    // @ts-expect-error https://github.com/bluesky-social/atproto/pull/4406
                     didDoc,
-                    handle: user.handle ?? syntax_1.INVALID_HANDLE,
+                    handle: (user.handle ?? syntax_1.INVALID_HANDLE),
                     email: user.email ?? undefined,
                     emailConfirmed: !!user.emailConfirmedAt,
                     active,

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

@@ -1 +1 @@
-{"version":3,"file":"getSession.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/getSession.ts"],"names":[],"mappings":";;AAUA,4BAsDC;AA/DD,4CAAgD;AAChD,sDAA0D;AAC1D,iFAAiF;AAEjF,uDAAkD;AAGlD,iCAAyC;AAEzC,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;QACnC,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC;YACnC,UAAU,EAAE,CAAC,sBAAS,CAAC,YAAY,CAAC;YACpC,SAAS,EAAE,GAAG,EAAE;gBACd,4DAA4D;YAC9D,CAAC;SACF,CAAC;QACF,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YAC/B,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;gBACtB,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,mBAAmB,CAC3C,GAAG,EACH,IAAI,CAAC,WAAW,CAAC,GAAG,EACpB,+BAA+B,CAChC,CAAA;gBAED,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAC/D,SAAS,EACT,OAAO,CACR,CAAA;gBAED,OAAO;oBACL,QAAQ,EAAE,kBAAkB;oBAC5B,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC;iBAC7B,CAAA;YACH,CAAC;YAED,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YAChC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACvC,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC;gBAChE,IAAA,uBAAgB,EAAC,GAAG,EAAE,GAAG,CAAC;aAC3B,CAAC,CAAA;YACF,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,IAAI,iCAAmB,CAC3B,yCAAyC,GAAG,EAAE,CAC/C,CAAA;YACH,CAAC;YAED,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,qCAAmB,EAAC,IAAI,CAAC,CAAA;YAEpD,OAAO;gBACL,QAAQ,EAAE,kBAAkB;gBAC5B,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE;oBACjB,GAAG,EAAE,IAAI,CAAC,GAAG;oBACb,MAAM;oBACN,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,uBAAc;oBACrC,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,SAAS;oBAC9B,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,gBAAgB;oBACvC,MAAM;oBACN,MAAM;iBACP,CAAC;aACH,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,MAAM,CACb,EAAE,WAAW,EAA8B,EAC3C,IAA6C;IAE7C,IACE,WAAW,CAAC,IAAI,KAAK,OAAO;QAC5B,CAAC,WAAW,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EACzE,CAAC;QACD,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAA;QAChE,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC","sourcesContent":["import { ComAtprotoServerGetSession } from '@atproto/api'\nimport { INVALID_HANDLE } from '@atproto/syntax'\nimport { InvalidRequestError } from '@atproto/xrpc-server'\nimport { formatAccountStatus } from '../../../../account-manager/account-manager'\nimport { AccessOutput, OAuthOutput } from '../../../../auth-output'\nimport { AuthScope } from '../../../../auth-scope'\nimport { AppContext } from '../../../../context'\nimport { Server } from '../../../../lexicon'\nimport { didDocForSession } from './util'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.com.atproto.server.getSession({\n    auth: ctx.authVerifier.authorization({\n      additional: [AuthScope.SignupQueued],\n      authorize: () => {\n        // Always allowed. \"email\" access is checked in the handler.\n      },\n    }),\n    handler: async ({ auth, req }) => {\n      if (ctx.entrywayAgent) {\n        const headers = await ctx.entrywayAuthHeaders(\n          req,\n          auth.credentials.did,\n          'com.atproto.server.getSession',\n        )\n\n        const res = await ctx.entrywayAgent.com.atproto.server.getSession(\n          undefined,\n          headers,\n        )\n\n        return {\n          encoding: 'application/json',\n          body: output(auth, res.data),\n        }\n      }\n\n      const did = auth.credentials.did\n      const [user, didDoc] = await Promise.all([\n        ctx.accountManager.getAccount(did, { includeDeactivated: true }),\n        didDocForSession(ctx, did),\n      ])\n      if (!user) {\n        throw new InvalidRequestError(\n          `Could not find user info for account: ${did}`,\n        )\n      }\n\n      const { status, active } = formatAccountStatus(user)\n\n      return {\n        encoding: 'application/json',\n        body: output(auth, {\n          did: user.did,\n          didDoc,\n          handle: user.handle ?? INVALID_HANDLE,\n          email: user.email ?? undefined,\n          emailConfirmed: !!user.emailConfirmedAt,\n          active,\n          status,\n        }),\n      }\n    },\n  })\n}\n\nfunction output(\n  { credentials }: OAuthOutput | AccessOutput,\n  data: ComAtprotoServerGetSession.OutputSchema,\n): ComAtprotoServerGetSession.OutputSchema {\n  if (\n    credentials.type === 'oauth' &&\n    !credentials.permissions.allowsAccount({ attr: 'email', action: 'read' })\n  ) {\n    const { email, emailAuthFactor, emailConfirmed, ...rest } = data\n    return rest\n  }\n\n  return data\n}\n"]}
+{"version":3,"file":"getSession.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/getSession.ts"],"names":[],"mappings":";;AASA,4BAuDC;AAhED,4CAAyE;AACzE,sDAAkE;AAClE,iFAAiF;AAEjF,uDAAkD;AAElD,4DAAmD;AACnD,iCAAyC;AAEzC,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,cAAG,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE;QACxC,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC;YACnC,UAAU,EAAE,CAAC,sBAAS,CAAC,YAAY,CAAC;YACpC,SAAS,EAAE,GAAG,EAAE;gBACd,4DAA4D;YAC9D,CAAC;SACF,CAAC;QACF,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YAC/B,IAAI,GAAG,CAAC,cAAc,EAAE,CAAC;gBACvB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,GAAG,CAAC,mBAAmB,CAC/C,GAAG,EACH,IAAI,CAAC,WAAW,CAAC,GAAG,EACpB,+BAA+B,CAChC,CAAA;gBAED,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,IAAI,CAC5C,cAAG,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAC7B,EAAE,OAAO,EAAE,CACZ,CAAA;gBAED,OAAO;oBACL,QAAQ,EAAE,kBAA2B;oBACrC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC;iBACzB,CAAA;YACH,CAAC;YAED,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YAChC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACvC,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC;gBAChE,IAAA,uBAAgB,EAAC,GAAG,EAAE,GAAG,CAAC;aAC3B,CAAC,CAAA;YACF,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,IAAI,iCAAmB,CAC3B,yCAAyC,GAAG,EAAE,CAC/C,CAAA;YACH,CAAC;YAED,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,qCAAmB,EAAC,IAAI,CAAC,CAAA;YAEpD,OAAO;gBACL,QAAQ,EAAE,kBAA2B;gBACrC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE;oBACjB,GAAG,EAAE,IAAI,CAAC,GAAgB;oBAC1B,uEAAuE;oBACvE,MAAM;oBACN,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,IAAI,uBAAc,CAAiB;oBACvD,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,SAAS;oBAC9B,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,gBAAgB;oBACvC,MAAM;oBACN,MAAM;iBACP,CAAC;aACH,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,MAAM,CACb,EAAE,WAAW,EAA8B,EAC3C,IAA+C;IAE/C,IACE,WAAW,CAAC,IAAI,KAAK,OAAO;QAC5B,CAAC,WAAW,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EACzE,CAAC;QACD,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAA;QAChE,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC","sourcesContent":["import { DidString, HandleString, INVALID_HANDLE } from '@atproto/syntax'\nimport { InvalidRequestError, Server } from '@atproto/xrpc-server'\nimport { formatAccountStatus } from '../../../../account-manager/account-manager'\nimport { AccessOutput, OAuthOutput } from '../../../../auth-output'\nimport { AuthScope } from '../../../../auth-scope'\nimport { AppContext } from '../../../../context'\nimport { com } from '../../../../lexicons/index.js'\nimport { didDocForSession } from './util'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(com.atproto.server.getSession, {\n    auth: ctx.authVerifier.authorization({\n      additional: [AuthScope.SignupQueued],\n      authorize: () => {\n        // Always allowed. \"email\" access is checked in the handler.\n      },\n    }),\n    handler: async ({ auth, req }) => {\n      if (ctx.entrywayClient) {\n        const { headers } = await ctx.entrywayAuthHeaders(\n          req,\n          auth.credentials.did,\n          'com.atproto.server.getSession',\n        )\n\n        const { body } = await ctx.entrywayClient.xrpc(\n          com.atproto.server.getSession,\n          { headers },\n        )\n\n        return {\n          encoding: 'application/json' as const,\n          body: output(auth, body),\n        }\n      }\n\n      const did = auth.credentials.did\n      const [user, didDoc] = await Promise.all([\n        ctx.accountManager.getAccount(did, { includeDeactivated: true }),\n        didDocForSession(ctx, did),\n      ])\n      if (!user) {\n        throw new InvalidRequestError(\n          `Could not find user info for account: ${did}`,\n        )\n      }\n\n      const { status, active } = formatAccountStatus(user)\n\n      return {\n        encoding: 'application/json' as const,\n        body: output(auth, {\n          did: user.did as DidString,\n          // @ts-expect-error https://github.com/bluesky-social/atproto/pull/4406\n          didDoc,\n          handle: (user.handle ?? INVALID_HANDLE) as HandleString,\n          email: user.email ?? undefined,\n          emailConfirmed: !!user.emailConfirmedAt,\n          active,\n          status,\n        }),\n      }\n    },\n  })\n}\n\nfunction output(\n  { credentials }: OAuthOutput | AccessOutput,\n  data: com.atproto.server.getSession.$OutputBody,\n): com.atproto.server.getSession.$OutputBody {\n  if (\n    credentials.type === 'oauth' &&\n    !credentials.permissions.allowsAccount({ attr: 'email', action: 'read' })\n  ) {\n    const { email, emailAuthFactor, emailConfirmed, ...rest } = data\n    return rest\n  }\n\n  return data\n}\n"]}

package/dist/api/com/atproto/server/index.d.ts

@@ -1,4 +1,4 @@
+import { Server } from '@atproto/xrpc-server';
 import { AppContext } from '../../../../context';
-import { Server } from '../../../../lexicon';
 export default function (server: Server, ctx: AppContext): void;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AA2B5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QA0BvD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AA2BhD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QA0BvD"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/index.ts"],"names":[],"mappings":";;;;;AA4BA,4BA0BC;AApDD,wEAA+C;AAC/C,8EAAqD;AACrD,kEAAyC;AACzC,oEAA2C;AAC3C,4EAAmD;AACnD,0EAAiD;AACjD,4EAAmD;AACnD,oEAA2C;AAC3C,4EAAmD;AACnD,oEAA2C;AAC3C,oEAA2C;AAC3C,sEAA6C;AAC7C,oFAA2D;AAC3D,sEAA6C;AAC7C,8DAAqC;AACrC,0EAAiD;AACjD,sEAA6C;AAC7C,kFAAkD;AAClD,0FAAiE;AACjE,8EAAqD;AACrD,kFAAyD;AACzD,4EAAmD;AACnD,oEAA2C;AAC3C,4EAAmD;AACnD,gEAAuC;AAEvC,mBAAyB,MAAc,EAAE,GAAe;IACtD,IAAA,wBAAc,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC3B,IAAA,uBAAa,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,IAAA,0BAAgB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC7B,IAAA,2BAAiB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,IAAA,+BAAqB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAClC,IAAA,2BAAiB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,IAAA,8BAAa,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,IAAA,uBAAa,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,IAAA,8BAAoB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACjC,IAAA,uBAAa,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,IAAA,kCAAwB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACrC,IAAA,sBAAY,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACzB,IAAA,4BAAkB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC/B,IAAA,qBAAW,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACxB,IAAA,uBAAa,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,IAAA,uBAAa,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,IAAA,oBAAU,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACvB,IAAA,wBAAc,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC3B,IAAA,2BAAiB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,IAAA,0BAAgB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC7B,IAAA,2BAAiB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,IAAA,wBAAc,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC3B,IAAA,4BAAkB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC/B,IAAA,yBAAe,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC5B,IAAA,2BAAiB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAChC,CAAC","sourcesContent":["import { AppContext } from '../../../../context'\nimport { Server } from '../../../../lexicon'\nimport activateAccount from './activateAccount'\nimport checkAccountStatus from './checkAccountStatus'\nimport confirmEmail from './confirmEmail'\nimport createAccount from './createAccount'\nimport createAppPassword from './createAppPassword'\nimport createInviteCode from './createInviteCode'\nimport createInviteCodes from './createInviteCodes'\nimport createSession from './createSession'\nimport deactivateAccount from './deactivateAccount'\nimport deleteAccount from './deleteAccount'\nimport deleteSession from './deleteSession'\nimport describeServer from './describeServer'\nimport getAccountInviteCodes from './getAccountInviteCodes'\nimport getServiceAuth from './getServiceAuth'\nimport getSession from './getSession'\nimport listAppPasswords from './listAppPasswords'\nimport refreshSession from './refreshSession'\nimport requestDelete from './requestAccountDelete'\nimport requestEmailConfirmation from './requestEmailConfirmation'\nimport requestEmailUpdate from './requestEmailUpdate'\nimport requestPasswordReset from './requestPasswordReset'\nimport reserveSigningKey from './reserveSigningKey'\nimport resetPassword from './resetPassword'\nimport revokeAppPassword from './revokeAppPassword'\nimport updateEmail from './updateEmail'\n\nexport default function (server: Server, ctx: AppContext) {\n  describeServer(server, ctx)\n  createAccount(server, ctx)\n  createInviteCode(server, ctx)\n  createInviteCodes(server, ctx)\n  getAccountInviteCodes(server, ctx)\n  reserveSigningKey(server, ctx)\n  requestDelete(server, ctx)\n  deleteAccount(server, ctx)\n  requestPasswordReset(server, ctx)\n  resetPassword(server, ctx)\n  requestEmailConfirmation(server, ctx)\n  confirmEmail(server, ctx)\n  requestEmailUpdate(server, ctx)\n  updateEmail(server, ctx)\n  createSession(server, ctx)\n  deleteSession(server, ctx)\n  getSession(server, ctx)\n  refreshSession(server, ctx)\n  createAppPassword(server, ctx)\n  listAppPasswords(server, ctx)\n  revokeAppPassword(server, ctx)\n  getServiceAuth(server, ctx)\n  checkAccountStatus(server, ctx)\n  activateAccount(server, ctx)\n  deactivateAccount(server, ctx)\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/index.ts"],"names":[],"mappings":";;;;;AA4BA,4BA0BC;AApDD,wEAA+C;AAC/C,8EAAqD;AACrD,kEAAyC;AACzC,oEAA2C;AAC3C,4EAAmD;AACnD,0EAAiD;AACjD,4EAAmD;AACnD,oEAA2C;AAC3C,4EAAmD;AACnD,oEAA2C;AAC3C,oEAA2C;AAC3C,sEAA6C;AAC7C,oFAA2D;AAC3D,sEAA6C;AAC7C,8DAAqC;AACrC,0EAAiD;AACjD,sEAA6C;AAC7C,kFAAkD;AAClD,0FAAiE;AACjE,8EAAqD;AACrD,kFAAyD;AACzD,4EAAmD;AACnD,oEAA2C;AAC3C,4EAAmD;AACnD,gEAAuC;AAEvC,mBAAyB,MAAc,EAAE,GAAe;IACtD,IAAA,wBAAc,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC3B,IAAA,uBAAa,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,IAAA,0BAAgB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC7B,IAAA,2BAAiB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,IAAA,+BAAqB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAClC,IAAA,2BAAiB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,IAAA,8BAAa,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,IAAA,uBAAa,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,IAAA,8BAAoB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACjC,IAAA,uBAAa,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,IAAA,kCAAwB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACrC,IAAA,sBAAY,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACzB,IAAA,4BAAkB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC/B,IAAA,qBAAW,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACxB,IAAA,uBAAa,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,IAAA,uBAAa,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,IAAA,oBAAU,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACvB,IAAA,wBAAc,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC3B,IAAA,2BAAiB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,IAAA,0BAAgB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC7B,IAAA,2BAAiB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,IAAA,wBAAc,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC3B,IAAA,4BAAkB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC/B,IAAA,yBAAe,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC5B,IAAA,2BAAiB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAChC,CAAC","sourcesContent":["import { Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context'\nimport activateAccount from './activateAccount'\nimport checkAccountStatus from './checkAccountStatus'\nimport confirmEmail from './confirmEmail'\nimport createAccount from './createAccount'\nimport createAppPassword from './createAppPassword'\nimport createInviteCode from './createInviteCode'\nimport createInviteCodes from './createInviteCodes'\nimport createSession from './createSession'\nimport deactivateAccount from './deactivateAccount'\nimport deleteAccount from './deleteAccount'\nimport deleteSession from './deleteSession'\nimport describeServer from './describeServer'\nimport getAccountInviteCodes from './getAccountInviteCodes'\nimport getServiceAuth from './getServiceAuth'\nimport getSession from './getSession'\nimport listAppPasswords from './listAppPasswords'\nimport refreshSession from './refreshSession'\nimport requestDelete from './requestAccountDelete'\nimport requestEmailConfirmation from './requestEmailConfirmation'\nimport requestEmailUpdate from './requestEmailUpdate'\nimport requestPasswordReset from './requestPasswordReset'\nimport reserveSigningKey from './reserveSigningKey'\nimport resetPassword from './resetPassword'\nimport revokeAppPassword from './revokeAppPassword'\nimport updateEmail from './updateEmail'\n\nexport default function (server: Server, ctx: AppContext) {\n  describeServer(server, ctx)\n  createAccount(server, ctx)\n  createInviteCode(server, ctx)\n  createInviteCodes(server, ctx)\n  getAccountInviteCodes(server, ctx)\n  reserveSigningKey(server, ctx)\n  requestDelete(server, ctx)\n  deleteAccount(server, ctx)\n  requestPasswordReset(server, ctx)\n  resetPassword(server, ctx)\n  requestEmailConfirmation(server, ctx)\n  confirmEmail(server, ctx)\n  requestEmailUpdate(server, ctx)\n  updateEmail(server, ctx)\n  createSession(server, ctx)\n  deleteSession(server, ctx)\n  getSession(server, ctx)\n  refreshSession(server, ctx)\n  createAppPassword(server, ctx)\n  listAppPasswords(server, ctx)\n  revokeAppPassword(server, ctx)\n  getServiceAuth(server, ctx)\n  checkAccountStatus(server, ctx)\n  activateAccount(server, ctx)\n  deactivateAccount(server, ctx)\n}\n"]}

package/dist/api/com/atproto/server/listAppPasswords.d.ts

@@ -1,4 +1,4 @@
+import { Server } from '@atproto/xrpc-server';
 import { AppContext } from '../../../../context';
-import { Server } from '../../../../lexicon';
 export default function (server: Server, ctx: AppContext): void;
 //# sourceMappingURL=listAppPasswords.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"listAppPasswords.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/listAppPasswords.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAI5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAgCvD"}
+{"version":3,"file":"listAppPasswords.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/listAppPasswords.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGhD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAwCvD"}

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

@@ -2,25 +2,36 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const xrpc_server_1 = require("@atproto/xrpc-server");
-const lexicons_1 = require("../../../../lexicon/lexicons");
-const proxy_1 = require("../../../proxy");
+const index_js_1 = require("../../../../lexicons/index.js");
 function default_1(server, ctx) {
-    server.com.atproto.server.listAppPasswords({
-        auth: ctx.authVerifier.authorization({
-            authorize: () => {
-                throw new xrpc_server_1.ForbiddenError('OAuth credentials are not supported for this endpoint');
-            },
-        }),
-        handler: async ({ auth, req }) => {
-            if (ctx.entrywayAgent) {
-                return (0, proxy_1.resultPassthru)(await ctx.entrywayAgent.com.atproto.server.listAppPasswords(undefined, await ctx.entrywayAuthHeaders(req, auth.credentials.did, lexicons_1.ids.ComAtprotoServerListAppPasswords)));
-            }
-            const passwords = await ctx.accountManager.listAppPasswords(auth.credentials.did);
-            return {
-                encoding: 'application/json',
-                body: { passwords },
-            };
+    const { entrywayClient } = ctx;
+    const auth = ctx.authVerifier.authorization({
+        authorize: () => {
+            throw new xrpc_server_1.ForbiddenError('OAuth credentials are not supported for this endpoint');
         },
     });
+    if (entrywayClient) {
+        server.add(index_js_1.com.atproto.server.listAppPasswords, {
+            auth,
+            handler: async ({ auth, req }) => {
+                const { headers } = await ctx.entrywayAuthHeaders(req, auth.credentials.did, index_js_1.com.atproto.server.listAppPasswords.$lxm);
+                return entrywayClient.xrpc(index_js_1.com.atproto.server.listAppPasswords, {
+                    headers,
+                });
+            },
+        });
+    }
+    else {
+        server.add(index_js_1.com.atproto.server.listAppPasswords, {
+            auth,
+            handler: async ({ auth }) => {
+                const passwords = await ctx.accountManager.listAppPasswords(auth.credentials.did);
+                return {
+                    encoding: 'application/json',
+                    body: { passwords },
+                };
+            },
+        });
+    }
 }
 //# sourceMappingURL=listAppPasswords.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"listAppPasswords.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/listAppPasswords.ts"],"names":[],"mappings":";;AAMA,4BAgCC;AAtCD,sDAAqD;AAGrD,2DAAkD;AAClD,0CAA+C;AAE/C,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC;QACzC,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC;YACnC,SAAS,EAAE,GAAG,EAAE;gBACd,MAAM,IAAI,4BAAc,CACtB,uDAAuD,CACxD,CAAA;YACH,CAAC;SACF,CAAC;QACF,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YAC/B,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;gBACtB,OAAO,IAAA,sBAAc,EACnB,MAAM,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,CACzD,SAAS,EACT,MAAM,GAAG,CAAC,mBAAmB,CAC3B,GAAG,EACH,IAAI,CAAC,WAAW,CAAC,GAAG,EACpB,cAAG,CAAC,gCAAgC,CACrC,CACF,CACF,CAAA;YACH,CAAC;YAED,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,gBAAgB,CACzD,IAAI,CAAC,WAAW,CAAC,GAAG,CACrB,CAAA;YACD,OAAO;gBACL,QAAQ,EAAE,kBAAkB;gBAC5B,IAAI,EAAE,EAAE,SAAS,EAAE;aACpB,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { ForbiddenError } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context'\nimport { Server } from '../../../../lexicon'\nimport { ids } from '../../../../lexicon/lexicons'\nimport { resultPassthru } from '../../../proxy'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.com.atproto.server.listAppPasswords({\n    auth: ctx.authVerifier.authorization({\n      authorize: () => {\n        throw new ForbiddenError(\n          'OAuth credentials are not supported for this endpoint',\n        )\n      },\n    }),\n    handler: async ({ auth, req }) => {\n      if (ctx.entrywayAgent) {\n        return resultPassthru(\n          await ctx.entrywayAgent.com.atproto.server.listAppPasswords(\n            undefined,\n            await ctx.entrywayAuthHeaders(\n              req,\n              auth.credentials.did,\n              ids.ComAtprotoServerListAppPasswords,\n            ),\n          ),\n        )\n      }\n\n      const passwords = await ctx.accountManager.listAppPasswords(\n        auth.credentials.did,\n      )\n      return {\n        encoding: 'application/json',\n        body: { passwords },\n      }\n    },\n  })\n}\n"]}
+{"version":3,"file":"listAppPasswords.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/listAppPasswords.ts"],"names":[],"mappings":";;AAIA,4BAwCC;AA5CD,sDAA6D;AAE7D,4DAAmD;AAEnD,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,EAAE,cAAc,EAAE,GAAG,GAAG,CAAA;IAE9B,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC;QAC1C,SAAS,EAAE,GAAG,EAAE;YACd,MAAM,IAAI,4BAAc,CACtB,uDAAuD,CACxD,CAAA;QACH,CAAC;KACF,CAAC,CAAA;IAEF,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,CAAC,GAAG,CAAC,cAAG,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE;YAC9C,IAAI;YACJ,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;gBAC/B,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,GAAG,CAAC,mBAAmB,CAC/C,GAAG,EACH,IAAI,CAAC,WAAW,CAAC,GAAG,EACpB,cAAG,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CACzC,CAAA;gBAED,OAAO,cAAc,CAAC,IAAI,CAAC,cAAG,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE;oBAC9D,OAAO;iBACR,CAAC,CAAA;YACJ,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,GAAG,CAAC,cAAG,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE;YAC9C,IAAI;YACJ,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;gBAC1B,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,gBAAgB,CACzD,IAAI,CAAC,WAAW,CAAC,GAAG,CACrB,CAAA;gBACD,OAAO;oBACL,QAAQ,EAAE,kBAAkB;oBAC5B,IAAI,EAAE,EAAE,SAAS,EAAE;iBACpB,CAAA;YACH,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;AACH,CAAC","sourcesContent":["import { ForbiddenError, Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context'\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    authorize: () => {\n      throw new ForbiddenError(\n        'OAuth credentials are not supported for this endpoint',\n      )\n    },\n  })\n\n  if (entrywayClient) {\n    server.add(com.atproto.server.listAppPasswords, {\n      auth,\n      handler: async ({ auth, req }) => {\n        const { headers } = await ctx.entrywayAuthHeaders(\n          req,\n          auth.credentials.did,\n          com.atproto.server.listAppPasswords.$lxm,\n        )\n\n        return entrywayClient.xrpc(com.atproto.server.listAppPasswords, {\n          headers,\n        })\n      },\n    })\n  } else {\n    server.add(com.atproto.server.listAppPasswords, {\n      auth,\n      handler: async ({ auth }) => {\n        const passwords = await ctx.accountManager.listAppPasswords(\n          auth.credentials.did,\n        )\n        return {\n          encoding: 'application/json',\n          body: { passwords },\n        }\n      },\n    })\n  }\n}\n"]}

package/dist/api/com/atproto/server/refreshSession.d.ts

@@ -1,4 +1,4 @@
+import { Server } from '@atproto/xrpc-server';
 import { AppContext } from '../../../../context';
-import { Server } from '../../../../lexicon';
 export default function (server: Server, ctx: AppContext): void;
 //# sourceMappingURL=refreshSession.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"refreshSession.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/refreshSession.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAI5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAyDvD"}
+{"version":3,"file":"refreshSession.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/refreshSession.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,MAAM,EACP,MAAM,sBAAsB,CAAA;AAE7B,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAKhD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QA2DvD"}

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

@@ -5,12 +5,12 @@ const syntax_1 = require("@atproto/syntax");
 const xrpc_server_1 = require("@atproto/xrpc-server");
 const account_manager_1 = require("../../../../account-manager/account-manager");
 const util_1 = require("../../../../db/util");
-const proxy_1 = require("../../../proxy");
+const index_js_1 = require("../../../../lexicons/index.js");
 const util_2 = require("./util");
 function default_1(server, ctx) {
-    server.com.atproto.server.refreshSession({
+    server.add(index_js_1.com.atproto.server.refreshSession, {
         auth: ctx.authVerifier.refresh(),
-        handler: async ({ auth, req }) => {
+        handler: async ({ auth, req, }) => {
             const did = auth.credentials.did;
             const user = await ctx.accountManager.getAccount(did, {
                 includeDeactivated: true,
@@ -22,8 +22,11 @@ function default_1(server, ctx) {
             if ((0, util_1.softDeleted)(user)) {
                 throw new xrpc_server_1.AuthRequiredError('Account has been taken down', 'AccountTakedown');
             }
-            if (ctx.entrywayAgent) {
-                return (0, proxy_1.resultPassthru)(await ctx.entrywayAgent.com.atproto.server.refreshSession(undefined, ctx.entrywayPassthruHeaders(req)));
+            if (ctx.entrywayClient) {
+                const { headers } = ctx.entrywayPassthruHeaders(req);
+                return ctx.entrywayClient.xrpc(index_js_1.com.atproto.server.refreshSession, {
+                    headers,
+                });
             }
             const [didDoc, rotated] = await Promise.all([
                 (0, util_2.didDocForSession)(ctx, user.did),
@@ -39,8 +42,9 @@ function default_1(server, ctx) {
                     accessJwt: rotated.accessJwt,
                     refreshJwt: rotated.refreshJwt,
                     did: user.did,
+                    // @ts-expect-error https://github.com/bluesky-social/atproto/pull/4406
                     didDoc,
-                    handle: user.handle ?? syntax_1.INVALID_HANDLE,
+                    handle: (user.handle ?? syntax_1.INVALID_HANDLE),
                     email: user.email ?? undefined,
                     emailConfirmed: !!user.emailConfirmedAt,
                     active,

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

@@ -1 +1 @@
-{"version":3,"file":"refreshSession.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/refreshSession.ts"],"names":[],"mappings":";;AASA,4BAyDC;AAlED,4CAAgD;AAChD,sDAA6E;AAC7E,iFAAiF;AAEjF,8CAAiD;AAEjD,0CAA+C;AAC/C,iCAAyC;AAEzC,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC;QACvC,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,OAAO,EAAE;QAChC,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YAChC,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,GAAG,EAAE;gBACpD,kBAAkB,EAAE,IAAI;gBACxB,gBAAgB,EAAE,IAAI;aACvB,CAAC,CAAA;YACF,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,IAAI,iCAAmB,CAC3B,yCAAyC,GAAG,EAAE,CAC/C,CAAA;YACH,CAAC;YACD,IAAI,IAAA,kBAAW,EAAC,IAAI,CAAC,EAAE,CAAC;gBACtB,MAAM,IAAI,+BAAiB,CACzB,6BAA6B,EAC7B,iBAAiB,CAClB,CAAA;YACH,CAAC;YAED,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;gBACtB,OAAO,IAAA,sBAAc,EACnB,MAAM,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CACvD,SAAS,EACT,GAAG,CAAC,uBAAuB,CAAC,GAAG,CAAC,CACjC,CACF,CAAA;YACH,CAAC;YAED,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBAC1C,IAAA,uBAAgB,EAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC;gBAC/B,GAAG,CAAC,cAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;aAChE,CAAC,CAAA;YACF,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;gBACrB,MAAM,IAAI,iCAAmB,CAAC,wBAAwB,EAAE,cAAc,CAAC,CAAA;YACzE,CAAC;YAED,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,qCAAmB,EAAC,IAAI,CAAC,CAAA;YAEpD,OAAO;gBACL,QAAQ,EAAE,kBAAkB;gBAC5B,IAAI,EAAE;oBACJ,SAAS,EAAE,OAAO,CAAC,SAAS;oBAC5B,UAAU,EAAE,OAAO,CAAC,UAAU;oBAE9B,GAAG,EAAE,IAAI,CAAC,GAAG;oBACb,MAAM;oBACN,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,uBAAc;oBACrC,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,SAAS;oBAC9B,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,gBAAgB;oBACvC,MAAM;oBACN,MAAM;iBACP;aACF,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { INVALID_HANDLE } from '@atproto/syntax'\nimport { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'\nimport { formatAccountStatus } from '../../../../account-manager/account-manager'\nimport { AppContext } from '../../../../context'\nimport { softDeleted } from '../../../../db/util'\nimport { Server } from '../../../../lexicon'\nimport { resultPassthru } from '../../../proxy'\nimport { didDocForSession } from './util'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.com.atproto.server.refreshSession({\n    auth: ctx.authVerifier.refresh(),\n    handler: async ({ auth, req }) => {\n      const did = auth.credentials.did\n      const user = await ctx.accountManager.getAccount(did, {\n        includeDeactivated: true,\n        includeTakenDown: true,\n      })\n      if (!user) {\n        throw new InvalidRequestError(\n          `Could not find user info for account: ${did}`,\n        )\n      }\n      if (softDeleted(user)) {\n        throw new AuthRequiredError(\n          'Account has been taken down',\n          'AccountTakedown',\n        )\n      }\n\n      if (ctx.entrywayAgent) {\n        return resultPassthru(\n          await ctx.entrywayAgent.com.atproto.server.refreshSession(\n            undefined,\n            ctx.entrywayPassthruHeaders(req),\n          ),\n        )\n      }\n\n      const [didDoc, rotated] = await Promise.all([\n        didDocForSession(ctx, user.did),\n        ctx.accountManager.rotateRefreshToken(auth.credentials.tokenId),\n      ])\n      if (rotated === null) {\n        throw new InvalidRequestError('Token has been revoked', 'ExpiredToken')\n      }\n\n      const { status, active } = formatAccountStatus(user)\n\n      return {\n        encoding: 'application/json',\n        body: {\n          accessJwt: rotated.accessJwt,\n          refreshJwt: rotated.refreshJwt,\n\n          did: user.did,\n          didDoc,\n          handle: user.handle ?? INVALID_HANDLE,\n          email: user.email ?? undefined,\n          emailConfirmed: !!user.emailConfirmedAt,\n          active,\n          status,\n        },\n      }\n    },\n  })\n}\n"]}
+{"version":3,"file":"refreshSession.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/refreshSession.ts"],"names":[],"mappings":";;AAYA,4BA2DC;AAvED,4CAAyE;AACzE,sDAI6B;AAC7B,iFAAiF;AAEjF,8CAAiD;AACjD,4DAAmD;AACnD,iCAAyC;AAEzC,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,cAAG,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE;QAC5C,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,OAAO,EAAE;QAChC,OAAO,EAAE,KAAK,EAAE,EACd,IAAI,EACJ,GAAG,GACJ,EAAsD,EAAE;YACvD,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YAChC,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,GAAG,EAAE;gBACpD,kBAAkB,EAAE,IAAI;gBACxB,gBAAgB,EAAE,IAAI;aACvB,CAAC,CAAA;YACF,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,IAAI,iCAAmB,CAC3B,yCAAyC,GAAG,EAAE,CAC/C,CAAA;YACH,CAAC;YACD,IAAI,IAAA,kBAAW,EAAC,IAAI,CAAC,EAAE,CAAC;gBACtB,MAAM,IAAI,+BAAiB,CACzB,6BAA6B,EAC7B,iBAAiB,CAClB,CAAA;YACH,CAAC;YAED,IAAI,GAAG,CAAC,cAAc,EAAE,CAAC;gBACvB,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAA;gBACpD,OAAO,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,cAAG,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE;oBAChE,OAAO;iBACR,CAAC,CAAA;YACJ,CAAC;YAED,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBAC1C,IAAA,uBAAgB,EAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC;gBAC/B,GAAG,CAAC,cAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;aAChE,CAAC,CAAA;YACF,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;gBACrB,MAAM,IAAI,iCAAmB,CAAC,wBAAwB,EAAE,cAAc,CAAC,CAAA;YACzE,CAAC;YAED,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,qCAAmB,EAAC,IAAI,CAAC,CAAA;YAEpD,OAAO;gBACL,QAAQ,EAAE,kBAA2B;gBACrC,IAAI,EAAE;oBACJ,SAAS,EAAE,OAAO,CAAC,SAAS;oBAC5B,UAAU,EAAE,OAAO,CAAC,UAAU;oBAE9B,GAAG,EAAE,IAAI,CAAC,GAAgB;oBAC1B,uEAAuE;oBACvE,MAAM;oBACN,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,IAAI,uBAAc,CAAiB;oBACvD,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,SAAS;oBAC9B,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,gBAAgB;oBACvC,MAAM;oBACN,MAAM;iBACP;aACF,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { DidString, HandleString, INVALID_HANDLE } from '@atproto/syntax'\nimport {\n  AuthRequiredError,\n  InvalidRequestError,\n  Server,\n} from '@atproto/xrpc-server'\nimport { formatAccountStatus } from '../../../../account-manager/account-manager'\nimport { AppContext } from '../../../../context'\nimport { softDeleted } from '../../../../db/util'\nimport { com } from '../../../../lexicons/index.js'\nimport { didDocForSession } from './util'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(com.atproto.server.refreshSession, {\n    auth: ctx.authVerifier.refresh(),\n    handler: async ({\n      auth,\n      req,\n    }): Promise<com.atproto.server.refreshSession.$Output> => {\n      const did = auth.credentials.did\n      const user = await ctx.accountManager.getAccount(did, {\n        includeDeactivated: true,\n        includeTakenDown: true,\n      })\n      if (!user) {\n        throw new InvalidRequestError(\n          `Could not find user info for account: ${did}`,\n        )\n      }\n      if (softDeleted(user)) {\n        throw new AuthRequiredError(\n          'Account has been taken down',\n          'AccountTakedown',\n        )\n      }\n\n      if (ctx.entrywayClient) {\n        const { headers } = ctx.entrywayPassthruHeaders(req)\n        return ctx.entrywayClient.xrpc(com.atproto.server.refreshSession, {\n          headers,\n        })\n      }\n\n      const [didDoc, rotated] = await Promise.all([\n        didDocForSession(ctx, user.did),\n        ctx.accountManager.rotateRefreshToken(auth.credentials.tokenId),\n      ])\n      if (rotated === null) {\n        throw new InvalidRequestError('Token has been revoked', 'ExpiredToken')\n      }\n\n      const { status, active } = formatAccountStatus(user)\n\n      return {\n        encoding: 'application/json' as const,\n        body: {\n          accessJwt: rotated.accessJwt,\n          refreshJwt: rotated.refreshJwt,\n\n          did: user.did as DidString,\n          // @ts-expect-error https://github.com/bluesky-social/atproto/pull/4406\n          didDoc,\n          handle: (user.handle ?? INVALID_HANDLE) as HandleString,\n          email: user.email ?? undefined,\n          emailConfirmed: !!user.emailConfirmedAt,\n          active,\n          status,\n        },\n      }\n    },\n  })\n}\n"]}

package/dist/api/com/atproto/server/requestAccountDelete.d.ts

@@ -1,4 +1,4 @@
+import { Server } from '@atproto/xrpc-server';
 import { AppContext } from '../../../../context';
-import { Server } from '../../../../lexicon';
 export default function (server: Server, ctx: AppContext): void;
 //# sourceMappingURL=requestAccountDelete.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"requestAccountDelete.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/requestAccountDelete.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAG5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAuDvD"}
+{"version":3,"file":"requestAccountDelete.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/requestAccountDelete.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,MAAM,EACP,MAAM,sBAAsB,CAAA;AAE7B,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGhD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAuDvD"}

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

@@ -4,9 +4,9 @@ exports.default = default_1;
 const common_1 = require("@atproto/common");
 const xrpc_server_1 = require("@atproto/xrpc-server");
 const auth_scope_1 = require("../../../../auth-scope");
-const lexicons_1 = require("../../../../lexicon/lexicons");
+const index_js_1 = require("../../../../lexicons/index.js");
 function default_1(server, ctx) {
-    server.com.atproto.server.requestAccountDelete({
+    server.add(index_js_1.com.atproto.server.requestAccountDelete, {
         rateLimit: [
             {
                 durationMs: common_1.DAY,
@@ -35,8 +35,11 @@ function default_1(server, ctx) {
             if (!account) {
                 throw new xrpc_server_1.InvalidRequestError('account not found');
             }
-            if (ctx.entrywayAgent) {
-                await ctx.entrywayAgent.com.atproto.server.requestAccountDelete(undefined, await ctx.entrywayAuthHeaders(req, auth.credentials.did, lexicons_1.ids.ComAtprotoServerRequestAccountDelete));
+            if (ctx.entrywayClient) {
+                const { headers } = await ctx.entrywayAuthHeaders(req, auth.credentials.did, index_js_1.com.atproto.server.requestAccountDelete.$lxm);
+                await ctx.entrywayClient.xrpc(index_js_1.com.atproto.server.requestAccountDelete, {
+                    headers,
+                });
                 return;
             }
             if (!account.email) {

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

@@ -1 +1 @@
-{"version":3,"file":"requestAccountDelete.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/requestAccountDelete.ts"],"names":[],"mappings":";;AAOA,4BAuDC;AA9DD,4CAA2C;AAC3C,sDAA0E;AAC1E,uDAAoD;AAGpD,2DAAkD;AAElD,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAAC;QAC7C,SAAS,EAAE;YACT;gBACE,UAAU,EAAE,YAAG;gBACf,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG;aAC5C;YACD;gBACE,UAAU,EAAE,aAAI;gBAChB,MAAM,EAAE,CAAC;gBACT,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG;aAC5C;SACF;QACD,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC;YACnC,aAAa,EAAE,IAAI;YACnB,MAAM,EAAE,wBAAW;YACnB,SAAS,EAAE,GAAG,EAAE;gBACd,MAAM,IAAI,4BAAc,CACtB,uDAAuD,CACxD,CAAA;YACH,CAAC;SACF,CAAC;QACF,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YAChC,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,GAAG,EAAE;gBACvD,kBAAkB,EAAE,IAAI;gBACxB,gBAAgB,EAAE,IAAI;aACvB,CAAC,CAAA;YACF,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,iCAAmB,CAAC,mBAAmB,CAAC,CAAA;YACpD,CAAC;YAED,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;gBACtB,MAAM,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAC7D,SAAS,EACT,MAAM,GAAG,CAAC,mBAAmB,CAC3B,GAAG,EACH,IAAI,CAAC,WAAW,CAAC,GAAG,EACpB,cAAG,CAAC,oCAAoC,CACzC,CACF,CAAA;gBACD,OAAM;YACR,CAAC;YAED,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBACnB,MAAM,IAAI,iCAAmB,CAAC,wCAAwC,CAAC,CAAA;YACzE,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,gBAAgB,CACrD,GAAG,EACH,gBAAgB,CACjB,CAAA;YACD,MAAM,GAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAA;QACtE,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { DAY, HOUR } from '@atproto/common'\nimport { ForbiddenError, InvalidRequestError } from '@atproto/xrpc-server'\nimport { ACCESS_FULL } from '../../../../auth-scope'\nimport { AppContext } from '../../../../context'\nimport { Server } from '../../../../lexicon'\nimport { ids } from '../../../../lexicon/lexicons'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.com.atproto.server.requestAccountDelete({\n    rateLimit: [\n      {\n        durationMs: DAY,\n        points: 15,\n        calcKey: ({ auth }) => auth.credentials.did,\n      },\n      {\n        durationMs: HOUR,\n        points: 5,\n        calcKey: ({ auth }) => auth.credentials.did,\n      },\n    ],\n    auth: ctx.authVerifier.authorization({\n      checkTakedown: true,\n      scopes: ACCESS_FULL,\n      authorize: () => {\n        throw new ForbiddenError(\n          'OAuth credentials are not supported for this endpoint',\n        )\n      },\n    }),\n    handler: async ({ auth, req }) => {\n      const did = auth.credentials.did\n      const account = await ctx.accountManager.getAccount(did, {\n        includeDeactivated: true,\n        includeTakenDown: true,\n      })\n      if (!account) {\n        throw new InvalidRequestError('account not found')\n      }\n\n      if (ctx.entrywayAgent) {\n        await ctx.entrywayAgent.com.atproto.server.requestAccountDelete(\n          undefined,\n          await ctx.entrywayAuthHeaders(\n            req,\n            auth.credentials.did,\n            ids.ComAtprotoServerRequestAccountDelete,\n          ),\n        )\n        return\n      }\n\n      if (!account.email) {\n        throw new InvalidRequestError('account does not have an email address')\n      }\n      const token = await ctx.accountManager.createEmailToken(\n        did,\n        'delete_account',\n      )\n      await ctx.mailer.sendAccountDelete({ token }, { to: account.email })\n    },\n  })\n}\n"]}
+{"version":3,"file":"requestAccountDelete.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/requestAccountDelete.ts"],"names":[],"mappings":";;AAUA,4BAuDC;AAjED,4CAA2C;AAC3C,sDAI6B;AAC7B,uDAAoD;AAEpD,4DAAmD;AAEnD,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,cAAG,CAAC,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE;QAClD,SAAS,EAAE;YACT;gBACE,UAAU,EAAE,YAAG;gBACf,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG;aAC5C;YACD;gBACE,UAAU,EAAE,aAAI;gBAChB,MAAM,EAAE,CAAC;gBACT,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG;aAC5C;SACF;QACD,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC;YACnC,aAAa,EAAE,IAAI;YACnB,MAAM,EAAE,wBAAW;YACnB,SAAS,EAAE,GAAG,EAAE;gBACd,MAAM,IAAI,4BAAc,CACtB,uDAAuD,CACxD,CAAA;YACH,CAAC;SACF,CAAC;QACF,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YAChC,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,GAAG,EAAE;gBACvD,kBAAkB,EAAE,IAAI;gBACxB,gBAAgB,EAAE,IAAI;aACvB,CAAC,CAAA;YACF,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,iCAAmB,CAAC,mBAAmB,CAAC,CAAA;YACpD,CAAC;YAED,IAAI,GAAG,CAAC,cAAc,EAAE,CAAC;gBACvB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,GAAG,CAAC,mBAAmB,CAC/C,GAAG,EACH,IAAI,CAAC,WAAW,CAAC,GAAG,EACpB,cAAG,CAAC,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAC7C,CAAA;gBACD,MAAM,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,cAAG,CAAC,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE;oBACrE,OAAO;iBACR,CAAC,CAAA;gBACF,OAAM;YACR,CAAC;YAED,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBACnB,MAAM,IAAI,iCAAmB,CAAC,wCAAwC,CAAC,CAAA;YACzE,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,gBAAgB,CACrD,GAAG,EACH,gBAAgB,CACjB,CAAA;YACD,MAAM,GAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAA;QACtE,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { DAY, HOUR } from '@atproto/common'\nimport {\n  ForbiddenError,\n  InvalidRequestError,\n  Server,\n} from '@atproto/xrpc-server'\nimport { ACCESS_FULL } from '../../../../auth-scope'\nimport { AppContext } from '../../../../context'\nimport { com } from '../../../../lexicons/index.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(com.atproto.server.requestAccountDelete, {\n    rateLimit: [\n      {\n        durationMs: DAY,\n        points: 15,\n        calcKey: ({ auth }) => auth.credentials.did,\n      },\n      {\n        durationMs: HOUR,\n        points: 5,\n        calcKey: ({ auth }) => auth.credentials.did,\n      },\n    ],\n    auth: ctx.authVerifier.authorization({\n      checkTakedown: true,\n      scopes: ACCESS_FULL,\n      authorize: () => {\n        throw new ForbiddenError(\n          'OAuth credentials are not supported for this endpoint',\n        )\n      },\n    }),\n    handler: async ({ auth, req }) => {\n      const did = auth.credentials.did\n      const account = await ctx.accountManager.getAccount(did, {\n        includeDeactivated: true,\n        includeTakenDown: true,\n      })\n      if (!account) {\n        throw new InvalidRequestError('account not found')\n      }\n\n      if (ctx.entrywayClient) {\n        const { headers } = await ctx.entrywayAuthHeaders(\n          req,\n          auth.credentials.did,\n          com.atproto.server.requestAccountDelete.$lxm,\n        )\n        await ctx.entrywayClient.xrpc(com.atproto.server.requestAccountDelete, {\n          headers,\n        })\n        return\n      }\n\n      if (!account.email) {\n        throw new InvalidRequestError('account does not have an email address')\n      }\n      const token = await ctx.accountManager.createEmailToken(\n        did,\n        'delete_account',\n      )\n      await ctx.mailer.sendAccountDelete({ token }, { to: account.email })\n    },\n  })\n}\n"]}

package/dist/api/com/atproto/server/requestEmailConfirmation.d.ts

@@ -1,4 +1,4 @@
+import { Server } from '@atproto/xrpc-server';
 import { AppContext } from '../../../../context';
-import { Server } from '../../../../lexicon';
 export default function (server: Server, ctx: AppContext): void;
 //# sourceMappingURL=requestEmailConfirmation.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"requestEmailConfirmation.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/requestEmailConfirmation.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAG5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAoDvD"}
+{"version":3,"file":"requestEmailConfirmation.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/requestEmailConfirmation.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGhD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAuDvD"}

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

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const common_1 = require("@atproto/common");
 const xrpc_server_1 = require("@atproto/xrpc-server");
-const lexicons_1 = require("../../../../lexicon/lexicons");
+const index_js_1 = require("../../../../lexicons/index.js");
 function default_1(server, ctx) {
-    server.com.atproto.server.requestEmailConfirmation({
+    server.add(index_js_1.com.atproto.server.requestEmailConfirmation, {
         rateLimit: [
             {
                 durationMs: common_1.DAY,
@@ -33,8 +33,9 @@ function default_1(server, ctx) {
             if (!account) {
                 throw new xrpc_server_1.InvalidRequestError('account not found');
             }
-            if (ctx.entrywayAgent) {
-                await ctx.entrywayAgent.com.atproto.server.requestEmailConfirmation(undefined, await ctx.entrywayAuthHeaders(req, auth.credentials.did, lexicons_1.ids.ComAtprotoServerRequestEmailConfirmation));
+            if (ctx.entrywayClient) {
+                const { headers } = await ctx.entrywayAuthHeaders(req, auth.credentials.did, index_js_1.com.atproto.server.requestEmailConfirmation.$lxm);
+                await ctx.entrywayClient.xrpc(index_js_1.com.atproto.server.requestEmailConfirmation, { headers });
                 return;
             }
             if (!account.email) {

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

@@ -1 +1 @@
-{"version":3,"file":"requestEmailConfirmation.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/requestEmailConfirmation.ts"],"names":[],"mappings":";;AAMA,4BAoDC;AA1DD,4CAA2C;AAC3C,sDAA0D;AAG1D,2DAAkD;AAElD,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,wBAAwB,CAAC;QACjD,SAAS,EAAE;YACT;gBACE,UAAU,EAAE,YAAG;gBACf,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG;aAC5C;YACD;gBACE,UAAU,EAAE,aAAI;gBAChB,MAAM,EAAE,CAAC;gBACT,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG;aAC5C;SACF;QACD,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC;YACnC,aAAa,EAAE,IAAI;YACnB,SAAS,EAAE,CAAC,WAAW,EAAE,EAAE;gBACzB,WAAW,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;YAChE,CAAC;SACF,CAAC;QACF,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YAChC,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,GAAG,EAAE;gBACvD,kBAAkB,EAAE,IAAI;gBACxB,gBAAgB,EAAE,IAAI;aACvB,CAAC,CAAA;YACF,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,iCAAmB,CAAC,mBAAmB,CAAC,CAAA;YACpD,CAAC;YAED,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;gBACtB,MAAM,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,wBAAwB,CACjE,SAAS,EACT,MAAM,GAAG,CAAC,mBAAmB,CAC3B,GAAG,EACH,IAAI,CAAC,WAAW,CAAC,GAAG,EACpB,cAAG,CAAC,wCAAwC,CAC7C,CACF,CAAA;gBACD,OAAM;YACR,CAAC;YAED,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBACnB,MAAM,IAAI,iCAAmB,CAAC,wCAAwC,CAAC,CAAA;YACzE,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,gBAAgB,CACrD,GAAG,EACH,eAAe,CAChB,CAAA;YACD,MAAM,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAA;QACrE,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { DAY, HOUR } from '@atproto/common'\nimport { InvalidRequestError } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context'\nimport { Server } from '../../../../lexicon'\nimport { ids } from '../../../../lexicon/lexicons'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.com.atproto.server.requestEmailConfirmation({\n    rateLimit: [\n      {\n        durationMs: DAY,\n        points: 15,\n        calcKey: ({ auth }) => auth.credentials.did,\n      },\n      {\n        durationMs: HOUR,\n        points: 5,\n        calcKey: ({ auth }) => auth.credentials.did,\n      },\n    ],\n    auth: ctx.authVerifier.authorization({\n      checkTakedown: true,\n      authorize: (permissions) => {\n        permissions.assertAccount({ attr: 'email', action: 'manage' })\n      },\n    }),\n    handler: async ({ auth, req }) => {\n      const did = auth.credentials.did\n      const account = await ctx.accountManager.getAccount(did, {\n        includeDeactivated: true,\n        includeTakenDown: true,\n      })\n      if (!account) {\n        throw new InvalidRequestError('account not found')\n      }\n\n      if (ctx.entrywayAgent) {\n        await ctx.entrywayAgent.com.atproto.server.requestEmailConfirmation(\n          undefined,\n          await ctx.entrywayAuthHeaders(\n            req,\n            auth.credentials.did,\n            ids.ComAtprotoServerRequestEmailConfirmation,\n          ),\n        )\n        return\n      }\n\n      if (!account.email) {\n        throw new InvalidRequestError('account does not have an email address')\n      }\n      const token = await ctx.accountManager.createEmailToken(\n        did,\n        'confirm_email',\n      )\n      await ctx.mailer.sendConfirmEmail({ token }, { to: account.email })\n    },\n  })\n}\n"]}
+{"version":3,"file":"requestEmailConfirmation.js","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/requestEmailConfirmation.ts"],"names":[],"mappings":";;AAKA,4BAuDC;AA5DD,4CAA2C;AAC3C,sDAAkE;AAElE,4DAAmD;AAEnD,mBAAyB,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,cAAG,CAAC,OAAO,CAAC,MAAM,CAAC,wBAAwB,EAAE;QACtD,SAAS,EAAE;YACT;gBACE,UAAU,EAAE,YAAG;gBACf,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG;aAC5C;YACD;gBACE,UAAU,EAAE,aAAI;gBAChB,MAAM,EAAE,CAAC;gBACT,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG;aAC5C;SACF;QACD,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC;YACnC,aAAa,EAAE,IAAI;YACnB,SAAS,EAAE,CAAC,WAAW,EAAE,EAAE;gBACzB,WAAW,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;YAChE,CAAC;SACF,CAAC;QACF,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE;YAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YAChC,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,GAAG,EAAE;gBACvD,kBAAkB,EAAE,IAAI;gBACxB,gBAAgB,EAAE,IAAI;aACvB,CAAC,CAAA;YACF,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,iCAAmB,CAAC,mBAAmB,CAAC,CAAA;YACpD,CAAC;YAED,IAAI,GAAG,CAAC,cAAc,EAAE,CAAC;gBACvB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,GAAG,CAAC,mBAAmB,CAC/C,GAAG,EACH,IAAI,CAAC,WAAW,CAAC,GAAG,EACpB,cAAG,CAAC,OAAO,CAAC,MAAM,CAAC,wBAAwB,CAAC,IAAI,CACjD,CAAA;gBAED,MAAM,GAAG,CAAC,cAAc,CAAC,IAAI,CAC3B,cAAG,CAAC,OAAO,CAAC,MAAM,CAAC,wBAAwB,EAC3C,EAAE,OAAO,EAAE,CACZ,CAAA;gBAED,OAAM;YACR,CAAC;YAED,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBACnB,MAAM,IAAI,iCAAmB,CAAC,wCAAwC,CAAC,CAAA;YACzE,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,gBAAgB,CACrD,GAAG,EACH,eAAe,CAChB,CAAA;YACD,MAAM,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAA;QACrE,CAAC;KACF,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { DAY, HOUR } from '@atproto/common'\nimport { InvalidRequestError, Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context'\nimport { com } from '../../../../lexicons/index.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(com.atproto.server.requestEmailConfirmation, {\n    rateLimit: [\n      {\n        durationMs: DAY,\n        points: 15,\n        calcKey: ({ auth }) => auth.credentials.did,\n      },\n      {\n        durationMs: HOUR,\n        points: 5,\n        calcKey: ({ auth }) => auth.credentials.did,\n      },\n    ],\n    auth: ctx.authVerifier.authorization({\n      checkTakedown: true,\n      authorize: (permissions) => {\n        permissions.assertAccount({ attr: 'email', action: 'manage' })\n      },\n    }),\n    handler: async ({ auth, req }) => {\n      const did = auth.credentials.did\n      const account = await ctx.accountManager.getAccount(did, {\n        includeDeactivated: true,\n        includeTakenDown: true,\n      })\n      if (!account) {\n        throw new InvalidRequestError('account not found')\n      }\n\n      if (ctx.entrywayClient) {\n        const { headers } = await ctx.entrywayAuthHeaders(\n          req,\n          auth.credentials.did,\n          com.atproto.server.requestEmailConfirmation.$lxm,\n        )\n\n        await ctx.entrywayClient.xrpc(\n          com.atproto.server.requestEmailConfirmation,\n          { headers },\n        )\n\n        return\n      }\n\n      if (!account.email) {\n        throw new InvalidRequestError('account does not have an email address')\n      }\n      const token = await ctx.accountManager.createEmailToken(\n        did,\n        'confirm_email',\n      )\n      await ctx.mailer.sendConfirmEmail({ token }, { to: account.email })\n    },\n  })\n}\n"]}

package/dist/api/com/atproto/server/requestEmailUpdate.d.ts

@@ -1,4 +1,4 @@
+import { Server } from '@atproto/xrpc-server';
 import { AppContext } from '../../../../context';
-import { Server } from '../../../../lexicon';
 export default function (server: Server, ctx: AppContext): void;
 //# sourceMappingURL=requestEmailUpdate.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"requestEmailUpdate.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/requestEmailUpdate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAI5C,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAgEvD"}
+{"version":3,"file":"requestEmailUpdate.d.ts","sourceRoot":"","sources":["../../../../../src/api/com/atproto/server/requestEmailUpdate.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGhD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAgEvD"}