@atproto/pds 0.4.223 → 0.4.225

package/dist/account-manager/helpers/token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EACL,IAAI,EACJ,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,OAAO,EACR,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAGxC,wBAAgB,WAAW,CAAC,GAAG,EAAE,UAAU,CAAC,KAAK,CAAC,GAAG,SAAS,CAa7D;AAuBD,eAAO,MAAM,QAAQ,GACnB,IAAI,SAAS,EACb,SAAS,OAAO,EAChB,MAAM,SAAS,EACf,eAAe,YAAY,gHAiB5B,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,IAAI,SAAS,EAAE,IAAI,OAAO,qNAKZ,CAAA;AAE1C,eAAO,MAAM,QAAQ,GACnB,IAAI,SAAS,EACb,QAAQ;IACN,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,mBAAmB,CAAC,EAAE,YAAY,CAAA;CACnC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8SAoCF,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,IAAI,SAAS,EAAE,KAAK,MAAM,6KAEN,CAAA;AAElD,eAAO,MAAM,QAAQ,GACnB,IAAI,SAAS,EACb,IAAI,MAAM,EACV,YAAY,OAAO,EACnB,iBAAiB,YAAY,EAC7B,SAAS,YAAY,sLAcE,CAAA;AAEzB,eAAO,MAAM,QAAQ,GAAI,IAAI,SAAS,EAAE,SAAS,OAAO,6KAEE,CAAA"}
+{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EACL,IAAI,EACJ,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,OAAO,EACR,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAGjD,wBAAgB,WAAW,CAAC,GAAG,EAAE,UAAU,CAAC,KAAK,CAAC,GAAG,SAAS,CAa7D;AAuBD,eAAO,MAAM,QAAQ,GACnB,IAAI,SAAS,EACb,SAAS,OAAO,EAChB,MAAM,SAAS,EACf,eAAe,YAAY,yHAiB5B,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,IAAI,SAAS,EAAE,IAAI,OAAO,mMAKZ,CAAA;AAE1C,eAAO,MAAM,QAAQ,GACnB,IAAI,SAAS,EACb,QAAQ;IACN,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,mBAAmB,CAAC,EAAE,YAAY,CAAA;CACnC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8SAoCF,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,IAAI,SAAS,EAAE,KAAK,MAAM,yLAEN,CAAA;AAElD,eAAO,MAAM,QAAQ,GACnB,IAAI,SAAS,EACb,IAAI,MAAM,EACV,YAAY,OAAO,EACnB,iBAAiB,YAAY,EAC7B,SAAS,YAAY,kMAcE,CAAA;AAEzB,eAAO,MAAM,QAAQ,GAAI,IAAI,SAAS,EAAE,SAAS,OAAO,yLAEE,CAAA"}

package/dist/account-manager/helpers/token.js

@@ -1,24 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeQB = exports.rotateQB = exports.removeByDidQB = exports.findByQB = exports.forRotateQB = exports.createQB = void 0;
-exports.toTokenData = toTokenData;
-const db_1 = require("../../db");
-const account_1 = require("./account");
-function toTokenData(row) {
+import { fromDateISO, fromJson, toDateISO, toJson } from '../../db/index.js';
+import { selectAccountQB } from './account.js';
+export function toTokenData(row) {
     return {
-        createdAt: (0, db_1.fromDateISO)(row.createdAt),
-        expiresAt: (0, db_1.fromDateISO)(row.expiresAt),
-        updatedAt: (0, db_1.fromDateISO)(row.updatedAt),
+        createdAt: fromDateISO(row.createdAt),
+        expiresAt: fromDateISO(row.expiresAt),
+        updatedAt: fromDateISO(row.updatedAt),
         clientId: row.clientId,
-        clientAuth: (0, db_1.fromJson)(row.clientAuth),
+        clientAuth: fromJson(row.clientAuth),
         deviceId: row.deviceId,
         sub: row.did,
-        parameters: (0, db_1.fromJson)(row.parameters),
+        parameters: fromJson(row.parameters),
         code: row.code,
         scope: row.scope,
     };
 }
-const selectTokenInfoQB = (db) => (0, account_1.selectAccountQB)(db, { includeDeactivated: true })
+const selectTokenInfoQB = (db) => selectAccountQB(db, { includeDeactivated: true })
     // uses "token_did_idx" index (though unlikely in practice)
     .innerJoin('token', 'token.did', 'actor.did')
     .select([
@@ -37,31 +33,29 @@ const selectTokenInfoQB = (db) => (0, account_1.selectAccountQB)(db, { includeDe
     'token.currentRefreshToken',
     'token.scope',
 ]);
-const createQB = (db, tokenId, data, refreshToken) => {
+export const createQB = (db, tokenId, data, refreshToken) => {
     return db.db.insertInto('token').values({
         tokenId,
-        createdAt: (0, db_1.toDateISO)(data.createdAt),
-        expiresAt: (0, db_1.toDateISO)(data.expiresAt),
-        updatedAt: (0, db_1.toDateISO)(data.updatedAt),
+        createdAt: toDateISO(data.createdAt),
+        expiresAt: toDateISO(data.expiresAt),
+        updatedAt: toDateISO(data.updatedAt),
         clientId: data.clientId,
-        clientAuth: (0, db_1.toJson)(data.clientAuth),
+        clientAuth: toJson(data.clientAuth),
         deviceId: data.deviceId,
         did: data.sub,
-        parameters: (0, db_1.toJson)(data.parameters),
-        details: data.details ? (0, db_1.toJson)(data.details) : null,
+        parameters: toJson(data.parameters),
+        details: data.details ? toJson(data.details) : null,
         code: data.code,
         currentRefreshToken: refreshToken || null,
         scope: data.scope,
     });
 };
-exports.createQB = createQB;
-const forRotateQB = (db, id) => db.db
+export const forRotateQB = (db, id) => db.db
     .selectFrom('token')
     .where('tokenId', '=', id)
     .where('currentRefreshToken', 'is not', null)
     .select(['id', 'currentRefreshToken']);
-exports.forRotateQB = forRotateQB;
-const findByQB = (db, search) => {
+export const findByQB = (db, search) => {
     if (search.id === undefined &&
         search.did === undefined &&
         search.code === undefined &&
@@ -89,26 +83,22 @@ const findByQB = (db, search) => {
     // uses "token_refresh_token_unique_idx"
     qb.where('token.currentRefreshToken', '=', search.currentRefreshToken));
 };
-exports.findByQB = findByQB;
-const removeByDidQB = (db, did) => 
+export const removeByDidQB = (db, did) => 
 // uses "token_did_idx" index
 db.db.deleteFrom('token').where('did', '=', did);
-exports.removeByDidQB = removeByDidQB;
-const rotateQB = (db, id, newTokenId, newRefreshToken, newData) => db.db
+export const rotateQB = (db, id, newTokenId, newRefreshToken, newData) => db.db
     .updateTable('token')
     .set({
     tokenId: newTokenId,
     currentRefreshToken: newRefreshToken,
-    expiresAt: (0, db_1.toDateISO)(newData.expiresAt),
-    updatedAt: (0, db_1.toDateISO)(newData.updatedAt),
-    clientAuth: (0, db_1.toJson)(newData.clientAuth),
+    expiresAt: toDateISO(newData.expiresAt),
+    updatedAt: toDateISO(newData.updatedAt),
+    clientAuth: toJson(newData.clientAuth),
     scope: newData.scope,
 })
     // uses primary key index
     .where('id', '=', id);
-exports.rotateQB = rotateQB;
-const removeQB = (db, tokenId) => 
+export const removeQB = (db, tokenId) => 
 // uses "used_refresh_token_fk" to cascade delete
 db.db.deleteFrom('token').where('tokenId', '=', tokenId);
-exports.removeQB = removeQB;
 //# sourceMappingURL=token.js.map

package/dist/account-manager/helpers/token.js.map

@@ -1 +1 @@
-{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../src/account-manager/helpers/token.ts"],"names":[],"mappings":"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","sourcesContent":["import { Selectable } from 'kysely'\nimport {\n  Code,\n  NewTokenData,\n  RefreshToken,\n  TokenData,\n  TokenId,\n} from '@atproto/oauth-provider'\nimport { fromDateISO, fromJson, toDateISO, toJson } from '../../db'\nimport { AccountDb, Token } from '../db'\nimport { selectAccountQB } from './account'\n\nexport function toTokenData(row: Selectable<Token>): TokenData {\n  return {\n    createdAt: fromDateISO(row.createdAt),\n    expiresAt: fromDateISO(row.expiresAt),\n    updatedAt: fromDateISO(row.updatedAt),\n    clientId: row.clientId,\n    clientAuth: fromJson(row.clientAuth),\n    deviceId: row.deviceId,\n    sub: row.did,\n    parameters: fromJson(row.parameters),\n    code: row.code,\n    scope: row.scope,\n  }\n}\n\nconst selectTokenInfoQB = (db: AccountDb) =>\n  selectAccountQB(db, { includeDeactivated: true })\n    // uses \"token_did_idx\" index (though unlikely in practice)\n    .innerJoin('token', 'token.did', 'actor.did')\n    .select([\n      'token.id',\n      'token.tokenId',\n      'token.createdAt',\n      'token.updatedAt',\n      'token.expiresAt',\n      'token.clientId',\n      'token.clientAuth',\n      'token.deviceId',\n      'token.did',\n      'token.parameters',\n      'token.details',\n      'token.code',\n      'token.currentRefreshToken',\n      'token.scope',\n    ])\n\nexport const createQB = (\n  db: AccountDb,\n  tokenId: TokenId,\n  data: TokenData,\n  refreshToken?: RefreshToken,\n) => {\n  return db.db.insertInto('token').values({\n    tokenId,\n    createdAt: toDateISO(data.createdAt),\n    expiresAt: toDateISO(data.expiresAt),\n    updatedAt: toDateISO(data.updatedAt),\n    clientId: data.clientId,\n    clientAuth: toJson(data.clientAuth),\n    deviceId: data.deviceId,\n    did: data.sub,\n    parameters: toJson(data.parameters),\n    details: data.details ? toJson(data.details) : null,\n    code: data.code,\n    currentRefreshToken: refreshToken || null,\n    scope: data.scope,\n  })\n}\n\nexport const forRotateQB = (db: AccountDb, id: TokenId) =>\n  db.db\n    .selectFrom('token')\n    .where('tokenId', '=', id)\n    .where('currentRefreshToken', 'is not', null)\n    .select(['id', 'currentRefreshToken'])\n\nexport const findByQB = (\n  db: AccountDb,\n  search: {\n    id?: number\n    did?: string\n    code?: Code\n    tokenId?: TokenId\n    currentRefreshToken?: RefreshToken\n  },\n) => {\n  if (\n    search.id === undefined &&\n    search.did === undefined &&\n    search.code === undefined &&\n    search.tokenId === undefined &&\n    search.currentRefreshToken === undefined\n  ) {\n    // Prevent accidental scan\n    throw new TypeError('At least one search parameter is required')\n  }\n\n  return selectTokenInfoQB(db)\n    .if(search.id !== undefined, (qb) =>\n      // uses primary key index\n      qb.where('token.id', '=', search.id!),\n    )\n    .if(search.did !== undefined, (qb) =>\n      // uses \"token_did_idx\" index\n      qb.where('token.did', '=', search.did!),\n    )\n    .if(search.code !== undefined, (qb) =>\n      // uses \"token_code_idx\" partial index (hence the null check)\n      qb\n        .where('token.code', '=', search.code!)\n        .where('token.code', 'is not', null),\n    )\n    .if(search.tokenId !== undefined, (qb) =>\n      // uses \"token_token_id_idx\"\n      qb.where('token.tokenId', '=', search.tokenId!),\n    )\n    .if(search.currentRefreshToken !== undefined, (qb) =>\n      // uses \"token_refresh_token_unique_idx\"\n      qb.where('token.currentRefreshToken', '=', search.currentRefreshToken!),\n    )\n}\n\nexport const removeByDidQB = (db: AccountDb, did: string) =>\n  // uses \"token_did_idx\" index\n  db.db.deleteFrom('token').where('did', '=', did)\n\nexport const rotateQB = (\n  db: AccountDb,\n  id: number,\n  newTokenId: TokenId,\n  newRefreshToken: RefreshToken,\n  newData: NewTokenData,\n) =>\n  db.db\n    .updateTable('token')\n    .set({\n      tokenId: newTokenId,\n      currentRefreshToken: newRefreshToken,\n\n      expiresAt: toDateISO(newData.expiresAt),\n      updatedAt: toDateISO(newData.updatedAt),\n      clientAuth: toJson(newData.clientAuth),\n      scope: newData.scope,\n    })\n    // uses primary key index\n    .where('id', '=', id)\n\nexport const removeQB = (db: AccountDb, tokenId: TokenId) =>\n  // uses \"used_refresh_token_fk\" to cascade delete\n  db.db.deleteFrom('token').where('tokenId', '=', tokenId)\n"]}
+{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../src/account-manager/helpers/token.ts"],"names":[],"mappings":"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","sourcesContent":["import { Selectable } from 'kysely'\nimport {\n  Code,\n  NewTokenData,\n  RefreshToken,\n  TokenData,\n  TokenId,\n} from '@atproto/oauth-provider'\nimport { fromDateISO, fromJson, toDateISO, toJson } from '../../db/index.js'\nimport { AccountDb, Token } from '../db/index.js'\nimport { selectAccountQB } from './account.js'\n\nexport function toTokenData(row: Selectable<Token>): TokenData {\n  return {\n    createdAt: fromDateISO(row.createdAt),\n    expiresAt: fromDateISO(row.expiresAt),\n    updatedAt: fromDateISO(row.updatedAt),\n    clientId: row.clientId,\n    clientAuth: fromJson(row.clientAuth),\n    deviceId: row.deviceId,\n    sub: row.did,\n    parameters: fromJson(row.parameters),\n    code: row.code,\n    scope: row.scope,\n  }\n}\n\nconst selectTokenInfoQB = (db: AccountDb) =>\n  selectAccountQB(db, { includeDeactivated: true })\n    // uses \"token_did_idx\" index (though unlikely in practice)\n    .innerJoin('token', 'token.did', 'actor.did')\n    .select([\n      'token.id',\n      'token.tokenId',\n      'token.createdAt',\n      'token.updatedAt',\n      'token.expiresAt',\n      'token.clientId',\n      'token.clientAuth',\n      'token.deviceId',\n      'token.did',\n      'token.parameters',\n      'token.details',\n      'token.code',\n      'token.currentRefreshToken',\n      'token.scope',\n    ])\n\nexport const createQB = (\n  db: AccountDb,\n  tokenId: TokenId,\n  data: TokenData,\n  refreshToken?: RefreshToken,\n) => {\n  return db.db.insertInto('token').values({\n    tokenId,\n    createdAt: toDateISO(data.createdAt),\n    expiresAt: toDateISO(data.expiresAt),\n    updatedAt: toDateISO(data.updatedAt),\n    clientId: data.clientId,\n    clientAuth: toJson(data.clientAuth),\n    deviceId: data.deviceId,\n    did: data.sub,\n    parameters: toJson(data.parameters),\n    details: data.details ? toJson(data.details) : null,\n    code: data.code,\n    currentRefreshToken: refreshToken || null,\n    scope: data.scope,\n  })\n}\n\nexport const forRotateQB = (db: AccountDb, id: TokenId) =>\n  db.db\n    .selectFrom('token')\n    .where('tokenId', '=', id)\n    .where('currentRefreshToken', 'is not', null)\n    .select(['id', 'currentRefreshToken'])\n\nexport const findByQB = (\n  db: AccountDb,\n  search: {\n    id?: number\n    did?: string\n    code?: Code\n    tokenId?: TokenId\n    currentRefreshToken?: RefreshToken\n  },\n) => {\n  if (\n    search.id === undefined &&\n    search.did === undefined &&\n    search.code === undefined &&\n    search.tokenId === undefined &&\n    search.currentRefreshToken === undefined\n  ) {\n    // Prevent accidental scan\n    throw new TypeError('At least one search parameter is required')\n  }\n\n  return selectTokenInfoQB(db)\n    .if(search.id !== undefined, (qb) =>\n      // uses primary key index\n      qb.where('token.id', '=', search.id!),\n    )\n    .if(search.did !== undefined, (qb) =>\n      // uses \"token_did_idx\" index\n      qb.where('token.did', '=', search.did!),\n    )\n    .if(search.code !== undefined, (qb) =>\n      // uses \"token_code_idx\" partial index (hence the null check)\n      qb\n        .where('token.code', '=', search.code!)\n        .where('token.code', 'is not', null),\n    )\n    .if(search.tokenId !== undefined, (qb) =>\n      // uses \"token_token_id_idx\"\n      qb.where('token.tokenId', '=', search.tokenId!),\n    )\n    .if(search.currentRefreshToken !== undefined, (qb) =>\n      // uses \"token_refresh_token_unique_idx\"\n      qb.where('token.currentRefreshToken', '=', search.currentRefreshToken!),\n    )\n}\n\nexport const removeByDidQB = (db: AccountDb, did: string) =>\n  // uses \"token_did_idx\" index\n  db.db.deleteFrom('token').where('did', '=', did)\n\nexport const rotateQB = (\n  db: AccountDb,\n  id: number,\n  newTokenId: TokenId,\n  newRefreshToken: RefreshToken,\n  newData: NewTokenData,\n) =>\n  db.db\n    .updateTable('token')\n    .set({\n      tokenId: newTokenId,\n      currentRefreshToken: newRefreshToken,\n\n      expiresAt: toDateISO(newData.expiresAt),\n      updatedAt: toDateISO(newData.updatedAt),\n      clientAuth: toJson(newData.clientAuth),\n      scope: newData.scope,\n    })\n    // uses primary key index\n    .where('id', '=', id)\n\nexport const removeQB = (db: AccountDb, tokenId: TokenId) =>\n  // uses \"used_refresh_token_fk\" to cascade delete\n  db.db.deleteFrom('token').where('tokenId', '=', tokenId)\n"]}

package/dist/account-manager/helpers/used-refresh-token.d.ts

@@ -1,10 +1,10 @@
 import { RefreshToken } from '@atproto/oauth-provider';
-import { AccountDb } from '../db';
+import { AccountDb } from '../db/index.js';
 /**
  * Note that the used refresh tokens will be removed once the token is revoked.
  * This is done through the foreign key constraint in the database.
  */
-export declare const insertQB: (db: AccountDb, tokenId: number, refreshToken: RefreshToken) => import("kysely").InsertQueryBuilder<import("../db").DatabaseSchema, "used_refresh_token", import("kysely").InsertResult>;
-export declare const findByTokenQB: (db: AccountDb, refreshToken: RefreshToken) => import("kysely/dist/cjs/parser/select-parser").QueryBuilderWithSelection<import("kysely/dist/cjs/parser/table-parser").From<import("../db").DatabaseSchema, "used_refresh_token">, "used_refresh_token", {}, "tokenId">;
-export declare const countQB: (db: AccountDb, refreshToken: RefreshToken) => import("kysely/dist/cjs/parser/select-parser").QueryBuilderWithSelection<import("kysely/dist/cjs/parser/table-parser").From<import("../db").DatabaseSchema, "used_refresh_token">, "used_refresh_token", {}, (qb: import("kysely").ExpressionBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../db").DatabaseSchema, "used_refresh_token">, "used_refresh_token">) => import("kysely").AliasedAggregateFunctionBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../db").DatabaseSchema, "used_refresh_token">, "used_refresh_token", number, "count">>;
+export declare const insertQB: (db: AccountDb, tokenId: number, refreshToken: RefreshToken) => import("kysely").InsertQueryBuilder<import("../db/index.js").DatabaseSchema, "used_refresh_token", import("kysely").InsertResult>;
+export declare const findByTokenQB: (db: AccountDb, refreshToken: RefreshToken) => import("kysely").QueryBuilderWithSelection<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/index.js").DatabaseSchema, "used_refresh_token">, "used_refresh_token", {}, "tokenId">;
+export declare const countQB: (db: AccountDb, refreshToken: RefreshToken) => import("kysely").QueryBuilderWithSelection<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/index.js").DatabaseSchema, "used_refresh_token">, "used_refresh_token", {}, (qb: import("kysely").ExpressionBuilder<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/index.js").DatabaseSchema, "used_refresh_token">, "used_refresh_token">) => import("kysely").AliasedAggregateFunctionBuilder<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/index.js").DatabaseSchema, "used_refresh_token">, "used_refresh_token", number, "count">>;
 //# sourceMappingURL=used-refresh-token.d.ts.map

package/dist/account-manager/helpers/used-refresh-token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"used-refresh-token.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/used-refresh-token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAEjC;;;GAGG;AACH,eAAO,MAAM,QAAQ,GACnB,IAAI,SAAS,EACb,SAAS,MAAM,EACf,cAAc,YAAY,6HAKW,CAAA;AAEvC,eAAO,MAAM,aAAa,GAAI,IAAI,SAAS,EAAE,cAAc,YAAY,4NAKjD,CAAA;AAEtB,eAAO,MAAM,OAAO,GAAI,IAAI,SAAS,EAAE,cAAc,YAAY,gkBAKG,CAAA"}
+{"version":3,"file":"used-refresh-token.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/used-refresh-token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C;;;GAGG;AACH,eAAO,MAAM,QAAQ,GACnB,IAAI,SAAS,EACb,SAAS,MAAM,EACf,cAAc,YAAY,sIAKW,CAAA;AAEvC,eAAO,MAAM,aAAa,GAAI,IAAI,SAAS,EAAE,cAAc,YAAY,0MAKjD,CAAA;AAEtB,eAAO,MAAM,OAAO,GAAI,IAAI,SAAS,EAAE,cAAc,YAAY,skBAKG,CAAA"}

package/dist/account-manager/helpers/used-refresh-token.js

@@ -1,25 +1,19 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.countQB = exports.findByTokenQB = exports.insertQB = void 0;
 /**
  * Note that the used refresh tokens will be removed once the token is revoked.
  * This is done through the foreign key constraint in the database.
  */
-const insertQB = (db, tokenId, refreshToken) => db.db
+export const insertQB = (db, tokenId, refreshToken) => db.db
     .insertInto('used_refresh_token')
     .values({ tokenId, refreshToken })
     .onConflict((oc) => oc.doNothing());
-exports.insertQB = insertQB;
-const findByTokenQB = (db, refreshToken) => db.db
+export const findByTokenQB = (db, refreshToken) => db.db
     .selectFrom('used_refresh_token')
     // uses primary key index
     .where('refreshToken', '=', refreshToken)
     .select('tokenId');
-exports.findByTokenQB = findByTokenQB;
-const countQB = (db, refreshToken) => db.db
+export const countQB = (db, refreshToken) => db.db
     .selectFrom('used_refresh_token')
     // uses primary key index
     .where('refreshToken', '=', refreshToken)
     .select((qb) => qb.fn.count('refreshToken').as('count'));
-exports.countQB = countQB;
 //# sourceMappingURL=used-refresh-token.js.map

package/dist/account-manager/helpers/used-refresh-token.js.map

@@ -1 +1 @@
-{"version":3,"file":"used-refresh-token.js","sourceRoot":"","sources":["../../../src/account-manager/helpers/used-refresh-token.ts"],"names":[],"mappings":";;;AAGA;;;GAGG;AACI,MAAM,QAAQ,GAAG,CACtB,EAAa,EACb,OAAe,EACf,YAA0B,EAC1B,EAAE,CACF,EAAE,CAAC,EAAE;KACF,UAAU,CAAC,oBAAoB,CAAC;KAChC,MAAM,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;KACjC,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,CAAA;AAR1B,QAAA,QAAQ,YAQkB;AAEhC,MAAM,aAAa,GAAG,CAAC,EAAa,EAAE,YAA0B,EAAE,EAAE,CACzE,EAAE,CAAC,EAAE;KACF,UAAU,CAAC,oBAAoB,CAAC;IACjC,yBAAyB;KACxB,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,YAAY,CAAC;KACxC,MAAM,CAAC,SAAS,CAAC,CAAA;AALT,QAAA,aAAa,iBAKJ;AAEf,MAAM,OAAO,GAAG,CAAC,EAAa,EAAE,YAA0B,EAAE,EAAE,CACnE,EAAE,CAAC,EAAE;KACF,UAAU,CAAC,oBAAoB,CAAC;IACjC,yBAAyB;KACxB,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,YAAY,CAAC;KACxC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAS,cAAc,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAA;AALvD,QAAA,OAAO,WAKgD","sourcesContent":["import { RefreshToken } from '@atproto/oauth-provider'\nimport { AccountDb } from '../db'\n\n/**\n * Note that the used refresh tokens will be removed once the token is revoked.\n * This is done through the foreign key constraint in the database.\n */\nexport const insertQB = (\n  db: AccountDb,\n  tokenId: number,\n  refreshToken: RefreshToken,\n) =>\n  db.db\n    .insertInto('used_refresh_token')\n    .values({ tokenId, refreshToken })\n    .onConflict((oc) => oc.doNothing())\n\nexport const findByTokenQB = (db: AccountDb, refreshToken: RefreshToken) =>\n  db.db\n    .selectFrom('used_refresh_token')\n    // uses primary key index\n    .where('refreshToken', '=', refreshToken)\n    .select('tokenId')\n\nexport const countQB = (db: AccountDb, refreshToken: RefreshToken) =>\n  db.db\n    .selectFrom('used_refresh_token')\n    // uses primary key index\n    .where('refreshToken', '=', refreshToken)\n    .select((qb) => qb.fn.count<number>('refreshToken').as('count'))\n"]}
+{"version":3,"file":"used-refresh-token.js","sourceRoot":"","sources":["../../../src/account-manager/helpers/used-refresh-token.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,EAAa,EACb,OAAe,EACf,YAA0B,EAC1B,EAAE,CACF,EAAE,CAAC,EAAE;KACF,UAAU,CAAC,oBAAoB,CAAC;KAChC,MAAM,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;KACjC,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,CAAA;AAEvC,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,EAAa,EAAE,YAA0B,EAAE,EAAE,CACzE,EAAE,CAAC,EAAE;KACF,UAAU,CAAC,oBAAoB,CAAC;IACjC,yBAAyB;KACxB,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,YAAY,CAAC;KACxC,MAAM,CAAC,SAAS,CAAC,CAAA;AAEtB,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,EAAa,EAAE,YAA0B,EAAE,EAAE,CACnE,EAAE,CAAC,EAAE;KACF,UAAU,CAAC,oBAAoB,CAAC;IACjC,yBAAyB;KACxB,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,YAAY,CAAC;KACxC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAS,cAAc,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAA","sourcesContent":["import { RefreshToken } from '@atproto/oauth-provider'\nimport { AccountDb } from '../db/index.js'\n\n/**\n * Note that the used refresh tokens will be removed once the token is revoked.\n * This is done through the foreign key constraint in the database.\n */\nexport const insertQB = (\n  db: AccountDb,\n  tokenId: number,\n  refreshToken: RefreshToken,\n) =>\n  db.db\n    .insertInto('used_refresh_token')\n    .values({ tokenId, refreshToken })\n    .onConflict((oc) => oc.doNothing())\n\nexport const findByTokenQB = (db: AccountDb, refreshToken: RefreshToken) =>\n  db.db\n    .selectFrom('used_refresh_token')\n    // uses primary key index\n    .where('refreshToken', '=', refreshToken)\n    .select('tokenId')\n\nexport const countQB = (db: AccountDb, refreshToken: RefreshToken) =>\n  db.db\n    .selectFrom('used_refresh_token')\n    // uses primary key index\n    .where('refreshToken', '=', refreshToken)\n    .select((qb) => qb.fn.count<number>('refreshToken').as('count'))\n"]}

package/dist/account-manager/oauth-store.d.ts

@@ -2,12 +2,12 @@ import { Client } from '@did-plc/lib';
 import { Keypair } from '@atproto/crypto';
 import { HandleString } from '@atproto/lex';
 import { Account, AccountStore, AuthenticateAccountData, AuthorizedClientData, AuthorizedClients, ClientId, Code, DeviceAccount, DeviceData, DeviceId, DeviceStore, FoundRequestResult, LexiconData, LexiconStore, NewTokenData, RefreshToken, RequestData, RequestId, RequestStore, ResetPasswordConfirmInput, ResetPasswordRequestInput, SignUpData, Sub, TokenData, TokenId, TokenInfo, TokenStore, UpdateRequestData } from '@atproto/oauth-provider';
-import { ActorStore } from '../actor-store/actor-store';
-import { BackgroundQueue } from '../background';
-import { ImageUrlBuilder } from '../image/image-url-builder';
-import { ServerMailer } from '../mailer';
-import { Sequencer } from '../sequencer';
-import { AccountManager } from './account-manager';
+import { ActorStore } from '../actor-store/actor-store.js';
+import { BackgroundQueue } from '../background.js';
+import { ImageUrlBuilder } from '../image/image-url-builder.js';
+import { ServerMailer } from '../mailer/index.js';
+import { Sequencer } from '../sequencer/index.js';
+import { AccountManager } from './account-manager.js';
 /**
  * This class' purpose is to implement the interface needed by the OAuthProvider
  * to interact with the account database (through the {@link AccountManager}).

package/dist/account-manager/oauth-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-store.d.ts","sourceRoot":"","sources":["../../src/account-manager/oauth-store.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAA2B,MAAM,cAAc,CAAA;AAE9D,OAAO,EAAE,OAAO,EAAoB,MAAM,iBAAiB,CAAA;AAC3D,OAAO,EACL,YAAY,EAKb,MAAM,cAAc,CAAA;AACrB,OAAO,EACL,OAAO,EACP,YAAY,EACZ,uBAAuB,EACvB,oBAAoB,EACpB,iBAAiB,EACjB,QAAQ,EACR,IAAI,EACJ,aAAa,EACb,UAAU,EACV,QAAQ,EACR,WAAW,EACX,kBAAkB,EAKlB,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,WAAW,EACX,SAAS,EACT,YAAY,EACZ,yBAAyB,EACzB,yBAAyB,EACzB,UAAU,EACV,GAAG,EACH,SAAS,EACT,OAAO,EACP,SAAS,EACT,UAAU,EACV,iBAAiB,EAClB,MAAM,yBAAyB,CAAA;AAKhC,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAE/C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,SAAS,EAAyB,MAAM,cAAc,CAAA;AAC/D,OAAO,EAAE,cAAc,EAAwB,MAAM,mBAAmB,CAAA;AAYxE;;;;;GAKG;AACH,qBAAa,UACX,YAAW,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU;IAG1E,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc;gBATd,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,eAAe,EAChC,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,YAAY,EACpB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,OAAO,EACvB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,GAAG,IAAI;IAGhD,OAAO,KAAK,EAAE,GAIb;IAED,OAAO,KAAK,UAAU,GAErB;YAEa,uBAAuB;YAavB,gBAAgB;IAYxB,aAAa,CAAC,EAClB,MAAM,EAAE,OAAO,EACf,UAAU,EACV,MAAM,EACN,KAAK,EACL,QAAQ,GACT,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAiF1B,mBAAmB,CAAC,EACxB,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,UAAU,EACpB,QAAQ,EAER,QAAoB,GACrB,EAAE,uBAAuB,GAAG,OAAO,CAAC,OAAO,CAAC;IAmCvC,mBAAmB,CACvB,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,oBAAoB,GACzB,OAAO,CAAC,IAAI,CAAC;IAIV,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC;QAClC,OAAO,EAAE,OAAO,CAAA;QAChB,iBAAiB,EAAE,iBAAiB,CAAA;KACrC,CAAC;IAmBI,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMnE,gBAAgB,CACpB,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAoB1B,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAMhE,kBAAkB,CACtB,MAAM,EAAE;QAAE,GAAG,EAAE,GAAG,CAAA;KAAE,GAAG;QAAE,QAAQ,EAAE,QAAQ,CAAA;KAAE,GAC5C,OAAO,CAAC,aAAa,EAAE,CAAC;IA+BrB,oBAAoB,CAAC,EACzB,MAAM,EAAE,OAAO,EACf,KAAK,GACN,EAAE,yBAAyB,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAuBhD,oBAAoB,CACxB,IAAI,EAAE,yBAAyB,GAC9B,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAkBpB,wBAAwB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAkC7D,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9D,WAAW,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAiBvD,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAMpE,aAAa,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3C,kBAAkB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IASlE,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAMjE,UAAU,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,GAAG,UAAU,CAAC;IAK1D,YAAY,CAChB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,GACxB,OAAO,CAAC,IAAI,CAAC;IAMV,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/C,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAItD,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5D,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM1C,WAAW,CACf,EAAE,EAAE,OAAO,EACX,IAAI,EAAE,SAAS,EACf,YAAY,CAAC,EAAE,YAAY,GAC1B,OAAO,CAAC,IAAI,CAAC;IAgBV,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAKjD,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IAOtD,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAK5C,WAAW,CACf,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,OAAO,EACnB,eAAe,EAAE,YAAY,EAC7B,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,IAAI,CAAC;IA6BV,uBAAuB,CAC3B,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IAatB,eAAe,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;YAK9C,WAAW;YAWX,YAAY;CAmC3B"}
+{"version":3,"file":"oauth-store.d.ts","sourceRoot":"","sources":["../../src/account-manager/oauth-store.ts"],"names":[],"mappings":"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"}

package/dist/account-manager/oauth-store.js

@@ -1,129 +1,40 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OAuthStore = void 0;
-const node_assert_1 = __importDefault(require("node:assert"));
-const lib_1 = require("@did-plc/lib");
-const crypto_1 = require("@atproto/crypto");
-const lex_1 = require("@atproto/lex");
-const oauth_provider_1 = require("@atproto/oauth-provider");
-const xrpc_server_1 = require("@atproto/xrpc-server");
-const db_1 = require("../db");
-const logger_1 = require("../logger");
-const sequencer_1 = require("../sequencer");
-const account_manager_1 = require("./account-manager");
-const accountHelper = __importStar(require("./helpers/account"));
-const account_1 = require("./helpers/account");
-const accountDeviceHelper = __importStar(require("./helpers/account-device"));
-const authRequestHelper = __importStar(require("./helpers/authorization-request"));
-const authorizedClientHelper = __importStar(require("./helpers/authorized-client"));
-const deviceHelper = __importStar(require("./helpers/device"));
-const lexiconHelper = __importStar(require("./helpers/lexicon"));
-const tokenHelper = __importStar(require("./helpers/token"));
-const usedRefreshTokenHelper = __importStar(require("./helpers/used-refresh-token"));
+import assert from 'node:assert';
+import { createOp as createPlcOp } from '@did-plc/lib';
+import { Secp256k1Keypair } from '@atproto/crypto';
+import { asAtIdentifierString, getBlobCidString, isDidString, isHandleString, } from '@atproto/lex';
+import { HandleUnavailableError, InvalidCredentialsError, InvalidInviteCodeError, InvalidRequestError, } from '@atproto/oauth-provider';
+import { AuthRequiredError as XrpcAuthRequiredError, InvalidRequestError as XrpcInvalidRequestError, } from '@atproto/xrpc-server';
+import { fromDateISO } from '../db/index.js';
+import { dbLogger } from '../logger.js';
+import { syncEvtDataFromCommit } from '../sequencer/index.js';
+import { InvalidPasswordError } from './account-manager.js';
+import * as accountDeviceHelper from './helpers/account-device.js';
+import * as accountHelper from './helpers/account.js';
+import { AccountStatus } from './helpers/account.js';
+import * as authRequestHelper from './helpers/authorization-request.js';
+import * as authorizedClientHelper from './helpers/authorized-client.js';
+import * as deviceHelper from './helpers/device.js';
+import * as lexiconHelper from './helpers/lexicon.js';
+import * as tokenHelper from './helpers/token.js';
+import * as usedRefreshTokenHelper from './helpers/used-refresh-token.js';
 /**
  * This class' purpose is to implement the interface needed by the OAuthProvider
  * to interact with the account database (through the {@link AccountManager}).
  *
  * @note The use of this class assumes that there is no entryway.
  */
-class OAuthStore {
+export class OAuthStore {
     constructor(accountManager, actorStore, imageUrlBuilder, backgroundQueue, mailer, sequencer, plcClient, plcRotationKey, publicUrl, recoveryDidKey) {
-        Object.defineProperty(this, "accountManager", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: accountManager
-        });
-        Object.defineProperty(this, "actorStore", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: actorStore
-        });
-        Object.defineProperty(this, "imageUrlBuilder", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: imageUrlBuilder
-        });
-        Object.defineProperty(this, "backgroundQueue", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: backgroundQueue
-        });
-        Object.defineProperty(this, "mailer", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: mailer
-        });
-        Object.defineProperty(this, "sequencer", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: sequencer
-        });
-        Object.defineProperty(this, "plcClient", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: plcClient
-        });
-        Object.defineProperty(this, "plcRotationKey", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: plcRotationKey
-        });
-        Object.defineProperty(this, "publicUrl", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: publicUrl
-        });
-        Object.defineProperty(this, "recoveryDidKey", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: recoveryDidKey
-        });
+        this.accountManager = accountManager;
+        this.actorStore = actorStore;
+        this.imageUrlBuilder = imageUrlBuilder;
+        this.backgroundQueue = backgroundQueue;
+        this.mailer = mailer;
+        this.sequencer = sequencer;
+        this.plcClient = plcClient;
+        this.plcRotationKey = plcRotationKey;
+        this.publicUrl = publicUrl;
+        this.recoveryDidKey = recoveryDidKey;
     }
     get db() {
         const { db } = this.accountManager;
@@ -141,7 +52,7 @@ class OAuthStore {
             includeTakenDown: true,
         });
         if (account) {
-            throw new oauth_provider_1.InvalidRequestError(`Email already taken`);
+            throw new InvalidRequestError(`Email already taken`);
         }
     }
     async verifyInviteCode(code) {
@@ -149,15 +60,15 @@ class OAuthStore {
             await this.accountManager.ensureInviteIsAvailable(code);
         }
         catch (err) {
-            const message = err instanceof xrpc_server_1.InvalidRequestError ? err.message : undefined;
-            throw new oauth_provider_1.InvalidInviteCodeError(message, err);
+            const message = err instanceof XrpcInvalidRequestError ? err.message : undefined;
+            throw new InvalidInviteCodeError(message, err);
         }
     }
     // AccountStore
     async createAccount({ locale: _locale, inviteCode, handle, email, password, }) {
         // @TODO Send an account creation confirmation email (+verification link) to the user (in their locale)
         // @NOTE Password strength & length already enforced by the OAuthProvider
-        (0, node_assert_1.default)((0, lex_1.isHandleString)(handle), 'Handle must be a valid HandleString');
+        assert(isHandleString(handle), 'Handle must be a valid HandleString');
         await Promise.all([
             this.verifyEmailAvailability(email),
             this.verifyHandleAvailability(handle),
@@ -165,9 +76,9 @@ class OAuthStore {
         ]);
         // @TODO The code bellow should probably be refactored to be common with the
         // code of the `com.atproto.server.createAccount` XRPC endpoint.
-        const signingKey = await crypto_1.Secp256k1Keypair.create({ exportable: true });
+        const signingKey = await Secp256k1Keypair.create({ exportable: true });
         const signingKeyDid = signingKey.did();
-        const plcCreate = await (0, lib_1.createOp)({
+        const plcCreate = await createPlcOp({
             signingKey: signingKeyDid,
             rotationKeys: this.recoveryDidKey
                 ? [this.recoveryDidKey, this.plcRotationKey.did()]
@@ -177,7 +88,7 @@ class OAuthStore {
             signer: this.plcRotationKey,
         });
         const { did, op } = plcCreate;
-        (0, node_assert_1.default)((0, lex_1.isDidString)(did), 'Generated DID is not a valid DidString');
+        assert(isDidString(did), 'Generated DID is not a valid DidString');
         try {
             await this.actorStore.create(did, signingKey);
             try {
@@ -194,9 +105,9 @@ class OAuthStore {
                 });
                 try {
                     await this.sequencer.sequenceIdentityEvt(did, handle);
-                    await this.sequencer.sequenceAccountEvt(did, account_1.AccountStatus.Active);
+                    await this.sequencer.sequenceAccountEvt(did, AccountStatus.Active);
                     await this.sequencer.sequenceCommit(did, commit);
-                    await this.sequencer.sequenceSyncEvt(did, (0, sequencer_1.syncEvtDataFromCommit)(commit));
+                    await this.sequencer.sequenceSyncEvt(did, syncEvtDataFromCommit(commit));
                     await this.accountManager.updateRepoRoot(did, commit.cid, commit.rev);
                     await this.actorStore.clearReservedKeypair(signingKeyDid, did);
                     const account = await this.accountManager.getAccount(did);
@@ -216,8 +127,8 @@ class OAuthStore {
         }
         catch (err) {
             // XrpcError => OAuthError
-            if (err instanceof xrpc_server_1.InvalidRequestError) {
-                throw new oauth_provider_1.InvalidRequestError(err.message, err);
+            if (err instanceof XrpcInvalidRequestError) {
+                throw new InvalidRequestError(err.message, err);
             }
             throw err;
         }
@@ -233,10 +144,10 @@ class OAuthStore {
             }
             const { user, appPassword, isSoftDeleted } = await this.accountManager.login({ identifier, password });
             if (isSoftDeleted) {
-                throw new oauth_provider_1.InvalidRequestError('Account was taken down');
+                throw new InvalidRequestError('Account was taken down');
             }
             if (appPassword) {
-                throw new oauth_provider_1.InvalidRequestError('App passwords are not allowed');
+                throw new InvalidRequestError('App passwords are not allowed');
             }
             return this.buildAccount(user);
         }
@@ -245,11 +156,11 @@ class OAuthStore {
             // so it must be checked first. Surfacing the matched `did` as the
             // `sub` lets the oauth-provider's `onSignInFailed` hook distinguish
             // "identifier known, credentials wrong" from "identifier unknown".
-            if (err instanceof account_manager_1.InvalidPasswordError) {
-                throw new oauth_provider_1.InvalidCredentialsError(err.message, err.did, err);
+            if (err instanceof InvalidPasswordError) {
+                throw new InvalidCredentialsError(err.message, err.did, err);
             }
-            if (err instanceof xrpc_server_1.AuthRequiredError) {
-                throw new oauth_provider_1.InvalidCredentialsError(err.message, undefined, err);
+            if (err instanceof XrpcAuthRequiredError) {
+                throw new InvalidCredentialsError(err.message, undefined, err);
             }
             throw err;
         }
@@ -260,8 +171,8 @@ class OAuthStore {
     async getAccount(sub) {
         const accountRow = await accountHelper.getAccount(this.db, 
         // @TODO @atproto/oauth-provider should strongly type `Sub` as `DidString`
-        (0, lex_1.asAtIdentifierString)(sub), { includeDeactivated: true });
-        (0, node_assert_1.default)(accountRow, 'Account not found');
+        asAtIdentifierString(sub), { includeDeactivated: true });
+        assert(accountRow, 'Account not found');
         const account = await this.buildAccount(accountRow);
         const authorizedClients = await authorizedClientHelper.getAuthorizedClients(this.db, sub);
         return { account, authorizedClients };
@@ -280,8 +191,8 @@ class OAuthStore {
             deviceData: deviceHelper.rowToDeviceData(row),
             account: await this.buildAccount(row),
             authorizedClients: await authorizedClientHelper.getAuthorizedClients(this.db, sub),
-            createdAt: (0, db_1.fromDateISO)(row.adCreatedAt),
-            updatedAt: (0, db_1.fromDateISO)(row.adUpdatedAt),
+            createdAt: fromDateISO(row.adCreatedAt),
+            updatedAt: fromDateISO(row.adUpdatedAt),
         };
     }
     async removeDeviceAccount(deviceId, sub) {
@@ -301,8 +212,8 @@ class OAuthStore {
             deviceData: deviceHelper.rowToDeviceData(row),
             account: accounts.get(row.did),
             authorizedClients: authorizedClientsMap.get(row.did),
-            createdAt: (0, db_1.fromDateISO)(row.adCreatedAt),
-            updatedAt: (0, db_1.fromDateISO)(row.adUpdatedAt),
+            createdAt: fromDateISO(row.adCreatedAt),
+            updatedAt: fromDateISO(row.adUpdatedAt),
         }));
     }
     async resetPasswordRequest({ locale: _locale, email, }) {
@@ -328,7 +239,7 @@ class OAuthStore {
             return account ? this.buildAccount(account) : null;
         }
         catch (err) {
-            if (err instanceof xrpc_server_1.InvalidRequestError) {
+            if (err instanceof XrpcInvalidRequestError) {
                 return null;
             }
             throw err;
@@ -342,21 +253,21 @@ class OAuthStore {
             // handle) This check is just a safeguard against future normalization
             // changes.
             if (normalized !== handle) {
-                throw new oauth_provider_1.HandleUnavailableError('syntax', 'Invalid handle');
+                throw new HandleUnavailableError('syntax', 'Invalid handle');
             }
             const account = await this.accountManager.getAccount(normalized, {
                 includeDeactivated: true,
                 includeTakenDown: true,
             });
             if (account) {
-                throw new oauth_provider_1.HandleUnavailableError('taken');
+                throw new HandleUnavailableError('taken');
             }
         }
         catch (err) {
-            if (err instanceof xrpc_server_1.InvalidRequestError) {
+            if (err instanceof XrpcInvalidRequestError) {
                 throw err.customErrorName === 'HandleNotAvailable'
-                    ? new oauth_provider_1.HandleUnavailableError('taken', err.message)
-                    : new oauth_provider_1.HandleUnavailableError('syntax', err.message);
+                    ? new HandleUnavailableError('taken', err.message)
+                    : new HandleUnavailableError('syntax', err.message);
             }
             throw err;
         }
@@ -507,19 +418,18 @@ class OAuthStore {
                 return store.record.getProfileRecord();
             })
                 .catch((err) => {
-                logger_1.dbLogger.error({ err }, 'Failed to get profile record');
+                dbLogger.error({ err }, 'Failed to get profile record');
                 return null; // No need to propagate
             });
             if (profile) {
                 const { avatar, displayName } = profile;
-                account.name || (account.name = displayName);
-                account.picture || (account.picture = avatar
-                    ? this.imageUrlBuilder.build('avatar', did, (0, lex_1.getBlobCidString)(avatar))
-                    : undefined);
+                account.name ||= displayName;
+                account.picture ||= avatar
+                    ? this.imageUrlBuilder.build('avatar', did, getBlobCidString(avatar))
+                    : undefined;
             }
         }
         return account;
     }
 }
-exports.OAuthStore = OAuthStore;
 //# sourceMappingURL=oauth-store.js.map