@atproto/pds 0.5.48 → 0.5.50

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atproto/pds
 
+## 0.5.50
+
+### Patch Changes
+
+- [#5687](https://github.com/bluesky-social/atproto/pull/5687) [`943170b`](https://github.com/bluesky-social/atproto/commit/943170bd390705fbb16920688f8f09ec7078a59b) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update puppeteer dev dependency
+
+- [#5687](https://github.com/bluesky-social/atproto/pull/5687) [`943170b`](https://github.com/bluesky-social/atproto/commit/943170bd390705fbb16920688f8f09ec7078a59b) Thanks [@matthieusieben](https://github.com/matthieusieben)! - `/.well-known/change-password` redirects to the entryway
+- Updated dependencies [[`2720f72`](https://github.com/bluesky-social/atproto/commit/2720f72a5c4118c22841861dbc92a20693140093), [`943170b`](https://github.com/bluesky-social/atproto/commit/943170bd390705fbb16920688f8f09ec7078a59b)]:
+  - @atproto-labs/opentelemetry-node@0.4.0
+  - @atproto/oauth-provider@0.25.0
+  - @atproto/lex@0.4.3
+
+## 0.5.49
+
+### Patch Changes
+
+- [#5730](https://github.com/bluesky-social/atproto/pull/5730) [`4744b4a`](https://github.com/bluesky-social/atproto/commit/4744b4a2c0d17fed6bf063f2a86bd3b3875ddf1f) Thanks [@haileyok](https://github.com/haileyok)! - Update body-parser to 1.20.9
+- Updated dependencies [[`4744b4a`](https://github.com/bluesky-social/atproto/commit/4744b4a2c0d17fed6bf063f2a86bd3b3875ddf1f)]:
+  - @atproto/xrpc-server@0.13.6
+  - @atproto-labs/xrpc-utils@0.1.27
+
 ## 0.5.48
 
 ### Patch Changes

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

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

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

@@ -695,11 +695,12 @@ export class AccountManager {
     async updateAccountPassword(opts) {
         const { did } = opts;
         const passwordScrypt = await scrypt.genSaltAndHash(opts.password);
-        await this.db.transaction(async (dbTxn) => Promise.all([
-            password.updateUserPassword(dbTxn, { did, passwordScrypt }),
-            emailToken.deleteEmailToken(dbTxn, did, 'reset_password'),
-            auth.revokeRefreshTokensByDid(dbTxn, did),
-        ]));
+        await this.db.transaction(async (dbTxn) => {
+            await password.updateUserPassword(dbTxn, { did, passwordScrypt });
+            await emailToken.deleteEmailToken(dbTxn, did, 'reset_password');
+            await auth.revokeRefreshTokensByDid(dbTxn, did);
+            // @NOTE Should we also clear oauth sessions here ?
+        });
     }
 }
 //# sourceMappingURL=account-manager.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"account-manager.js","sourceRoot":"","sources":["../../src/account-manager/account-manager.ts"],"names":[],"mappings":"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","sourcesContent":["import assert from 'node:assert'\nimport type { KeyObject } from 'node:crypto'\nimport type { Client as PlcClient } from '@did-plc/lib'\nimport { isEmailValid } from '@hapi/address'\nimport { isDisposableEmail } from 'disposable-email-domains-js'\nimport { HOUR, obfuscateEmail, wait } from '@atproto/common'\nimport type { Keypair } from '@atproto/crypto'\nimport type { IdResolver } from '@atproto/identity'\nimport {\n  type AtIdentifierString,\n  type DidString,\n  type HandleString,\n  isAtIdentifierString,\n} from '@atproto/lex'\nimport type { Cid } from '@atproto/lex-data'\nimport {\n  INVALID_HANDLE,\n  currentDatetimeString,\n  isValidTld,\n} from '@atproto/syntax'\nimport { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'\nimport type { ActorStore } from '../actor-store/actor-store.js'\nimport { assertValidDidDocumentForService } from '../api/com/atproto/server/util.js'\nimport { AuthScope } from '../auth-scope.js'\nimport type { ServerConfig } from '../config/config.js'\nimport { softDeleted } from '../db/index.js'\nimport { hasExplicitSlur } from '../handle/explicit-slurs.js'\nimport {\n  baseNormalizeAndValidate,\n  ensureHandleServiceConstraints,\n  isServiceDomain,\n} from '../handle/index.js'\nimport type { com } from '../lexicons/index.js'\nimport { httpLogger } from '../logger.js'\nimport type { ServerMailer } from '../mailer/index.js'\nimport type { Sequencer } from '../sequencer/index.js'\nimport {\n  type AccountDb,\n  type EmailTokenPurpose,\n  getDb,\n  getMigrator,\n} from './db/index.js'\nimport * as accountHelpers from './helpers/account.js'\nimport { AccountStatus, type ActorAccount } from './helpers/account.js'\nimport * as auth from './helpers/auth.js'\nimport * as authorizedClientHelper from './helpers/authorized-client.js'\nimport * as emailAuthFactor from './helpers/email-auth-factor.js'\nimport * as emailToken from './helpers/email-token.js'\nimport * as invite from './helpers/invite.js'\nimport * as password from './helpers/password.js'\nimport * as repo from './helpers/repo.js'\nimport * as scrypt from './helpers/scrypt.js'\nimport * as token from './helpers/token.js'\n\nexport { AccountStatus, formatAccountStatus } from './helpers/account.js'\n\nexport type UpdateAccountEmailOptions = {\n  sendConfirmationEmail?: boolean\n  locale?: string\n}\n\n/**\n * Thrown by {@link AccountManager.login} when the identifier resolved to a\n * known account but the supplied credentials (account password / app\n * password) did not match. The matched `did` is attached so downstream\n * callers can distinguish \"identifier known, credentials wrong\" from\n * \"identifier unknown\" (which continues to throw a plain\n * {@link AuthRequiredError}).\n *\n * Callers should take care that remote clients *cannot* distinguish the above,\n * to prevent enumeration attacks. (Tested for in\n * packages/pds/tests/auth.test.ts)\n */\nexport class InvalidPasswordError extends AuthRequiredError {\n  constructor(\n    public readonly did: DidString,\n    errorMessage = 'Invalid identifier or password',\n  ) {\n    super(errorMessage)\n  }\n}\n\n/**\n * Thrown by {@link AccountManager.login} when the credentials were valid but\n * the account requires a second authentication factor. A one-time code has\n * already been dispatched by the time this is thrown.\n *\n * XRPC-native like every other error this class raises: `AuthFactorTokenRequired`\n * is the error name `com.atproto.server.createSession` declares, so that path\n * needs no translation. The OAuth boundary ({@link OAuthStore.authenticateAccount})\n * converts it to `SecondAuthenticationFactorRequiredError` — which is why\n * `factor` and `hint` are carried as fields rather than baked into the message.\n *\n * @NOTE Subclasses {@link AuthRequiredError}, so any `instanceof` check against\n * the base class must come *after* this one — see the ordering note in\n * `OAuthStore.authenticateAccount`.\n */\nexport class AuthFactorRequiredError extends AuthRequiredError {\n  constructor(\n    public readonly factor: 'emailOtp',\n    public readonly hint: string,\n    errorMessage = 'A sign in code has been sent to your email address',\n  ) {\n    super(errorMessage, 'AuthFactorTokenRequired')\n  }\n}\n\nexport type AccountManagerDbConfig = {\n  accountDbLoc: string\n  disableWalAutoCheckpoint: boolean\n}\n\nexport class AccountManager {\n  readonly db: AccountDb\n\n  constructor(\n    readonly cfg: ServerConfig,\n    readonly actorStore: ActorStore,\n    readonly idResolver: IdResolver,\n    readonly jwtKey: KeyObject,\n    readonly mailer: ServerMailer,\n    readonly sequencer: Sequencer,\n    readonly plcClient: PlcClient,\n    readonly plcRotationKey: Keypair,\n  ) {\n    this.db = getDb(cfg.db.accountDbLoc, cfg.db.disableWalAutoCheckpoint)\n  }\n\n  get serviceDid(): DidString {\n    return this.cfg.service.did\n  }\n\n  get serviceHandleDomains(): string[] {\n    return this.cfg.identity.serviceHandleDomains\n  }\n\n  async migrateOrThrow() {\n    await this.db.ensureWal()\n    await getMigrator(this.db).migrateToLatestOrThrow()\n  }\n\n  async close() {\n    await this.db.close()\n  }\n\n  // Account\n  // ----------\n\n  async getAccount(\n    handleOrDid: AtIdentifierString,\n    flags?: accountHelpers.AvailabilityFlags,\n  ): Promise<ActorAccount | null> {\n    return accountHelpers.getAccount(this.db, handleOrDid, flags)\n  }\n\n  async getAccounts(\n    dids: DidString[],\n    flags?: accountHelpers.AvailabilityFlags,\n  ): Promise<Map<string, ActorAccount>> {\n    return accountHelpers.getAccounts(this.db, dids, flags)\n  }\n\n  async getAccountByEmail(\n    email: string,\n    flags?: accountHelpers.AvailabilityFlags,\n  ): Promise<ActorAccount | null> {\n    return accountHelpers.getAccountByEmail(this.db, email, flags)\n  }\n\n  async isAccountActivated(did: DidString): Promise<boolean> {\n    const account = await this.getAccount(did, { includeDeactivated: true })\n    if (!account) return false\n    return !account.deactivatedAt\n  }\n\n  async getDidForActor(\n    handleOrDid: AtIdentifierString,\n    flags?: accountHelpers.AvailabilityFlags,\n  ): Promise<DidString | null> {\n    const got = await this.getAccount(handleOrDid, flags)\n    return got?.did ?? null\n  }\n\n  async getAccountStatus(handleOrDid: AtIdentifierString) {\n    const got = await this.getAccount(handleOrDid, {\n      includeDeactivated: true,\n      includeTakenDown: true,\n    })\n\n    const { active, status = active ? AccountStatus.Active : undefined } =\n      accountHelpers.formatAccountStatus(got)\n    assert(status != null)\n    return { status, account: got } as\n      | { status: AccountStatus.Deleted; account: null }\n      | { status: AccountStatus.Takendown; account: ActorAccount }\n      | { status: AccountStatus.Deactivated; account: ActorAccount }\n      | { status: AccountStatus.Active; account: ActorAccount }\n  }\n\n  async normalizeAndValidateHandle(\n    handle: string,\n    {\n      did,\n      allowAnyValid = false,\n    }: {\n      did?: string\n      allowAnyValid?: boolean\n    } = {},\n  ): Promise<HandleString> {\n    const normalized = baseNormalizeAndValidate(handle)\n\n    // tld validation\n    if (!isValidTld(normalized)) {\n      throw new InvalidRequestError(\n        'Handle TLD is invalid or disallowed',\n        'InvalidHandle',\n      )\n    }\n    // slur check\n    if (!allowAnyValid && hasExplicitSlur(normalized)) {\n      throw new InvalidRequestError(\n        'Inappropriate language in handle',\n        'InvalidHandle',\n      )\n    }\n    if (isServiceDomain(normalized, this.serviceHandleDomains)) {\n      // verify constraints on a service domain\n      ensureHandleServiceConstraints(\n        normalized,\n        this.serviceHandleDomains,\n        allowAnyValid,\n      )\n    } else {\n      // When creating an account (no did yet), we require the handle to be a\n      // local service domain. Updating to a custom handle will be possible once\n      // the account was created.\n      if (did == null) {\n        throw new InvalidRequestError(\n          'Not a supported handle domain',\n          'UnsupportedDomain',\n        )\n      }\n\n      // verify resolution of a non-service domain\n      const resolvedDid = await this.idResolver.handle.resolve(normalized)\n      if (resolvedDid !== did) {\n        // @TODO This should use a distinct error code\n        throw new InvalidRequestError('External handle did not resolve to DID')\n      }\n    }\n\n    return normalized\n  }\n\n  async createAccount({\n    did,\n    handle,\n    email,\n    password,\n    repoCid,\n    repoRev,\n    inviteCode,\n    deactivated,\n    refreshJwt,\n  }: {\n    did: DidString\n    handle: HandleString\n    email?: string\n    password?: string\n    repoCid: Cid\n    repoRev: string\n    inviteCode?: string\n    deactivated?: boolean\n    refreshJwt?: string\n  }) {\n    if (password && password.length > scrypt.NEW_PASSWORD_MAX_LENGTH) {\n      throw new InvalidRequestError('Password too long')\n    }\n\n    const passwordScrypt =\n      email && password ? await scrypt.genSaltAndHash(password) : undefined\n\n    const now = currentDatetimeString()\n    return this.db.transaction(async (dbTxn) => {\n      if (inviteCode) {\n        await invite.ensureInviteIsAvailable(dbTxn, inviteCode)\n      }\n\n      await accountHelpers.registerActor(dbTxn, { did, handle, deactivated })\n\n      if (email && passwordScrypt) {\n        await accountHelpers.registerAccount(dbTxn, {\n          did,\n          email,\n          passwordScrypt,\n        })\n      }\n\n      await invite.recordInviteUse(dbTxn, {\n        did,\n        inviteCode,\n        now,\n      })\n\n      if (refreshJwt) {\n        await auth.storeRefreshToken(\n          dbTxn,\n          auth.decodeRefreshToken(refreshJwt),\n          null,\n        )\n      }\n\n      await repo.updateRoot(dbTxn, did, repoCid, repoRev)\n    })\n  }\n\n  async createAccountAndSession(opts: {\n    did: DidString\n    handle: HandleString\n    email?: string\n    password?: string\n    repoCid: Cid\n    repoRev: string\n    inviteCode?: string\n    deactivated?: boolean\n  }) {\n    const { accessJwt, refreshJwt } = await auth.createTokens({\n      did: opts.did,\n      jwtKey: this.jwtKey,\n      serviceDid: this.serviceDid,\n      scope: AuthScope.Access,\n    })\n\n    await this.createAccount({ ...opts, refreshJwt })\n\n    return { accessJwt, refreshJwt }\n  }\n\n  /**\n   * Validates the requested handle, updates the PLC document if needed, persists\n   * the new handle locally, and emits an identity event.\n   *\n   * @throws {InvalidRequestError} when the handle is invalid, taken by another\n   * account, or cannot be resolved for non-service domains.\n   *\n   * @see {@link AccountManager.updateAccountHandle} for behavior when the PLC update fails.\n   */\n  async updateHandle(\n    did: DidString,\n    newHandle: string,\n    options?: { allowAnyValid?: boolean },\n  ): Promise<ActorAccount & { handle: HandleString }> {\n    const { account, handle } = await this.validateHandleUpdate(\n      did,\n      newHandle,\n      options,\n    )\n\n    if (did.startsWith('did:plc:')) {\n      // @TODO We should verify the status before issuing a PLC update.\n      await this.plcClient.updateHandle(did, this.plcRotationKey, handle)\n    } else {\n      const resolved = await this.idResolver.did.resolveAtprotoData(did, true)\n      if (resolved.handle !== handle) {\n        throw new InvalidRequestError(\n          'DID is not properly configured for handle',\n        )\n      }\n    }\n\n    // @NOTE If the next line fails (for any reason), we don't \"rollback\" the\n    // PLC update above. The caller can just call this method again.\n    await this.updateAccountHandle(did, handle)\n\n    return { ...account, handle }\n  }\n\n  async validateHandleUpdate(\n    did: DidString,\n    newHandle: string,\n    options?: { allowAnyValid?: boolean },\n  ): Promise<{\n    did: DidString\n    handle: HandleString\n    // Returned for convenience\n    account: ActorAccount\n  }> {\n    const account = await this.getAccount(did, { includeDeactivated: true })\n    if (!account) {\n      throw new InvalidRequestError('Account not found')\n    }\n\n    const handle = await this.normalizeAndValidateHandle(newHandle, {\n      allowAnyValid: options?.allowAnyValid,\n      did,\n    })\n\n    // Pessimistic check to handle spam: also enforced by updateAccountHandle() and the db.\n    const existing = await this.getAccount(handle, {\n      includeDeactivated: true,\n      includeTakenDown: true,\n    })\n\n    if (existing && existing.did !== did) {\n      throw new InvalidRequestError(\n        `Handle already taken: ${handle}`,\n        'HandleNotAvailable',\n      )\n    }\n\n    return { did, handle, account }\n  }\n\n  /**\n   * @note Failure to emit the identity event will silently be ignored. Users\n   * can emit the event again by updating their handle to the same value.\n   */\n  async updateAccountHandle(\n    did: DidString,\n    handle: HandleString,\n  ): Promise<void> {\n    await accountHelpers.updateHandle(this.db, did, handle)\n\n    try {\n      await this.sequencer.sequenceIdentity(did, handle)\n    } catch (err) {\n      httpLogger.error({ err, did, handle }, 'failed to sequence handle update')\n    }\n  }\n\n  async deleteAccount(did: DidString) {\n    return accountHelpers.deleteAccount(this.db, did)\n  }\n\n  async takedownAccount(\n    did: DidString,\n    takedown: com.atproto.admin.defs.StatusAttr,\n  ) {\n    await this.db.transaction(async (dbTxn) => {\n      await accountHelpers.updateAccountTakedownStatus(dbTxn, did, takedown)\n      await auth.revokeRefreshTokensByDid(dbTxn, did)\n      await token.removeByDid(dbTxn, did)\n    })\n\n    await this.sequenceAccountStatus(did)\n  }\n\n  async getAccountAdminStatus(did: DidString) {\n    return accountHelpers.getAccountAdminStatus(this.db, did)\n  }\n\n  async updateRepoRoot(did: DidString, cid: Cid, rev: string) {\n    return repo.updateRoot(this.db, did, cid, rev)\n  }\n\n  async deactivateAccount(\n    did: DidString,\n    options?: {\n      deleteCredentials?: boolean\n      deleteAfter?: string | null\n    },\n  ) {\n    const wasUpdated = await this.db.transaction(async (dbTxn) => {\n      if (options?.deleteCredentials) {\n        await token.removeByDid(dbTxn, did)\n        await authorizedClientHelper.deleteAllAuthorizedClients(dbTxn, did)\n        await password.deleteAllAppPasswords(dbTxn, did)\n      }\n\n      return accountHelpers.deactivateAccount(\n        dbTxn,\n        did,\n        options?.deleteAfter ?? null,\n      )\n    })\n\n    if (!wasUpdated) {\n      throw new InvalidRequestError('Account not found')\n    }\n\n    const accountStatus = await this.getAccountStatus(did)\n\n    // Account is likely soft-deleted (takendown)\n    if (accountStatus.status === AccountStatus.Deleted) {\n      throw new InvalidRequestError('Account not found')\n    }\n\n    await this.sequencer.sequenceAccount(did, accountStatus.status)\n\n    return accountStatus\n  }\n\n  async activateAccount(did: DidString) {\n    await assertValidDidDocumentForService(this, did)\n\n    const found = await accountHelpers.activateAccount(this.db, did, {\n      // We cannot activate a takendown account\n      includeTakenDown: false,\n      includeDeactivated: true,\n    })\n    if (!found) {\n      throw new InvalidRequestError('user not found', 'AccountNotFound')\n    }\n\n    const accountStatus = await this.getAccountStatus(did)\n\n    const { account, status } = accountStatus\n\n    if (status === AccountStatus.Deleted) {\n      // A concurrent operation deleted the account\n      throw new InvalidRequestError('user not found', 'AccountNotFound')\n    }\n\n    const syncData = await this.actorStore.read(did, (store) => {\n      return store.repo.getSyncEventData()\n    })\n\n    await this.sequencer.sequenceAccountActivation(\n      did,\n      account.handle ?? INVALID_HANDLE,\n      status,\n      syncData,\n    )\n\n    return accountStatus\n  }\n\n  async sequenceAccountStatus(did: DidString) {\n    const { status } = await this.getAccountStatus(did)\n    await this.sequencer.sequenceAccount(did, status)\n  }\n\n  // Auth\n  // ----------\n\n  async createSession(\n    did: DidString,\n    appPassword: password.AppPassDescript | null,\n    isSoftDeleted = false,\n  ) {\n    const { accessJwt, refreshJwt } = await auth.createTokens({\n      did,\n      jwtKey: this.jwtKey,\n      serviceDid: this.serviceDid,\n      scope: auth.formatScope(appPassword, isSoftDeleted),\n    })\n    // For soft deleted accounts don't store refresh token so that it can't be rotated.\n    if (!isSoftDeleted) {\n      const refreshPayload = auth.decodeRefreshToken(refreshJwt)\n      await auth.storeRefreshToken(this.db, refreshPayload, appPassword)\n    }\n    return { accessJwt, refreshJwt }\n  }\n\n  async rotateRefreshToken(id: string) {\n    const token = await auth.getRefreshToken(this.db, id)\n    if (!token) return null\n\n    const now = new Date()\n\n    // take the chance to tidy all of a user's expired tokens\n    // does not need to be transactional since this is just best-effort\n    await auth.deleteExpiredRefreshTokens(this.db, token.did, now.toISOString())\n\n    // Shorten the refresh token lifespan down from its\n    // original expiration time to its revocation grace period.\n    const prevExpiresAt = new Date(token.expiresAt)\n    const REFRESH_GRACE_MS = 2 * HOUR\n    const graceExpiresAt = new Date(now.getTime() + REFRESH_GRACE_MS)\n\n    const expiresAt =\n      graceExpiresAt < prevExpiresAt ? graceExpiresAt : prevExpiresAt\n\n    if (expiresAt <= now) {\n      return null\n    }\n\n    // Determine the next refresh token id: upon refresh token\n    // reuse you always receive a refresh token with the same id.\n    const nextId = token.nextId ?? auth.getRefreshTokenId()\n\n    const { accessJwt, refreshJwt } = await auth.createTokens({\n      did: token.did,\n      jwtKey: this.jwtKey,\n      serviceDid: this.serviceDid,\n      scope: auth.formatScope(token.appPassword),\n      jti: nextId,\n    })\n\n    const refreshPayload = auth.decodeRefreshToken(refreshJwt)\n    try {\n      await this.db.transaction((dbTxn) =>\n        Promise.all([\n          auth.addRefreshGracePeriod(dbTxn, {\n            id,\n            expiresAt: expiresAt.toISOString(),\n            nextId,\n          }),\n          auth.storeRefreshToken(dbTxn, refreshPayload, token.appPassword),\n        ]),\n      )\n    } catch (err) {\n      if (err instanceof auth.ConcurrentRefreshError) {\n        return this.rotateRefreshToken(id)\n      }\n      throw err\n    }\n    return { accessJwt, refreshJwt }\n  }\n\n  async revokeRefreshToken(id: string) {\n    return auth.revokeRefreshToken(this.db, id)\n  }\n\n  // Login\n  // ----------\n\n  async login({\n    identifier,\n    password,\n    authFactorToken,\n    locale,\n    allowOtpBypassFor = [],\n  }: {\n    identifier: string\n    password: string\n    authFactorToken?: string | undefined\n    // Only the OAuth sign-in path carries one; `com.atproto.server.createSession`\n    // declares no locale input, so the challenge email falls back to the\n    // default template there.\n    locale?: string | undefined\n    allowOtpBypassFor?: readonly DidString[]\n  }): Promise<{\n    // @TODO we should rename this \"account\" for consistency\n    user: ActorAccount\n    appPassword: password.AppPassDescript | null\n    isSoftDeleted: boolean\n  }> {\n    const start = Date.now()\n    try {\n      const identifierNormalized = identifier.toLowerCase()\n\n      const user = identifierNormalized.includes('@')\n        ? await this.getAccountByEmail(identifierNormalized, {\n            includeDeactivated: true,\n            includeTakenDown: true,\n          })\n        : isAtIdentifierString(identifierNormalized)\n          ? await this.getAccount(identifierNormalized, {\n              includeDeactivated: true,\n              includeTakenDown: true,\n            })\n          : null\n\n      if (!user) {\n        throw new AuthRequiredError('Invalid identifier or password')\n      }\n      const isSoftDeleted = softDeleted(user)\n\n      let appPassword: password.AppPassDescript | null = null\n      const validAccountPass = await this.verifyAccountPassword(\n        user.did,\n        password,\n      )\n      if (!validAccountPass) {\n        // takendown/suspended accounts cannot login with app password\n        if (isSoftDeleted) {\n          throw new InvalidPasswordError(user.did)\n        }\n        appPassword = await this.verifyAppPassword(user.did, password)\n        if (appPassword === null) {\n          throw new InvalidPasswordError(user.did)\n        }\n      }\n\n      if (authFactorToken) {\n        await this.assertValidEmailTokenAndCleanup(\n          user.did,\n          'auth_factor',\n          authFactorToken,\n        )\n        // require email factor when not using an app password\n      } else if (\n        user.email !== null &&\n        user.emailAuthFactorAt !== null &&\n        !allowOtpBypassFor.includes(user.did) &&\n        appPassword === null\n      ) {\n        const token = await this.createEmailToken(user.did, 'auth_factor')\n\n        await this.mailer.sendSignInAuthFactor(\n          { token, handle: user.handle, locale },\n          { to: user.email },\n        )\n\n        throw new AuthFactorRequiredError(\n          'emailOtp',\n          obfuscateEmail(user.email),\n        )\n      }\n\n      return { user, appPassword, isSoftDeleted }\n    } finally {\n      // Mitigate timing attacks\n      await wait(350 - (Date.now() - start))\n    }\n  }\n\n  // Passwords\n  // ----------\n\n  async createAppPassword(did: DidString, name: string, privileged: boolean) {\n    return password.createAppPassword(this.db, did, name, privileged)\n  }\n\n  async listAppPasswords(did: DidString) {\n    return password.listAppPasswords(this.db, did)\n  }\n\n  async verifyAccountPassword(\n    did: DidString,\n    passwordStr: string,\n  ): Promise<boolean> {\n    if (passwordStr.length > scrypt.OLD_PASSWORD_MAX_LENGTH) {\n      // @NOTE Avoid throwing from here to avoid leaking account email validity\n      // through error messages.\n      return false\n    }\n\n    return password.verifyAccountPassword(this.db, did, passwordStr)\n  }\n\n  async verifyAppPassword(\n    did: DidString,\n    passwordStr: string,\n  ): Promise<password.AppPassDescript | null> {\n    return password.verifyAppPassword(this.db, did, passwordStr)\n  }\n\n  async revokeAppPassword(did: DidString, name: string) {\n    await this.db.transaction(async (dbTxn) =>\n      Promise.all([\n        password.deleteAppPassword(dbTxn, did, name),\n        auth.revokeAppPasswordRefreshToken(dbTxn, did, name),\n      ]),\n    )\n  }\n\n  // Invites\n  // ----------\n\n  async ensureInviteIsAvailable(code: string) {\n    return invite.ensureInviteIsAvailable(this.db, code)\n  }\n\n  async createInviteCodes(\n    toCreate: { account: string; codes: string[] }[],\n    useCount: number,\n  ) {\n    return invite.createInviteCodes(this.db, toCreate, useCount)\n  }\n\n  async createAccountInviteCodes(\n    forAccount: string,\n    codes: string[],\n    expectedTotal: number,\n    disabled: 0 | 1,\n  ) {\n    return invite.createAccountInviteCodes(\n      this.db,\n      forAccount,\n      codes,\n      expectedTotal,\n      disabled,\n    )\n  }\n\n  async getAccountInvitesCodes(did: DidString) {\n    const inviteCodes = await invite.getAccountsInviteCodes(this.db, [did])\n    return inviteCodes.get(did) ?? []\n  }\n\n  async getAccountsInvitesCodes(dids: DidString[]) {\n    return invite.getAccountsInviteCodes(this.db, dids)\n  }\n\n  async getInvitedByForAccounts(dids: DidString[]) {\n    return invite.getInvitedByForAccounts(this.db, dids)\n  }\n\n  async getInviteCodesUses(codes: string[]) {\n    return invite.getInviteCodesUses(this.db, codes)\n  }\n\n  async setAccountInvitesDisabled(did: DidString, disabled: boolean) {\n    return invite.setAccountInvitesDisabled(this.db, did, disabled)\n  }\n\n  async disableInviteCodes(opts: { codes: string[]; accounts: string[] }) {\n    return invite.disableInviteCodes(this.db, opts)\n  }\n\n  // Email Tokens\n  // ----------\n\n  async createEmailToken(did: DidString, purpose: EmailTokenPurpose) {\n    return emailToken.createEmailToken(this.db, did, purpose)\n  }\n\n  async assertValidEmailToken(\n    did: DidString,\n    purpose: EmailTokenPurpose,\n    token: string,\n  ) {\n    return emailToken.assertValidToken(this.db, did, purpose, token)\n  }\n\n  async assertValidEmailTokenAndCleanup(\n    did: DidString,\n    purpose: EmailTokenPurpose,\n    token: string,\n  ) {\n    await emailToken.assertValidToken(this.db, did, purpose, token)\n    await emailToken.deleteEmailToken(this.db, did, purpose)\n  }\n\n  async requestEmailConfirmation(did: DidString, opts?: { locale?: string }) {\n    const account = await this.getAccount(did, {\n      includeDeactivated: true,\n      includeTakenDown: true,\n    })\n\n    if (!account) {\n      throw new InvalidRequestError('account not found')\n    }\n\n    if (!account.email) {\n      throw new InvalidRequestError('account does not have an email address')\n    }\n\n    const locale = opts?.locale\n    const token = await this.createEmailToken(did, 'confirm_email')\n\n    await this.mailer.sendConfirmEmail({ token, locale }, { to: account.email })\n  }\n\n  async confirmEmail(did: DidString, email: string, token: string) {\n    const user = await this.getAccount(did, {\n      includeDeactivated: true,\n      includeTakenDown: true,\n    })\n\n    if (!user) {\n      throw new InvalidRequestError('user not found', 'AccountNotFound')\n    }\n\n    if (user.email !== email.toLowerCase()) {\n      throw new InvalidRequestError('invalid email', 'InvalidEmail')\n    }\n\n    await emailToken.assertValidToken(this.db, did, 'confirm_email', token)\n    const now = currentDatetimeString()\n    await this.db.transaction(async (dbTxn) => {\n      await emailToken.deleteEmailToken(dbTxn, did, 'confirm_email')\n      await accountHelpers.setEmailConfirmedAt(dbTxn, did, now)\n    })\n\n    user.emailConfirmedAt = now\n\n    return user\n  }\n\n  async requestEmailUpdate(\n    did: DidString,\n    opts?: { locale?: string },\n  ): Promise<{ tokenRequired: boolean }> {\n    const account = await this.getAccount(did, {\n      includeDeactivated: true,\n      includeTakenDown: true,\n    })\n\n    if (!account) {\n      throw new InvalidRequestError('account not found')\n    }\n\n    if (!account.email) {\n      throw new InvalidRequestError('account does not have an email address')\n    }\n\n    const token = account.emailConfirmedAt\n      ? await this.createEmailToken(did, 'update_email')\n      : null\n\n    if (token) {\n      await this.mailer.sendUpdateEmail(\n        { token, locale: opts?.locale },\n        { to: account.email },\n      )\n    }\n\n    return { tokenRequired: !!token }\n  }\n\n  async checkUpdateEmail(\n    did: DidString,\n    email: string,\n    token?: string,\n  ): Promise<ActorAccount> {\n    if (!isEmailValid(email) || isDisposableEmail(email)) {\n      throw new InvalidRequestError(\n        'This email address is not supported, please use a different email.',\n      )\n    }\n\n    const account = await this.getAccount(did, {\n      includeDeactivated: true,\n      includeTakenDown: true,\n    })\n\n    if (!account) {\n      throw new InvalidRequestError(\n        `Could not find user info for account: ${did}`,\n      )\n    }\n\n    const tokenRequired = !!account.emailConfirmedAt\n\n    if (token) {\n      await this.assertValidEmailToken(did, 'update_email', token)\n    } else if (tokenRequired) {\n      // require a token if account email is confirmed\n      throw new InvalidRequestError(\n        'confirmation token required',\n        'TokenRequired',\n      )\n    }\n\n    return account\n  }\n\n  /**\n   * @throws UserAlreadyExistsError if the new email is already in use by another account\n   */\n  async updateEmail(\n    did: DidString,\n    email: string,\n    token?: string,\n    opts?: UpdateAccountEmailOptions,\n  ): Promise<ActorAccount> {\n    const account = await this.checkUpdateEmail(did, email, token)\n\n    await this.updateAccountEmail(did, email, opts)\n\n    account.email = email\n    account.emailConfirmedAt = null\n\n    return account\n  }\n\n  async updateAccountEmail(\n    did: DidString,\n    email: string,\n    opts?: UpdateAccountEmailOptions,\n  ) {\n    await this.db.transaction(async (dbTxn) => {\n      await accountHelpers.updateEmail(dbTxn, did, email)\n      // @NOTE In the same transaction as the email write, deliberately: the\n      // new address is unconfirmed, and 2FA against an unconfirmed address can\n      // lock the user out. The account-manager UI warns about this, see\n      // `show2FaWarningOnEmailUpdate` in context.ts.\n      await emailAuthFactor.deleteForDid(dbTxn, did)\n      await emailToken.deleteAllEmailTokens(dbTxn, did)\n    })\n\n    // Proactively send a confirmation email so that the user can confirm the\n    // new email immediately.\n    if (opts?.sendConfirmationEmail) {\n      const token = await this.createEmailToken(did, 'confirm_email')\n      const { locale } = opts\n      await this.mailer.sendConfirmEmail({ token, locale }, { to: email })\n    }\n  }\n\n  /**\n   * Enable email-based two-factor authentication. Enabling is immediate: the\n   * account must already have a confirmed email matching `email`, since the\n   * factor delivers one-time codes to that address. Returns\n   * `{ account, tokenRequired }` for symmetry with future factors that require\n   * a confirmation step; email-based 2FA never does, so `tokenRequired` is\n   * always `false`.\n   *\n   * @throws InvalidRequestError if the account has no confirmed, matching email\n   */\n  async enableEmailAuthFactor(opts: { did: DidString }): Promise<ActorAccount> {\n    const { did } = opts\n\n    const account = await this.getAccount(did, {\n      includeDeactivated: true,\n      includeTakenDown: true,\n    })\n\n    if (!account) {\n      throw new InvalidRequestError('account not found')\n    }\n\n    // Already enabled → nothing to change (idempotent).\n    if (account.emailAuthFactorAt) {\n      return account\n    }\n\n    // Email confirmed → attempt to enable email-based 2FA.\n    if (account.email && account.emailConfirmedAt) {\n      const emailAuthFactorAt = await emailAuthFactor.enable(\n        this.db,\n        did,\n        account.email,\n      )\n\n      // @NOTE The confirmed-email requirement is enforced in the insert's own\n      // SELECT, so a miss here means the address stopped being confirmed (or\n      // changed) between that read and this write. Nothing was persisted, so\n      // don't hand back an account claiming otherwise.\n      if (emailAuthFactorAt) {\n        account.emailAuthFactorAt = emailAuthFactorAt\n\n        return account\n      }\n    }\n\n    throw new InvalidRequestError(\n      'A confirmed email address is required to enable email-based two-factor authentication',\n    )\n  }\n\n  /**\n   * Disable email-based two-factor authentication. This supports a two-phase\n   * flow, if a token isn't initially supplied for proving control of the inbox\n   * which prevents a hijacked session from silently turning off the factor. The\n   * second call (with a valid `token`) actually disables it. Disabling an\n   * already-disabled factor is an idempotent no-op.\n   *\n   * @throws InvalidRequestError if the account has no matching email, or the\n   * token is invalid\n   * @throws InvalidRequestError with `TokenRequired` error code if a\n   * confirmation token is required but not provided\n   */\n  async disableEmailAuthFactor(opts: {\n    did: DidString\n    token?: string\n    locale?: string\n  }): Promise<ActorAccount> {\n    const { did, token, locale } = opts\n\n    const account = await this.getAccount(did, {\n      includeDeactivated: true,\n      includeTakenDown: true,\n    })\n\n    if (!account) {\n      throw new InvalidRequestError('account not found')\n    }\n\n    // Already disabled → idempotent no-op; nothing to confirm, no OTP sent.\n    if (!account.emailAuthFactorAt) {\n      return account\n    }\n\n    // Fool-proof: account in invalid state\n    if (!account.email) {\n      throw new Error('account has no email address')\n    }\n\n    // Phase one: no token yet, send a one-time code and signal \"pending\". MUST\n    // use `update_email` due to social-app using requestEmailUpdate, not\n    // two-step updateEmail:\n    if (!token) {\n      const otp = await this.createEmailToken(did, 'update_email')\n      await this.mailer.sendUpdateEmail(\n        { token: otp, locale: locale },\n        { to: account.email },\n      )\n\n      throw new InvalidRequestError(\n        'confirmation token required',\n        'TokenRequired',\n      )\n    }\n\n    // Phase two: verify the one-time code, then disable the factor.\n    await this.assertValidEmailTokenAndCleanup(did, 'update_email', token)\n\n    // The returned flag is deliberately ignored here, unlike in\n    // `enableEmailAuthFactor`. Disabling only conditions the write on `did` and\n    // `email` matching, so a miss means no row matched either, leaving nothing\n    // worth reporting. A deleted account has no factor left to disable, and a\n    // changed email drops the factor row in the same transaction (see\n    // `updateAccountEmail`). That second case stops arising once unconfirmed\n    // emails get a column of their own, since `account.email` will no longer\n    // move mid-flow; the conclusion holds either way.\n    //\n    // Enabling is the opposite: a miss there leaves the account in the very\n    // state the caller asked to change, hence the throw.\n    await emailAuthFactor.disable(this.db, did, account.email)\n\n    account.emailAuthFactorAt = null\n\n    return account\n  }\n\n  async resetPassword(opts: { password: string; token: string }) {\n    const did = await emailToken.assertValidTokenAndFindDid(\n      this.db,\n      'reset_password',\n      opts.token,\n    )\n    await this.updateAccountPassword({ did, password: opts.password })\n\n    return did\n  }\n\n  async updateAccountPassword(opts: { did: DidString; password: string }) {\n    const { did } = opts\n    const passwordScrypt = await scrypt.genSaltAndHash(opts.password)\n    await this.db.transaction(async (dbTxn) =>\n      Promise.all([\n        password.updateUserPassword(dbTxn, { did, passwordScrypt }),\n        emailToken.deleteEmailToken(dbTxn, did, 'reset_password'),\n        auth.revokeRefreshTokensByDid(dbTxn, did),\n      ]),\n    )\n  }\n}\n"]}
+{"version":3,"file":"account-manager.js","sourceRoot":"","sources":["../../src/account-manager/account-manager.ts"],"names":[],"mappings":"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","sourcesContent":["import assert from 'node:assert'\nimport type { KeyObject } from 'node:crypto'\nimport type { Client as PlcClient } from '@did-plc/lib'\nimport { isEmailValid } from '@hapi/address'\nimport { isDisposableEmail } from 'disposable-email-domains-js'\nimport { HOUR, obfuscateEmail, wait } from '@atproto/common'\nimport type { Keypair } from '@atproto/crypto'\nimport type { IdResolver } from '@atproto/identity'\nimport {\n  type AtIdentifierString,\n  type DidString,\n  type HandleString,\n  isAtIdentifierString,\n} from '@atproto/lex'\nimport type { Cid } from '@atproto/lex-data'\nimport {\n  INVALID_HANDLE,\n  currentDatetimeString,\n  isValidTld,\n} from '@atproto/syntax'\nimport { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'\nimport type { ActorStore } from '../actor-store/actor-store.js'\nimport { assertValidDidDocumentForService } from '../api/com/atproto/server/util.js'\nimport { AuthScope } from '../auth-scope.js'\nimport type { ServerConfig } from '../config/config.js'\nimport { softDeleted } from '../db/index.js'\nimport { hasExplicitSlur } from '../handle/explicit-slurs.js'\nimport {\n  baseNormalizeAndValidate,\n  ensureHandleServiceConstraints,\n  isServiceDomain,\n} from '../handle/index.js'\nimport type { com } from '../lexicons/index.js'\nimport { httpLogger } from '../logger.js'\nimport type { ServerMailer } from '../mailer/index.js'\nimport type { Sequencer } from '../sequencer/index.js'\nimport {\n  type AccountDb,\n  type EmailTokenPurpose,\n  getDb,\n  getMigrator,\n} from './db/index.js'\nimport * as accountHelpers from './helpers/account.js'\nimport { AccountStatus, type ActorAccount } from './helpers/account.js'\nimport * as auth from './helpers/auth.js'\nimport * as authorizedClientHelper from './helpers/authorized-client.js'\nimport * as emailAuthFactor from './helpers/email-auth-factor.js'\nimport * as emailToken from './helpers/email-token.js'\nimport * as invite from './helpers/invite.js'\nimport * as password from './helpers/password.js'\nimport * as repo from './helpers/repo.js'\nimport * as scrypt from './helpers/scrypt.js'\nimport * as token from './helpers/token.js'\n\nexport { AccountStatus, formatAccountStatus } from './helpers/account.js'\n\nexport type UpdateAccountEmailOptions = {\n  sendConfirmationEmail?: boolean\n  locale?: string\n}\n\n/**\n * Thrown by {@link AccountManager.login} when the identifier resolved to a\n * known account but the supplied credentials (account password / app\n * password) did not match. The matched `did` is attached so downstream\n * callers can distinguish \"identifier known, credentials wrong\" from\n * \"identifier unknown\" (which continues to throw a plain\n * {@link AuthRequiredError}).\n *\n * Callers should take care that remote clients *cannot* distinguish the above,\n * to prevent enumeration attacks. (Tested for in\n * packages/pds/tests/auth.test.ts)\n */\nexport class InvalidPasswordError extends AuthRequiredError {\n  constructor(\n    public readonly did: DidString,\n    errorMessage = 'Invalid identifier or password',\n  ) {\n    super(errorMessage)\n  }\n}\n\n/**\n * Thrown by {@link AccountManager.login} when the credentials were valid but\n * the account requires a second authentication factor. A one-time code has\n * already been dispatched by the time this is thrown.\n *\n * XRPC-native like every other error this class raises: `AuthFactorTokenRequired`\n * is the error name `com.atproto.server.createSession` declares, so that path\n * needs no translation. The OAuth boundary ({@link OAuthStore.authenticateAccount})\n * converts it to `SecondAuthenticationFactorRequiredError` — which is why\n * `factor` and `hint` are carried as fields rather than baked into the message.\n *\n * @NOTE Subclasses {@link AuthRequiredError}, so any `instanceof` check against\n * the base class must come *after* this one — see the ordering note in\n * `OAuthStore.authenticateAccount`.\n */\nexport class AuthFactorRequiredError extends AuthRequiredError {\n  constructor(\n    public readonly factor: 'emailOtp',\n    public readonly hint: string,\n    errorMessage = 'A sign in code has been sent to your email address',\n  ) {\n    super(errorMessage, 'AuthFactorTokenRequired')\n  }\n}\n\nexport type AccountManagerDbConfig = {\n  accountDbLoc: string\n  disableWalAutoCheckpoint: boolean\n}\n\nexport class AccountManager {\n  readonly db: AccountDb\n\n  constructor(\n    readonly cfg: ServerConfig,\n    readonly actorStore: ActorStore,\n    readonly idResolver: IdResolver,\n    readonly jwtKey: KeyObject,\n    readonly mailer: ServerMailer,\n    readonly sequencer: Sequencer,\n    readonly plcClient: PlcClient,\n    readonly plcRotationKey: Keypair,\n  ) {\n    this.db = getDb(cfg.db.accountDbLoc, cfg.db.disableWalAutoCheckpoint)\n  }\n\n  get serviceDid(): DidString {\n    return this.cfg.service.did\n  }\n\n  get serviceHandleDomains(): string[] {\n    return this.cfg.identity.serviceHandleDomains\n  }\n\n  async migrateOrThrow() {\n    await this.db.ensureWal()\n    await getMigrator(this.db).migrateToLatestOrThrow()\n  }\n\n  async close() {\n    await this.db.close()\n  }\n\n  // Account\n  // ----------\n\n  async getAccount(\n    handleOrDid: AtIdentifierString,\n    flags?: accountHelpers.AvailabilityFlags,\n  ): Promise<ActorAccount | null> {\n    return accountHelpers.getAccount(this.db, handleOrDid, flags)\n  }\n\n  async getAccounts(\n    dids: DidString[],\n    flags?: accountHelpers.AvailabilityFlags,\n  ): Promise<Map<string, ActorAccount>> {\n    return accountHelpers.getAccounts(this.db, dids, flags)\n  }\n\n  async getAccountByEmail(\n    email: string,\n    flags?: accountHelpers.AvailabilityFlags,\n  ): Promise<ActorAccount | null> {\n    return accountHelpers.getAccountByEmail(this.db, email, flags)\n  }\n\n  async isAccountActivated(did: DidString): Promise<boolean> {\n    const account = await this.getAccount(did, { includeDeactivated: true })\n    if (!account) return false\n    return !account.deactivatedAt\n  }\n\n  async getDidForActor(\n    handleOrDid: AtIdentifierString,\n    flags?: accountHelpers.AvailabilityFlags,\n  ): Promise<DidString | null> {\n    const got = await this.getAccount(handleOrDid, flags)\n    return got?.did ?? null\n  }\n\n  async getAccountStatus(handleOrDid: AtIdentifierString) {\n    const got = await this.getAccount(handleOrDid, {\n      includeDeactivated: true,\n      includeTakenDown: true,\n    })\n\n    const { active, status = active ? AccountStatus.Active : undefined } =\n      accountHelpers.formatAccountStatus(got)\n    assert(status != null)\n    return { status, account: got } as\n      | { status: AccountStatus.Deleted; account: null }\n      | { status: AccountStatus.Takendown; account: ActorAccount }\n      | { status: AccountStatus.Deactivated; account: ActorAccount }\n      | { status: AccountStatus.Active; account: ActorAccount }\n  }\n\n  async normalizeAndValidateHandle(\n    handle: string,\n    {\n      did,\n      allowAnyValid = false,\n    }: {\n      did?: string\n      allowAnyValid?: boolean\n    } = {},\n  ): Promise<HandleString> {\n    const normalized = baseNormalizeAndValidate(handle)\n\n    // tld validation\n    if (!isValidTld(normalized)) {\n      throw new InvalidRequestError(\n        'Handle TLD is invalid or disallowed',\n        'InvalidHandle',\n      )\n    }\n    // slur check\n    if (!allowAnyValid && hasExplicitSlur(normalized)) {\n      throw new InvalidRequestError(\n        'Inappropriate language in handle',\n        'InvalidHandle',\n      )\n    }\n    if (isServiceDomain(normalized, this.serviceHandleDomains)) {\n      // verify constraints on a service domain\n      ensureHandleServiceConstraints(\n        normalized,\n        this.serviceHandleDomains,\n        allowAnyValid,\n      )\n    } else {\n      // When creating an account (no did yet), we require the handle to be a\n      // local service domain. Updating to a custom handle will be possible once\n      // the account was created.\n      if (did == null) {\n        throw new InvalidRequestError(\n          'Not a supported handle domain',\n          'UnsupportedDomain',\n        )\n      }\n\n      // verify resolution of a non-service domain\n      const resolvedDid = await this.idResolver.handle.resolve(normalized)\n      if (resolvedDid !== did) {\n        // @TODO This should use a distinct error code\n        throw new InvalidRequestError('External handle did not resolve to DID')\n      }\n    }\n\n    return normalized\n  }\n\n  async createAccount({\n    did,\n    handle,\n    email,\n    password,\n    repoCid,\n    repoRev,\n    inviteCode,\n    deactivated,\n    refreshJwt,\n  }: {\n    did: DidString\n    handle: HandleString\n    email?: string\n    password?: string\n    repoCid: Cid\n    repoRev: string\n    inviteCode?: string\n    deactivated?: boolean\n    refreshJwt?: string\n  }) {\n    if (password && password.length > scrypt.NEW_PASSWORD_MAX_LENGTH) {\n      throw new InvalidRequestError('Password too long')\n    }\n\n    const passwordScrypt =\n      email && password ? await scrypt.genSaltAndHash(password) : undefined\n\n    const now = currentDatetimeString()\n    return this.db.transaction(async (dbTxn) => {\n      if (inviteCode) {\n        await invite.ensureInviteIsAvailable(dbTxn, inviteCode)\n      }\n\n      await accountHelpers.registerActor(dbTxn, { did, handle, deactivated })\n\n      if (email && passwordScrypt) {\n        await accountHelpers.registerAccount(dbTxn, {\n          did,\n          email,\n          passwordScrypt,\n        })\n      }\n\n      await invite.recordInviteUse(dbTxn, {\n        did,\n        inviteCode,\n        now,\n      })\n\n      if (refreshJwt) {\n        await auth.storeRefreshToken(\n          dbTxn,\n          auth.decodeRefreshToken(refreshJwt),\n          null,\n        )\n      }\n\n      await repo.updateRoot(dbTxn, did, repoCid, repoRev)\n    })\n  }\n\n  async createAccountAndSession(opts: {\n    did: DidString\n    handle: HandleString\n    email?: string\n    password?: string\n    repoCid: Cid\n    repoRev: string\n    inviteCode?: string\n    deactivated?: boolean\n  }) {\n    const { accessJwt, refreshJwt } = await auth.createTokens({\n      did: opts.did,\n      jwtKey: this.jwtKey,\n      serviceDid: this.serviceDid,\n      scope: AuthScope.Access,\n    })\n\n    await this.createAccount({ ...opts, refreshJwt })\n\n    return { accessJwt, refreshJwt }\n  }\n\n  /**\n   * Validates the requested handle, updates the PLC document if needed, persists\n   * the new handle locally, and emits an identity event.\n   *\n   * @throws {InvalidRequestError} when the handle is invalid, taken by another\n   * account, or cannot be resolved for non-service domains.\n   *\n   * @see {@link AccountManager.updateAccountHandle} for behavior when the PLC update fails.\n   */\n  async updateHandle(\n    did: DidString,\n    newHandle: string,\n    options?: { allowAnyValid?: boolean },\n  ): Promise<ActorAccount & { handle: HandleString }> {\n    const { account, handle } = await this.validateHandleUpdate(\n      did,\n      newHandle,\n      options,\n    )\n\n    if (did.startsWith('did:plc:')) {\n      // @TODO We should verify the status before issuing a PLC update.\n      await this.plcClient.updateHandle(did, this.plcRotationKey, handle)\n    } else {\n      const resolved = await this.idResolver.did.resolveAtprotoData(did, true)\n      if (resolved.handle !== handle) {\n        throw new InvalidRequestError(\n          'DID is not properly configured for handle',\n        )\n      }\n    }\n\n    // @NOTE If the next line fails (for any reason), we don't \"rollback\" the\n    // PLC update above. The caller can just call this method again.\n    await this.updateAccountHandle(did, handle)\n\n    return { ...account, handle }\n  }\n\n  async validateHandleUpdate(\n    did: DidString,\n    newHandle: string,\n    options?: { allowAnyValid?: boolean },\n  ): Promise<{\n    did: DidString\n    handle: HandleString\n    // Returned for convenience\n    account: ActorAccount\n  }> {\n    const account = await this.getAccount(did, { includeDeactivated: true })\n    if (!account) {\n      throw new InvalidRequestError('Account not found')\n    }\n\n    const handle = await this.normalizeAndValidateHandle(newHandle, {\n      allowAnyValid: options?.allowAnyValid,\n      did,\n    })\n\n    // Pessimistic check to handle spam: also enforced by updateAccountHandle() and the db.\n    const existing = await this.getAccount(handle, {\n      includeDeactivated: true,\n      includeTakenDown: true,\n    })\n\n    if (existing && existing.did !== did) {\n      throw new InvalidRequestError(\n        `Handle already taken: ${handle}`,\n        'HandleNotAvailable',\n      )\n    }\n\n    return { did, handle, account }\n  }\n\n  /**\n   * @note Failure to emit the identity event will silently be ignored. Users\n   * can emit the event again by updating their handle to the same value.\n   */\n  async updateAccountHandle(\n    did: DidString,\n    handle: HandleString,\n  ): Promise<void> {\n    await accountHelpers.updateHandle(this.db, did, handle)\n\n    try {\n      await this.sequencer.sequenceIdentity(did, handle)\n    } catch (err) {\n      httpLogger.error({ err, did, handle }, 'failed to sequence handle update')\n    }\n  }\n\n  async deleteAccount(did: DidString) {\n    return accountHelpers.deleteAccount(this.db, did)\n  }\n\n  async takedownAccount(\n    did: DidString,\n    takedown: com.atproto.admin.defs.StatusAttr,\n  ) {\n    await this.db.transaction(async (dbTxn) => {\n      await accountHelpers.updateAccountTakedownStatus(dbTxn, did, takedown)\n      await auth.revokeRefreshTokensByDid(dbTxn, did)\n      await token.removeByDid(dbTxn, did)\n    })\n\n    await this.sequenceAccountStatus(did)\n  }\n\n  async getAccountAdminStatus(did: DidString) {\n    return accountHelpers.getAccountAdminStatus(this.db, did)\n  }\n\n  async updateRepoRoot(did: DidString, cid: Cid, rev: string) {\n    return repo.updateRoot(this.db, did, cid, rev)\n  }\n\n  async deactivateAccount(\n    did: DidString,\n    options?: {\n      deleteCredentials?: boolean\n      deleteAfter?: string | null\n    },\n  ) {\n    const wasUpdated = await this.db.transaction(async (dbTxn) => {\n      if (options?.deleteCredentials) {\n        await token.removeByDid(dbTxn, did)\n        await authorizedClientHelper.deleteAllAuthorizedClients(dbTxn, did)\n        await password.deleteAllAppPasswords(dbTxn, did)\n      }\n\n      return accountHelpers.deactivateAccount(\n        dbTxn,\n        did,\n        options?.deleteAfter ?? null,\n      )\n    })\n\n    if (!wasUpdated) {\n      throw new InvalidRequestError('Account not found')\n    }\n\n    const accountStatus = await this.getAccountStatus(did)\n\n    // Account is likely soft-deleted (takendown)\n    if (accountStatus.status === AccountStatus.Deleted) {\n      throw new InvalidRequestError('Account not found')\n    }\n\n    await this.sequencer.sequenceAccount(did, accountStatus.status)\n\n    return accountStatus\n  }\n\n  async activateAccount(did: DidString) {\n    await assertValidDidDocumentForService(this, did)\n\n    const found = await accountHelpers.activateAccount(this.db, did, {\n      // We cannot activate a takendown account\n      includeTakenDown: false,\n      includeDeactivated: true,\n    })\n    if (!found) {\n      throw new InvalidRequestError('user not found', 'AccountNotFound')\n    }\n\n    const accountStatus = await this.getAccountStatus(did)\n\n    const { account, status } = accountStatus\n\n    if (status === AccountStatus.Deleted) {\n      // A concurrent operation deleted the account\n      throw new InvalidRequestError('user not found', 'AccountNotFound')\n    }\n\n    const syncData = await this.actorStore.read(did, (store) => {\n      return store.repo.getSyncEventData()\n    })\n\n    await this.sequencer.sequenceAccountActivation(\n      did,\n      account.handle ?? INVALID_HANDLE,\n      status,\n      syncData,\n    )\n\n    return accountStatus\n  }\n\n  async sequenceAccountStatus(did: DidString) {\n    const { status } = await this.getAccountStatus(did)\n    await this.sequencer.sequenceAccount(did, status)\n  }\n\n  // Auth\n  // ----------\n\n  async createSession(\n    did: DidString,\n    appPassword: password.AppPassDescript | null,\n    isSoftDeleted = false,\n  ) {\n    const { accessJwt, refreshJwt } = await auth.createTokens({\n      did,\n      jwtKey: this.jwtKey,\n      serviceDid: this.serviceDid,\n      scope: auth.formatScope(appPassword, isSoftDeleted),\n    })\n    // For soft deleted accounts don't store refresh token so that it can't be rotated.\n    if (!isSoftDeleted) {\n      const refreshPayload = auth.decodeRefreshToken(refreshJwt)\n      await auth.storeRefreshToken(this.db, refreshPayload, appPassword)\n    }\n    return { accessJwt, refreshJwt }\n  }\n\n  async rotateRefreshToken(id: string) {\n    const token = await auth.getRefreshToken(this.db, id)\n    if (!token) return null\n\n    const now = new Date()\n\n    // take the chance to tidy all of a user's expired tokens\n    // does not need to be transactional since this is just best-effort\n    await auth.deleteExpiredRefreshTokens(this.db, token.did, now.toISOString())\n\n    // Shorten the refresh token lifespan down from its\n    // original expiration time to its revocation grace period.\n    const prevExpiresAt = new Date(token.expiresAt)\n    const REFRESH_GRACE_MS = 2 * HOUR\n    const graceExpiresAt = new Date(now.getTime() + REFRESH_GRACE_MS)\n\n    const expiresAt =\n      graceExpiresAt < prevExpiresAt ? graceExpiresAt : prevExpiresAt\n\n    if (expiresAt <= now) {\n      return null\n    }\n\n    // Determine the next refresh token id: upon refresh token\n    // reuse you always receive a refresh token with the same id.\n    const nextId = token.nextId ?? auth.getRefreshTokenId()\n\n    const { accessJwt, refreshJwt } = await auth.createTokens({\n      did: token.did,\n      jwtKey: this.jwtKey,\n      serviceDid: this.serviceDid,\n      scope: auth.formatScope(token.appPassword),\n      jti: nextId,\n    })\n\n    const refreshPayload = auth.decodeRefreshToken(refreshJwt)\n    try {\n      await this.db.transaction((dbTxn) =>\n        Promise.all([\n          auth.addRefreshGracePeriod(dbTxn, {\n            id,\n            expiresAt: expiresAt.toISOString(),\n            nextId,\n          }),\n          auth.storeRefreshToken(dbTxn, refreshPayload, token.appPassword),\n        ]),\n      )\n    } catch (err) {\n      if (err instanceof auth.ConcurrentRefreshError) {\n        return this.rotateRefreshToken(id)\n      }\n      throw err\n    }\n    return { accessJwt, refreshJwt }\n  }\n\n  async revokeRefreshToken(id: string) {\n    return auth.revokeRefreshToken(this.db, id)\n  }\n\n  // Login\n  // ----------\n\n  async login({\n    identifier,\n    password,\n    authFactorToken,\n    locale,\n    allowOtpBypassFor = [],\n  }: {\n    identifier: string\n    password: string\n    authFactorToken?: string | undefined\n    // Only the OAuth sign-in path carries one; `com.atproto.server.createSession`\n    // declares no locale input, so the challenge email falls back to the\n    // default template there.\n    locale?: string | undefined\n    allowOtpBypassFor?: readonly DidString[]\n  }): Promise<{\n    // @TODO we should rename this \"account\" for consistency\n    user: ActorAccount\n    appPassword: password.AppPassDescript | null\n    isSoftDeleted: boolean\n  }> {\n    const start = Date.now()\n    try {\n      const identifierNormalized = identifier.toLowerCase()\n\n      const user = identifierNormalized.includes('@')\n        ? await this.getAccountByEmail(identifierNormalized, {\n            includeDeactivated: true,\n            includeTakenDown: true,\n          })\n        : isAtIdentifierString(identifierNormalized)\n          ? await this.getAccount(identifierNormalized, {\n              includeDeactivated: true,\n              includeTakenDown: true,\n            })\n          : null\n\n      if (!user) {\n        throw new AuthRequiredError('Invalid identifier or password')\n      }\n      const isSoftDeleted = softDeleted(user)\n\n      let appPassword: password.AppPassDescript | null = null\n      const validAccountPass = await this.verifyAccountPassword(\n        user.did,\n        password,\n      )\n      if (!validAccountPass) {\n        // takendown/suspended accounts cannot login with app password\n        if (isSoftDeleted) {\n          throw new InvalidPasswordError(user.did)\n        }\n        appPassword = await this.verifyAppPassword(user.did, password)\n        if (appPassword === null) {\n          throw new InvalidPasswordError(user.did)\n        }\n      }\n\n      if (authFactorToken) {\n        await this.assertValidEmailTokenAndCleanup(\n          user.did,\n          'auth_factor',\n          authFactorToken,\n        )\n        // require email factor when not using an app password\n      } else if (\n        user.email !== null &&\n        user.emailAuthFactorAt !== null &&\n        !allowOtpBypassFor.includes(user.did) &&\n        appPassword === null\n      ) {\n        const token = await this.createEmailToken(user.did, 'auth_factor')\n\n        await this.mailer.sendSignInAuthFactor(\n          { token, handle: user.handle, locale },\n          { to: user.email },\n        )\n\n        throw new AuthFactorRequiredError(\n          'emailOtp',\n          obfuscateEmail(user.email),\n        )\n      }\n\n      return { user, appPassword, isSoftDeleted }\n    } finally {\n      // Mitigate timing attacks\n      await wait(350 - (Date.now() - start))\n    }\n  }\n\n  // Passwords\n  // ----------\n\n  async createAppPassword(did: DidString, name: string, privileged: boolean) {\n    return password.createAppPassword(this.db, did, name, privileged)\n  }\n\n  async listAppPasswords(did: DidString) {\n    return password.listAppPasswords(this.db, did)\n  }\n\n  async verifyAccountPassword(\n    did: DidString,\n    passwordStr: string,\n  ): Promise<boolean> {\n    if (passwordStr.length > scrypt.OLD_PASSWORD_MAX_LENGTH) {\n      // @NOTE Avoid throwing from here to avoid leaking account email validity\n      // through error messages.\n      return false\n    }\n\n    return password.verifyAccountPassword(this.db, did, passwordStr)\n  }\n\n  async verifyAppPassword(\n    did: DidString,\n    passwordStr: string,\n  ): Promise<password.AppPassDescript | null> {\n    return password.verifyAppPassword(this.db, did, passwordStr)\n  }\n\n  async revokeAppPassword(did: DidString, name: string) {\n    await this.db.transaction(async (dbTxn) =>\n      Promise.all([\n        password.deleteAppPassword(dbTxn, did, name),\n        auth.revokeAppPasswordRefreshToken(dbTxn, did, name),\n      ]),\n    )\n  }\n\n  // Invites\n  // ----------\n\n  async ensureInviteIsAvailable(code: string) {\n    return invite.ensureInviteIsAvailable(this.db, code)\n  }\n\n  async createInviteCodes(\n    toCreate: { account: string; codes: string[] }[],\n    useCount: number,\n  ) {\n    return invite.createInviteCodes(this.db, toCreate, useCount)\n  }\n\n  async createAccountInviteCodes(\n    forAccount: string,\n    codes: string[],\n    expectedTotal: number,\n    disabled: 0 | 1,\n  ) {\n    return invite.createAccountInviteCodes(\n      this.db,\n      forAccount,\n      codes,\n      expectedTotal,\n      disabled,\n    )\n  }\n\n  async getAccountInvitesCodes(did: DidString) {\n    const inviteCodes = await invite.getAccountsInviteCodes(this.db, [did])\n    return inviteCodes.get(did) ?? []\n  }\n\n  async getAccountsInvitesCodes(dids: DidString[]) {\n    return invite.getAccountsInviteCodes(this.db, dids)\n  }\n\n  async getInvitedByForAccounts(dids: DidString[]) {\n    return invite.getInvitedByForAccounts(this.db, dids)\n  }\n\n  async getInviteCodesUses(codes: string[]) {\n    return invite.getInviteCodesUses(this.db, codes)\n  }\n\n  async setAccountInvitesDisabled(did: DidString, disabled: boolean) {\n    return invite.setAccountInvitesDisabled(this.db, did, disabled)\n  }\n\n  async disableInviteCodes(opts: { codes: string[]; accounts: string[] }) {\n    return invite.disableInviteCodes(this.db, opts)\n  }\n\n  // Email Tokens\n  // ----------\n\n  async createEmailToken(did: DidString, purpose: EmailTokenPurpose) {\n    return emailToken.createEmailToken(this.db, did, purpose)\n  }\n\n  async assertValidEmailToken(\n    did: DidString,\n    purpose: EmailTokenPurpose,\n    token: string,\n  ) {\n    return emailToken.assertValidToken(this.db, did, purpose, token)\n  }\n\n  async assertValidEmailTokenAndCleanup(\n    did: DidString,\n    purpose: EmailTokenPurpose,\n    token: string,\n  ) {\n    await emailToken.assertValidToken(this.db, did, purpose, token)\n    await emailToken.deleteEmailToken(this.db, did, purpose)\n  }\n\n  async requestEmailConfirmation(did: DidString, opts?: { locale?: string }) {\n    const account = await this.getAccount(did, {\n      includeDeactivated: true,\n      includeTakenDown: true,\n    })\n\n    if (!account) {\n      throw new InvalidRequestError('account not found')\n    }\n\n    if (!account.email) {\n      throw new InvalidRequestError('account does not have an email address')\n    }\n\n    const locale = opts?.locale\n    const token = await this.createEmailToken(did, 'confirm_email')\n\n    await this.mailer.sendConfirmEmail({ token, locale }, { to: account.email })\n  }\n\n  async confirmEmail(did: DidString, email: string, token: string) {\n    const user = await this.getAccount(did, {\n      includeDeactivated: true,\n      includeTakenDown: true,\n    })\n\n    if (!user) {\n      throw new InvalidRequestError('user not found', 'AccountNotFound')\n    }\n\n    if (user.email !== email.toLowerCase()) {\n      throw new InvalidRequestError('invalid email', 'InvalidEmail')\n    }\n\n    await emailToken.assertValidToken(this.db, did, 'confirm_email', token)\n    const now = currentDatetimeString()\n    await this.db.transaction(async (dbTxn) => {\n      await emailToken.deleteEmailToken(dbTxn, did, 'confirm_email')\n      await accountHelpers.setEmailConfirmedAt(dbTxn, did, now)\n    })\n\n    user.emailConfirmedAt = now\n\n    return user\n  }\n\n  async requestEmailUpdate(\n    did: DidString,\n    opts?: { locale?: string },\n  ): Promise<{ tokenRequired: boolean }> {\n    const account = await this.getAccount(did, {\n      includeDeactivated: true,\n      includeTakenDown: true,\n    })\n\n    if (!account) {\n      throw new InvalidRequestError('account not found')\n    }\n\n    if (!account.email) {\n      throw new InvalidRequestError('account does not have an email address')\n    }\n\n    const token = account.emailConfirmedAt\n      ? await this.createEmailToken(did, 'update_email')\n      : null\n\n    if (token) {\n      await this.mailer.sendUpdateEmail(\n        { token, locale: opts?.locale },\n        { to: account.email },\n      )\n    }\n\n    return { tokenRequired: !!token }\n  }\n\n  async checkUpdateEmail(\n    did: DidString,\n    email: string,\n    token?: string,\n  ): Promise<ActorAccount> {\n    if (!isEmailValid(email) || isDisposableEmail(email)) {\n      throw new InvalidRequestError(\n        'This email address is not supported, please use a different email.',\n      )\n    }\n\n    const account = await this.getAccount(did, {\n      includeDeactivated: true,\n      includeTakenDown: true,\n    })\n\n    if (!account) {\n      throw new InvalidRequestError(\n        `Could not find user info for account: ${did}`,\n      )\n    }\n\n    const tokenRequired = !!account.emailConfirmedAt\n\n    if (token) {\n      await this.assertValidEmailToken(did, 'update_email', token)\n    } else if (tokenRequired) {\n      // require a token if account email is confirmed\n      throw new InvalidRequestError(\n        'confirmation token required',\n        'TokenRequired',\n      )\n    }\n\n    return account\n  }\n\n  /**\n   * @throws UserAlreadyExistsError if the new email is already in use by another account\n   */\n  async updateEmail(\n    did: DidString,\n    email: string,\n    token?: string,\n    opts?: UpdateAccountEmailOptions,\n  ): Promise<ActorAccount> {\n    const account = await this.checkUpdateEmail(did, email, token)\n\n    await this.updateAccountEmail(did, email, opts)\n\n    account.email = email\n    account.emailConfirmedAt = null\n\n    return account\n  }\n\n  async updateAccountEmail(\n    did: DidString,\n    email: string,\n    opts?: UpdateAccountEmailOptions,\n  ) {\n    await this.db.transaction(async (dbTxn) => {\n      await accountHelpers.updateEmail(dbTxn, did, email)\n      // @NOTE In the same transaction as the email write, deliberately: the\n      // new address is unconfirmed, and 2FA against an unconfirmed address can\n      // lock the user out. The account-manager UI warns about this, see\n      // `show2FaWarningOnEmailUpdate` in context.ts.\n      await emailAuthFactor.deleteForDid(dbTxn, did)\n      await emailToken.deleteAllEmailTokens(dbTxn, did)\n    })\n\n    // Proactively send a confirmation email so that the user can confirm the\n    // new email immediately.\n    if (opts?.sendConfirmationEmail) {\n      const token = await this.createEmailToken(did, 'confirm_email')\n      const { locale } = opts\n      await this.mailer.sendConfirmEmail({ token, locale }, { to: email })\n    }\n  }\n\n  /**\n   * Enable email-based two-factor authentication. Enabling is immediate: the\n   * account must already have a confirmed email matching `email`, since the\n   * factor delivers one-time codes to that address. Returns\n   * `{ account, tokenRequired }` for symmetry with future factors that require\n   * a confirmation step; email-based 2FA never does, so `tokenRequired` is\n   * always `false`.\n   *\n   * @throws InvalidRequestError if the account has no confirmed, matching email\n   */\n  async enableEmailAuthFactor(opts: { did: DidString }): Promise<ActorAccount> {\n    const { did } = opts\n\n    const account = await this.getAccount(did, {\n      includeDeactivated: true,\n      includeTakenDown: true,\n    })\n\n    if (!account) {\n      throw new InvalidRequestError('account not found')\n    }\n\n    // Already enabled → nothing to change (idempotent).\n    if (account.emailAuthFactorAt) {\n      return account\n    }\n\n    // Email confirmed → attempt to enable email-based 2FA.\n    if (account.email && account.emailConfirmedAt) {\n      const emailAuthFactorAt = await emailAuthFactor.enable(\n        this.db,\n        did,\n        account.email,\n      )\n\n      // @NOTE The confirmed-email requirement is enforced in the insert's own\n      // SELECT, so a miss here means the address stopped being confirmed (or\n      // changed) between that read and this write. Nothing was persisted, so\n      // don't hand back an account claiming otherwise.\n      if (emailAuthFactorAt) {\n        account.emailAuthFactorAt = emailAuthFactorAt\n\n        return account\n      }\n    }\n\n    throw new InvalidRequestError(\n      'A confirmed email address is required to enable email-based two-factor authentication',\n    )\n  }\n\n  /**\n   * Disable email-based two-factor authentication. This supports a two-phase\n   * flow, if a token isn't initially supplied for proving control of the inbox\n   * which prevents a hijacked session from silently turning off the factor. The\n   * second call (with a valid `token`) actually disables it. Disabling an\n   * already-disabled factor is an idempotent no-op.\n   *\n   * @throws InvalidRequestError if the account has no matching email, or the\n   * token is invalid\n   * @throws InvalidRequestError with `TokenRequired` error code if a\n   * confirmation token is required but not provided\n   */\n  async disableEmailAuthFactor(opts: {\n    did: DidString\n    token?: string\n    locale?: string\n  }): Promise<ActorAccount> {\n    const { did, token, locale } = opts\n\n    const account = await this.getAccount(did, {\n      includeDeactivated: true,\n      includeTakenDown: true,\n    })\n\n    if (!account) {\n      throw new InvalidRequestError('account not found')\n    }\n\n    // Already disabled → idempotent no-op; nothing to confirm, no OTP sent.\n    if (!account.emailAuthFactorAt) {\n      return account\n    }\n\n    // Fool-proof: account in invalid state\n    if (!account.email) {\n      throw new Error('account has no email address')\n    }\n\n    // Phase one: no token yet, send a one-time code and signal \"pending\". MUST\n    // use `update_email` due to social-app using requestEmailUpdate, not\n    // two-step updateEmail:\n    if (!token) {\n      const otp = await this.createEmailToken(did, 'update_email')\n      await this.mailer.sendUpdateEmail(\n        { token: otp, locale: locale },\n        { to: account.email },\n      )\n\n      throw new InvalidRequestError(\n        'confirmation token required',\n        'TokenRequired',\n      )\n    }\n\n    // Phase two: verify the one-time code, then disable the factor.\n    await this.assertValidEmailTokenAndCleanup(did, 'update_email', token)\n\n    // The returned flag is deliberately ignored here, unlike in\n    // `enableEmailAuthFactor`. Disabling only conditions the write on `did` and\n    // `email` matching, so a miss means no row matched either, leaving nothing\n    // worth reporting. A deleted account has no factor left to disable, and a\n    // changed email drops the factor row in the same transaction (see\n    // `updateAccountEmail`). That second case stops arising once unconfirmed\n    // emails get a column of their own, since `account.email` will no longer\n    // move mid-flow; the conclusion holds either way.\n    //\n    // Enabling is the opposite: a miss there leaves the account in the very\n    // state the caller asked to change, hence the throw.\n    await emailAuthFactor.disable(this.db, did, account.email)\n\n    account.emailAuthFactorAt = null\n\n    return account\n  }\n\n  async resetPassword(opts: { password: string; token: string }) {\n    const did = await emailToken.assertValidTokenAndFindDid(\n      this.db,\n      'reset_password',\n      opts.token,\n    )\n    await this.updateAccountPassword({ did, password: opts.password })\n\n    return did\n  }\n\n  async updateAccountPassword(opts: { did: DidString; password: string }) {\n    const { did } = opts\n    const passwordScrypt = await scrypt.genSaltAndHash(opts.password)\n    await this.db.transaction(async (dbTxn) => {\n      await password.updateUserPassword(dbTxn, { did, passwordScrypt })\n      await emailToken.deleteEmailToken(dbTxn, did, 'reset_password')\n      await auth.revokeRefreshTokensByDid(dbTxn, did)\n      // @NOTE Should we also clear oauth sessions here ?\n    })\n  }\n}\n"]}

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

@@ -3,6 +3,6 @@ import type { AccountDb, EmailTokenPurpose } from '../db/index.js';
 export declare const createEmailToken: (db: AccountDb, did: DidString, purpose: EmailTokenPurpose) => Promise<string>;
 export declare const deleteEmailToken: (db: AccountDb, did: DidString, purpose: EmailTokenPurpose) => Promise<void>;
 export declare const deleteAllEmailTokens: (db: AccountDb, did: DidString) => Promise<void>;
-export declare const assertValidToken: (db: AccountDb, did: DidString, purpose: EmailTokenPurpose, token: string, expirationLen?: number) => Promise<void>;
-export declare const assertValidTokenAndFindDid: (db: AccountDb, purpose: EmailTokenPurpose, token: string, expirationLen?: number) => Promise<DidString>;
+export declare const assertValidToken: (db: AccountDb, did: DidString, purpose: EmailTokenPurpose, token: string) => Promise<void>;
+export declare const assertValidTokenAndFindDid: (db: AccountDb, purpose: EmailTokenPurpose, token: string) => Promise<DidString>;
 //# sourceMappingURL=email-token.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"email-token.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/email-token.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAyB,MAAM,cAAc,CAAA;AAGpE,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAElE,eAAO,MAAM,gBAAgB,OACvB,SAAS,OACR,SAAS,WACL,iBAAiB,KACzB,OAAO,CAAC,MAAM,CAYhB,CAAA;AAED,eAAO,MAAM,gBAAgB,OACvB,SAAS,OACR,SAAS,WACL,iBAAiB,kBAQ3B,CAAA;AAED,eAAO,MAAM,oBAAoB,OAAc,SAAS,OAAO,SAAS,kBAIvE,CAAA;AAED,eAAO,MAAM,gBAAgB,OACvB,SAAS,OACR,SAAS,WACL,iBAAiB,SACnB,MAAM,0CAiBd,CAAA;AAED,eAAO,MAAM,0BAA0B,OACjC,SAAS,WACJ,iBAAiB,SACnB,MAAM,6BAEZ,OAAO,CAAC,SAAS,CAenB,CAAA"}
+{"version":3,"file":"email-token.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/email-token.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAyB,MAAM,cAAc,CAAA;AAGpE,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAElE,eAAO,MAAM,gBAAgB,OACvB,SAAS,OACR,SAAS,WACL,iBAAiB,KACzB,OAAO,CAAC,MAAM,CAYhB,CAAA;AAED,eAAO,MAAM,gBAAgB,OACvB,SAAS,OACR,SAAS,WACL,iBAAiB,kBAQ3B,CAAA;AAED,eAAO,MAAM,oBAAoB,OAAc,SAAS,OAAO,SAAS,kBAIvE,CAAA;AAED,eAAO,MAAM,gBAAgB,OACvB,SAAS,OACR,SAAS,WACL,iBAAiB,SACnB,MAAM,kBAgBd,CAAA;AAED,eAAO,MAAM,0BAA0B,OACjC,SAAS,WACJ,iBAAiB,SACnB,MAAM,KACZ,OAAO,CAAC,SAAS,CAenB,CAAA"}

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

@@ -20,7 +20,7 @@ export const deleteEmailToken = async (db, did, purpose) => {
 export const deleteAllEmailTokens = async (db, did) => {
     await db.executeWithRetry(db.db.deleteFrom('email_token').where('did', '=', did));
 };
-export const assertValidToken = async (db, did, purpose, token, expirationLen = 15 * MINUTE) => {
+export const assertValidToken = async (db, did, purpose, token) => {
     const res = await db.db
         .selectFrom('email_token')
         .selectAll()
@@ -31,12 +31,12 @@ export const assertValidToken = async (db, did, purpose, token, expirationLen =
     if (!res) {
         throw new InvalidRequestError('Token is invalid', 'InvalidToken');
     }
-    const expired = !lessThanAgoMs(new Date(res.requestedAt), expirationLen);
+    const expired = !lessThanAgoMs(new Date(res.requestedAt), 15 * MINUTE);
     if (expired) {
         throw new InvalidRequestError('Token is expired', 'ExpiredToken');
     }
 };
-export const assertValidTokenAndFindDid = async (db, purpose, token, expirationLen = 15 * MINUTE) => {
+export const assertValidTokenAndFindDid = async (db, purpose, token) => {
     const res = await db.db
         .selectFrom('email_token')
         .select(['did', 'requestedAt'])
@@ -46,7 +46,7 @@ export const assertValidTokenAndFindDid = async (db, purpose, token, expirationL
     if (!res) {
         throw new InvalidRequestError('Token is invalid', 'InvalidToken');
     }
-    const expired = !lessThanAgoMs(new Date(res.requestedAt), expirationLen);
+    const expired = !lessThanAgoMs(new Date(res.requestedAt), 15 * MINUTE);
     if (expired) {
         throw new InvalidRequestError('Token is expired', 'ExpiredToken');
     }

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

@@ -1 +1 @@
-{"version":3,"file":"email-token.js","sourceRoot":"","sources":["../../../src/account-manager/helpers/email-token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACvD,OAAO,EAAkB,qBAAqB,EAAE,MAAM,cAAc,CAAA;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAA;AAGrE,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,EAAa,EACb,GAAc,EACd,OAA0B,EACT,EAAE;IACnB,MAAM,KAAK,GAAG,cAAc,EAAE,CAAC,WAAW,EAAE,CAAA;IAC5C,MAAM,GAAG,GAAG,qBAAqB,EAAE,CAAA;IACnC,MAAM,EAAE,CAAC,gBAAgB,CACvB,EAAE,CAAC,EAAE;SACF,UAAU,CAAC,aAAa,CAAC;SACzB,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC;SACjD,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CACjB,EAAE,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CACxE,CACJ,CAAA;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,EAAa,EACb,GAAc,EACd,OAA0B,EAC1B,EAAE;IACF,MAAM,EAAE,CAAC,gBAAgB,CACvB,EAAE,CAAC,EAAE;SACF,UAAU,CAAC,aAAa,CAAC;SACzB,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC;SACtB,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,CAClC,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EAAE,EAAa,EAAE,GAAc,EAAE,EAAE;IAC1E,MAAM,EAAE,CAAC,gBAAgB,CACvB,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CACvD,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,EAAa,EACb,GAAc,EACd,OAA0B,EAC1B,KAAa,EACb,aAAa,GAAG,EAAE,GAAG,MAAM,EAC3B,EAAE;IACF,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,EAAE;SACpB,UAAU,CAAC,aAAa,CAAC;SACzB,SAAS,EAAE;SACX,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC;SAC9B,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC;SACtB,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC;SACxC,gBAAgB,EAAE,CAAA;IACrB,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,mBAAmB,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAA;IACnE,CAAC;IACD,MAAM,OAAO,GAAG,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,aAAa,CAAC,CAAA;IACxE,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,IAAI,mBAAmB,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAA;IACnE,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,EAC7C,EAAa,EACb,OAA0B,EAC1B,KAAa,EACb,aAAa,GAAG,EAAE,GAAG,MAAM,EACP,EAAE;IACtB,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,EAAE;SACpB,UAAU,CAAC,aAAa,CAAC;SACzB,MAAM,CAAC,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;SAC9B,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC;SAC9B,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC;SACxC,gBAAgB,EAAE,CAAA;IACrB,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,mBAAmB,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAA;IACnE,CAAC;IACD,MAAM,OAAO,GAAG,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,aAAa,CAAC,CAAA;IACxE,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,IAAI,mBAAmB,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAA;IACnE,CAAC;IACD,OAAO,GAAG,CAAC,GAAG,CAAA;AAChB,CAAC,CAAA","sourcesContent":["import { MINUTE, lessThanAgoMs } from '@atproto/common'\nimport { type DidString, currentDatetimeString } from '@atproto/lex'\nimport { InvalidRequestError } from '@atproto/xrpc-server'\nimport { getRandomToken } from '../../api/com/atproto/server/util.js'\nimport type { AccountDb, EmailTokenPurpose } from '../db/index.js'\n\nexport const createEmailToken = async (\n  db: AccountDb,\n  did: DidString,\n  purpose: EmailTokenPurpose,\n): Promise<string> => {\n  const token = getRandomToken().toUpperCase()\n  const now = currentDatetimeString()\n  await db.executeWithRetry(\n    db.db\n      .insertInto('email_token')\n      .values({ purpose, did, token, requestedAt: now })\n      .onConflict((oc) =>\n        oc.columns(['purpose', 'did']).doUpdateSet({ token, requestedAt: now }),\n      ),\n  )\n  return token\n}\n\nexport const deleteEmailToken = async (\n  db: AccountDb,\n  did: DidString,\n  purpose: EmailTokenPurpose,\n) => {\n  await db.executeWithRetry(\n    db.db\n      .deleteFrom('email_token')\n      .where('did', '=', did)\n      .where('purpose', '=', purpose),\n  )\n}\n\nexport const deleteAllEmailTokens = async (db: AccountDb, did: DidString) => {\n  await db.executeWithRetry(\n    db.db.deleteFrom('email_token').where('did', '=', did),\n  )\n}\n\nexport const assertValidToken = async (\n  db: AccountDb,\n  did: DidString,\n  purpose: EmailTokenPurpose,\n  token: string,\n  expirationLen = 15 * MINUTE,\n) => {\n  const res = await db.db\n    .selectFrom('email_token')\n    .selectAll()\n    .where('purpose', '=', purpose)\n    .where('did', '=', did)\n    .where('token', '=', token.toUpperCase())\n    .executeTakeFirst()\n  if (!res) {\n    throw new InvalidRequestError('Token is invalid', 'InvalidToken')\n  }\n  const expired = !lessThanAgoMs(new Date(res.requestedAt), expirationLen)\n  if (expired) {\n    throw new InvalidRequestError('Token is expired', 'ExpiredToken')\n  }\n}\n\nexport const assertValidTokenAndFindDid = async (\n  db: AccountDb,\n  purpose: EmailTokenPurpose,\n  token: string,\n  expirationLen = 15 * MINUTE,\n): Promise<DidString> => {\n  const res = await db.db\n    .selectFrom('email_token')\n    .select(['did', 'requestedAt'])\n    .where('purpose', '=', purpose)\n    .where('token', '=', token.toUpperCase())\n    .executeTakeFirst()\n  if (!res) {\n    throw new InvalidRequestError('Token is invalid', 'InvalidToken')\n  }\n  const expired = !lessThanAgoMs(new Date(res.requestedAt), expirationLen)\n  if (expired) {\n    throw new InvalidRequestError('Token is expired', 'ExpiredToken')\n  }\n  return res.did\n}\n"]}
+{"version":3,"file":"email-token.js","sourceRoot":"","sources":["../../../src/account-manager/helpers/email-token.ts"],"names":[],"mappings":"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","sourcesContent":["import { MINUTE, lessThanAgoMs } from '@atproto/common'\nimport { type DidString, currentDatetimeString } from '@atproto/lex'\nimport { InvalidRequestError } from '@atproto/xrpc-server'\nimport { getRandomToken } from '../../api/com/atproto/server/util.js'\nimport type { AccountDb, EmailTokenPurpose } from '../db/index.js'\n\nexport const createEmailToken = async (\n  db: AccountDb,\n  did: DidString,\n  purpose: EmailTokenPurpose,\n): Promise<string> => {\n  const token = getRandomToken().toUpperCase()\n  const now = currentDatetimeString()\n  await db.executeWithRetry(\n    db.db\n      .insertInto('email_token')\n      .values({ purpose, did, token, requestedAt: now })\n      .onConflict((oc) =>\n        oc.columns(['purpose', 'did']).doUpdateSet({ token, requestedAt: now }),\n      ),\n  )\n  return token\n}\n\nexport const deleteEmailToken = async (\n  db: AccountDb,\n  did: DidString,\n  purpose: EmailTokenPurpose,\n) => {\n  await db.executeWithRetry(\n    db.db\n      .deleteFrom('email_token')\n      .where('did', '=', did)\n      .where('purpose', '=', purpose),\n  )\n}\n\nexport const deleteAllEmailTokens = async (db: AccountDb, did: DidString) => {\n  await db.executeWithRetry(\n    db.db.deleteFrom('email_token').where('did', '=', did),\n  )\n}\n\nexport const assertValidToken = async (\n  db: AccountDb,\n  did: DidString,\n  purpose: EmailTokenPurpose,\n  token: string,\n) => {\n  const res = await db.db\n    .selectFrom('email_token')\n    .selectAll()\n    .where('purpose', '=', purpose)\n    .where('did', '=', did)\n    .where('token', '=', token.toUpperCase())\n    .executeTakeFirst()\n  if (!res) {\n    throw new InvalidRequestError('Token is invalid', 'InvalidToken')\n  }\n  const expired = !lessThanAgoMs(new Date(res.requestedAt), 15 * MINUTE)\n  if (expired) {\n    throw new InvalidRequestError('Token is expired', 'ExpiredToken')\n  }\n}\n\nexport const assertValidTokenAndFindDid = async (\n  db: AccountDb,\n  purpose: EmailTokenPurpose,\n  token: string,\n): Promise<DidString> => {\n  const res = await db.db\n    .selectFrom('email_token')\n    .select(['did', 'requestedAt'])\n    .where('purpose', '=', purpose)\n    .where('token', '=', token.toUpperCase())\n    .executeTakeFirst()\n  if (!res) {\n    throw new InvalidRequestError('Token is invalid', 'InvalidToken')\n  }\n  const expired = !lessThanAgoMs(new Date(res.requestedAt), 15 * MINUTE)\n  if (expired) {\n    throw new InvalidRequestError('Token is expired', 'ExpiredToken')\n  }\n  return res.did\n}\n"]}

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

@@ -1,7 +1,7 @@
 import { type Client } from '@did-plc/lib';
 import { type Keypair } from '@atproto/crypto';
 import { type HandleString } from '@atproto/lex';
-import type { Account, AccountStore, AuthenticateAccountData, AuthorizedClientData, AuthorizedClients, ClientId, Code, DeactivateAccountData, DeleteAccountConfirmInput, DeleteAccountRequestInput, DeviceAccount, DeviceData, DeviceId, DeviceStore, Did, DisableEmailAuthFactorInput, EnableEmailAuthFactorInput, FoundRequestResult, LexiconData, LexiconStore, NewTokenData, ReactivateAccountData, RefreshToken, RequestData, RequestId, RequestStore, ResetPasswordConfirmInput, ResetPasswordRequestInput, SignUpData, TokenData, TokenId, TokenInfo, TokenStore, UpdateEmailConfirmInput, UpdateEmailRequestInput, UpdateEmailRequestOutput, UpdateHandleData, UpdateRequestData, VerifyEmailConfirmInput, VerifyEmailRequestInput } from '@atproto/oauth-provider/store';
+import type { Account, AccountStore, AtIdentifierString, AuthenticateAccountData, AuthorizedClientData, AuthorizedClients, ClientId, Code, DeactivateAccountData, DeleteAccountConfirmInput, DeleteAccountRequestInput, DeviceAccount, DeviceData, DeviceId, DeviceStore, Did, DisableEmailAuthFactorInput, EnableEmailAuthFactorInput, FoundRequestResult, LexiconData, LexiconStore, NewTokenData, ReactivateAccountData, RefreshToken, RequestData, RequestId, RequestStore, ResetPasswordConfirmInput, ResetPasswordRequestInput, SignUpData, TokenData, TokenId, TokenInfo, TokenStore, UpdateEmailConfirmInput, UpdateEmailRequestInput, UpdateEmailRequestOutput, UpdateHandleData, UpdateRequestData, VerifyEmailConfirmInput, VerifyEmailRequestInput } from '@atproto/oauth-provider/store';
 import type { ActorStore } from '../actor-store/actor-store.js';
 import type { BackgroundQueue } from '../background.js';
 import type { ImageUrlBuilder } from '../image/image-url-builder.js';
@@ -31,9 +31,9 @@ export declare class OAuthStore implements AccountStore, RequestStore, DeviceSto
     private verifyEmailAvailability;
     private verifyInviteCode;
     createAccount({ locale: _locale, inviteCode, handle, email, password, }: SignUpData): Promise<Account>;
-    authenticateAccount({ locale, username: identifier, password, emailOtp, deviceAccounts, }: AuthenticateAccountData): Promise<Account>;
+    authenticateAccount({ locale, identifier, password, emailOtp, deviceAccounts, }: AuthenticateAccountData): Promise<Account>;
     setAuthorizedClient(did: Did, clientId: ClientId, data: AuthorizedClientData): Promise<void>;
-    getAccount(did: Did): Promise<{
+    getAccount(handleOrDid: AtIdentifierString): Promise<null | {
         account: Account;
         authorizedClients: AuthorizedClients;
     }>;
@@ -45,7 +45,7 @@ export declare class OAuthStore implements AccountStore, RequestStore, DeviceSto
     } | {
         deviceId: DeviceId;
     }): Promise<DeviceAccount[]>;
-    resetPasswordRequest({ email, locale, }: ResetPasswordRequestInput): Promise<Account | null>;
+    resetPasswordRequest({ identifier, locale, }: ResetPasswordRequestInput): Promise<Account | null>;
     resetPasswordConfirm(data: ResetPasswordConfirmInput): Promise<Account | null>;
     verifyHandleAvailability(handle: HandleString): Promise<void>;
     createRequest(id: RequestId, data: RequestData): Promise<void>;

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,KAAK,MAAM,EAA2B,MAAM,cAAc,CAAA;AAGnE,OAAO,EAAE,KAAK,OAAO,EAAoB,MAAM,iBAAiB,CAAA;AAChE,OAAO,EAEL,KAAK,YAAY,EAElB,MAAM,cAAc,CAAA;AAOrB,OAAO,KAAK,EACV,OAAO,EACP,YAAY,EACZ,uBAAuB,EACvB,oBAAoB,EACpB,iBAAiB,EACjB,QAAQ,EACR,IAAI,EACJ,qBAAqB,EACrB,yBAAyB,EACzB,yBAAyB,EACzB,aAAa,EACb,UAAU,EACV,QAAQ,EACR,WAAW,EACX,GAAG,EACH,2BAA2B,EAC3B,0BAA0B,EAC1B,kBAAkB,EAElB,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,qBAAqB,EACrB,YAAY,EACZ,WAAW,EACX,SAAS,EACT,YAAY,EACZ,yBAAyB,EACzB,yBAAyB,EACzB,UAAU,EACV,SAAS,EACT,OAAO,EACP,SAAS,EACT,UAAU,EACV,uBAAuB,EACvB,uBAAuB,EACvB,wBAAwB,EACxB,gBAAgB,EAChB,iBAAiB,EACjB,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,+BAA+B,CAAA;AAKtC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAEvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAEpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EACL,KAAK,cAAc,EAGpB,MAAM,sBAAsB,CAAA;AAW7B;;;;;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;IAVjC,YACmB,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,EAC5C;IAEJ,OAAO,KAAK,EAAE,GAIb;IAED,OAAO,KAAK,UAAU,GAErB;YAEa,uBAAuB;YAavB,gBAAgB;IAexB,aAAa,CAAC,EAClB,MAAM,EAAE,OAAO,EACf,UAAU,EACV,MAAM,EACN,KAAK,EACL,QAAQ,GACT,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAmG/B;IAEK,mBAAmB,CAAC,EACxB,MAAM,EACN,QAAQ,EAAE,UAAU,EACpB,QAAQ,EACR,QAAQ,EACR,cAAc,GACf,EAAE,uBAAuB,GAAG,OAAO,CAAC,OAAO,CAAC,CAyD5C;IAEK,mBAAmB,CACvB,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,oBAAoB,GACzB,OAAO,CAAC,IAAI,CAAC,CAEf;IAEK,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC;QAClC,OAAO,EAAE,OAAO,CAAA;QAChB,iBAAiB,EAAE,iBAAiB,CAAA;KACrC,CAAC,CAeD;IAEK,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAIxE;IAEK,gBAAgB,CACpB,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,GAAG,GACP,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAkB/B;IAEK,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAIrE;IAEK,kBAAkB,CACtB,MAAM,EAAE;QAAE,GAAG,EAAE,GAAG,CAAA;KAAE,GAAG;QAAE,QAAQ,EAAE,QAAQ,CAAA;KAAE,GAC5C,OAAO,CAAC,aAAa,EAAE,CAAC,CA6B1B;IAEK,oBAAoB,CAAC,EACzB,KAAK,EACL,MAAM,GACP,EAAE,yBAAyB,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAoBrD;IAEK,oBAAoB,CACxB,IAAI,EAAE,yBAAyB,GAC9B,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAgBzB;IAEK,wBAAwB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBlE;IAIK,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAInE;IAEK,WAAW,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAe5D;IAEK,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAIzE;IAEK,aAAa,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAEhD;IAEK,kBAAkB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAKvE;IAIK,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAItE;IAEK,UAAU,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,GAAG,UAAU,CAAC,CAG/D;IAEK,YAAY,CAChB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,GACxB,OAAO,CAAC,IAAI,CAAC,CAIf;IAEK,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAGpD;IAIK,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAE3D;IAEK,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAEjE;IAEK,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C;IAIK,WAAW,CACf,EAAE,EAAE,OAAO,EACX,IAAI,EAAE,SAAS,EACf,YAAY,CAAC,EAAE,YAAY,GAC1B,OAAO,CAAC,IAAI,CAAC,CAcf;IAEK,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAGtD;IAEK,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAK3D;IAEK,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAGjD;IAEK,WAAW,CACf,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,OAAO,EACnB,eAAe,EAAE,YAAY,EAC7B,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,IAAI,CAAC,CA2Bf;IAEK,uBAAuB,CAC3B,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAW3B;IAEK,eAAe,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAG3D;IAEK,kBAAkB,CAAC,EACvB,GAAG,EACH,MAAM,GACP,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAUzC;IAEK,kBAAkB,CAAC,EACvB,GAAG,EACH,KAAK,EACL,KAAK,GACN,EAAE,uBAAuB,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAYnD;IAEK,kBAAkB,CAAC,EACvB,GAAG,EACH,MAAM,GACP,EAAE,uBAAuB,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAE7D;IAEK,kBAAkB,CAAC,EACvB,GAAG,EACH,KAAK,EACL,KAAK,EACL,MAAM,GACP,EAAE,uBAAuB,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAenD;IAEK,qBAAqB,CAAC,EAC1B,GAAG,GACJ,EAAE,0BAA0B,GAAG,OAAO,CAAC,OAAO,CAAC,CAY/C;IAEK,sBAAsB,CAAC,EAC3B,GAAG,EACH,KAAK,EACL,MAAM,GACP,EAAE,2BAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,CAqBhD;IAEK,YAAY,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAQtE;IAEK,iBAAiB,CAAC,EACtB,GAAG,EACH,WAAW,GACZ,EAAE,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,CAO1C;IAEK,iBAAiB,CAAC,EAAE,GAAG,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,CAYxE;IAEK,oBAAoB,CAAC,EACzB,GAAG,EACH,MAAM,GACP,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC,CAuB3C;IAEK,oBAAoB,CAAC,EACzB,GAAG,EACH,KAAK,EACL,QAAQ,GACT,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoC3C;YAEa,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

@@ -4,6 +4,7 @@ import { DAY } from '@atproto/common';
 import { Secp256k1Keypair } from '@atproto/crypto';
 import { getBlobCidString, } from '@atproto/lex';
 import { HandleUnavailableError, InvalidCredentialsError, InvalidRequestError, SecondAuthenticationFactorRequiredError, } from '@atproto/oauth-provider/errors';
+import { isAtIdentifierString } from '@atproto/oauth-provider/store';
 import { AuthRequiredError as XrpcAuthRequiredError, InvalidRequestError as XrpcInvalidRequestError, } from '@atproto/xrpc-server';
 import { fromDateISO } from '../db/index.js';
 import { dbLogger } from '../logger.js';
@@ -152,7 +153,7 @@ export class OAuthStore {
             throw err;
         }
     }
-    async authenticateAccount({ locale, username: identifier, password, emailOtp, deviceAccounts, }) {
+    async authenticateAccount({ locale, identifier, password, emailOtp, deviceAccounts, }) {
         // @TODO (?) Send an email to the user to notify them of the login attempt
         try {
             const { user, appPassword, isSoftDeleted } = await this.accountManager.login({
@@ -204,14 +205,15 @@ export class OAuthStore {
     async setAuthorizedClient(did, clientId, data) {
         await authorizedClientHelper.upsert(this.db, did, clientId, data);
     }
-    async getAccount(did) {
-        const accountRow = await this.accountManager.getAccount(did, {
+    async getAccount(handleOrDid) {
+        const accountRow = await this.accountManager.getAccount(handleOrDid, {
             includeDeactivated: true,
             includeTakenDown: false,
         });
-        assert(accountRow, 'Account not found');
+        if (!accountRow)
+            return null;
         const account = await this.buildAccount(accountRow);
-        const authorizedClients = await authorizedClientHelper.getAuthorizedClients(this.db, did);
+        const authorizedClients = await authorizedClientHelper.getAuthorizedClients(this.db, account.did);
         return { account, authorizedClients };
     }
     async upsertDeviceAccount(deviceId, sub) {
@@ -253,11 +255,19 @@ export class OAuthStore {
             updatedAt: fromDateISO(row.adUpdatedAt),
         }));
     }
-    async resetPasswordRequest({ email, locale, }) {
-        const account = await this.accountManager.getAccountByEmail(email, {
-            includeDeactivated: true,
-            includeTakenDown: false,
-        });
+    async resetPasswordRequest({ identifier, locale, }) {
+        const isEmailIdentifier = identifier.includes('@');
+        const account = isEmailIdentifier
+            ? await this.accountManager.getAccountByEmail(identifier, {
+                includeDeactivated: true,
+                includeTakenDown: false,
+            })
+            : isAtIdentifierString(identifier)
+                ? await this.accountManager.getAccount(identifier, {
+                    includeDeactivated: true,
+                    includeTakenDown: false,
+                })
+                : null;
         if (!account?.email || !account?.handle)
             return null;
         const { handle } = account;