@atproto/pds 0.4.104 → 0.4.106

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @atproto/pds
 
+## 0.4.106
+
+### Patch Changes
+
+- [#3587](https://github.com/bluesky-social/atproto/pull/3587) [`18fbfa000`](https://github.com/bluesky-social/atproto/commit/18fbfa00057dda9ef4eba77d8b4e87994893c952) Thanks [@foysalit](https://github.com/foysalit)! - Add searchable handle and displayName to ozone team members
+
+- [#3612](https://github.com/bluesky-social/atproto/pull/3612) [`eab9c003f`](https://github.com/bluesky-social/atproto/commit/eab9c003f838d43f0135ded9d3ede3f449997597) Thanks [@devinivy](https://github.com/devinivy)! - Emit sync event on account creation
+
+- Updated dependencies [[`c01d7f5d1`](https://github.com/bluesky-social/atproto/commit/c01d7f5d155445d7741c09f91c84af64b31bdbed), [`8827ff433`](https://github.com/bluesky-social/atproto/commit/8827ff433a211d2db80840cfc4ee146a7fb44849), [`18fbfa000`](https://github.com/bluesky-social/atproto/commit/18fbfa00057dda9ef4eba77d8b4e87994893c952)]:
+  - @atproto/oauth-provider@0.5.1
+  - @atproto/api@0.14.9
+
+## 0.4.105
+
+### Patch Changes
+
+- [#3585](https://github.com/bluesky-social/atproto/pull/3585) [`38320191e`](https://github.com/bluesky-social/atproto/commit/38320191e559f8b928c6e951a9b4a6207240bfc1) Thanks [@dholms](https://github.com/dholms)! - Wrap sync v1.1 semantics. Add #sync event to subscribeRepos and deprecate #handle and #tombstone events
+
+- [#3602](https://github.com/bluesky-social/atproto/pull/3602) [`6bcbb6d8c`](https://github.com/bluesky-social/atproto/commit/6bcbb6d8cd3696280935ff7892d8e191fd21fa49) Thanks [@devinivy](https://github.com/devinivy)! - Permit 100mb video embeds.
+
+- [#2945](https://github.com/bluesky-social/atproto/pull/2945) [`850e39843`](https://github.com/bluesky-social/atproto/commit/850e39843cb0ec9ea716675f7568c0c601f45e29) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Add support for account sign-ups during OAuth flows
+
+- Updated dependencies [[`850e39843`](https://github.com/bluesky-social/atproto/commit/850e39843cb0ec9ea716675f7568c0c601f45e29), [`850e39843`](https://github.com/bluesky-social/atproto/commit/850e39843cb0ec9ea716675f7568c0c601f45e29), [`38320191e`](https://github.com/bluesky-social/atproto/commit/38320191e559f8b928c6e951a9b4a6207240bfc1), [`850e39843`](https://github.com/bluesky-social/atproto/commit/850e39843cb0ec9ea716675f7568c0c601f45e29), [`850e39843`](https://github.com/bluesky-social/atproto/commit/850e39843cb0ec9ea716675f7568c0c601f45e29), [`6bcbb6d8c`](https://github.com/bluesky-social/atproto/commit/6bcbb6d8cd3696280935ff7892d8e191fd21fa49), [`850e39843`](https://github.com/bluesky-social/atproto/commit/850e39843cb0ec9ea716675f7568c0c601f45e29), [`dc6e4ecb0`](https://github.com/bluesky-social/atproto/commit/dc6e4ecb0e09bbf4bc7a79c6ac43fb6da4166200)]:
+  - @atproto/oauth-provider@0.5.0
+  - @atproto/api@0.14.8
+  - @atproto/syntax@0.3.4
+  - @atproto-labs/fetch-node@0.1.8
+  - @atproto/lexicon@0.4.8
+  - @atproto/repo@0.7.1
+  - @atproto/xrpc@0.6.10
+  - @atproto/xrpc-server@0.7.12
+  - @atproto/aws@0.2.17
+  - @atproto-labs/xrpc-utils@0.0.8
+
 ## 0.4.104
 
 ### Patch Changes

package/dist/account-manager/{index.d.ts → account-manager.d.ts}

@@ -1,9 +1,7 @@
 import { KeyObject } from 'node:crypto';
 import { CID } from 'multiformats/cid';
-import { AccountInfo, AccountStore, Code, DeviceData, DeviceId, DeviceStore, FoundRequestResult, NewTokenData, RefreshToken, RequestData, RequestId, RequestStore, SignInCredentials, TokenData, TokenId, TokenInfo, TokenStore, UpdateRequestData } from '@atproto/oauth-provider';
-import { ActorStore } from '../actor-store/actor-store';
-import { BackgroundQueue } from '../background';
-import { ImageUrlBuilder } from '../image/image-url-builder';
+import { IdResolver } from '@atproto/identity';
+import { DatabaseConfig } from '../config';
 import { StatusAttr } from '../lexicon/types/com/atproto/admin/defs';
 import { AccountDb, EmailTokenPurpose } from './db';
 import * as account from './helpers/account';
@@ -11,14 +9,13 @@ import { AccountStatus, ActorAccount } from './helpers/account';
 import * as invite from './helpers/invite';
 import * as password from './helpers/password';
 export { AccountStatus, formatAccountStatus } from './helpers/account';
-export declare class AccountManager implements AccountStore, RequestStore, DeviceStore, TokenStore {
-    private actorStore;
-    private imageUrlBuilder;
-    private backgroundQueue;
-    private jwtKey;
-    private serviceDid;
-    db: AccountDb;
-    constructor(actorStore: ActorStore, imageUrlBuilder: ImageUrlBuilder, backgroundQueue: BackgroundQueue, dbLocation: string, jwtKey: KeyObject, serviceDid: string, disableWalAutoCheckpoint?: boolean);
+export declare class AccountManager {
+    readonly idResolver: IdResolver;
+    readonly jwtKey: KeyObject;
+    readonly serviceDid: string;
+    readonly serviceHandleDomains: string[];
+    readonly db: AccountDb;
+    constructor(idResolver: IdResolver, jwtKey: KeyObject, serviceDid: string, serviceHandleDomains: string[], db: DatabaseConfig);
     migrateOrThrow(): Promise<void>;
     close(): void;
     getAccount(handleOrDid: string, flags?: account.AvailabilityFlags): Promise<ActorAccount | null>;
@@ -27,7 +24,22 @@ export declare class AccountManager implements AccountStore, RequestStore, Devic
     isAccountActivated(did: string): Promise<boolean>;
     getDidForActor(handleOrDid: string, flags?: account.AvailabilityFlags): Promise<string | null>;
     getAccountStatus(handleOrDid: string): Promise<AccountStatus>;
-    createAccount(opts: {
+    normalizeAndValidateHandle(handle: string, { did, allowAnyValid, }?: {
+        did?: string;
+        allowAnyValid?: boolean;
+    }): Promise<string>;
+    createAccount({ did, handle, email, password, repoCid, repoRev, inviteCode, deactivated, refreshJwt, }: {
+        did: string;
+        handle: string;
+        email?: string;
+        password?: string;
+        repoCid: CID;
+        repoRev: string;
+        inviteCode?: string;
+        deactivated?: boolean;
+        refreshJwt?: string;
+    }): Promise<void>;
+    createAccountAndSession(opts: {
         did: string;
         handle: string;
         email?: string;
@@ -110,26 +122,5 @@ export declare class AccountManager implements AccountStore, RequestStore, Devic
         did: string;
         password: string;
     }): Promise<void>;
-    private buildAccount;
-    authenticateAccount({ username: identifier, password, remember }: SignInCredentials, deviceId: DeviceId): Promise<AccountInfo | null>;
-    addAuthorizedClient(deviceId: DeviceId, sub: string, clientId: string): Promise<void>;
-    getDeviceAccount(deviceId: DeviceId, sub: string): Promise<AccountInfo | null>;
-    listDeviceAccounts(deviceId: DeviceId): Promise<AccountInfo[]>;
-    removeDeviceAccount(deviceId: DeviceId, sub: string): Promise<void>;
-    createRequest(id: RequestId, data: RequestData): Promise<void>;
-    readRequest(id: RequestId): Promise<RequestData | null>;
-    updateRequest(id: RequestId, data: UpdateRequestData): Promise<void>;
-    deleteRequest(id: RequestId): Promise<void>;
-    findRequestByCode(code: Code): Promise<FoundRequestResult | null>;
-    createDevice(deviceId: DeviceId, data: DeviceData): Promise<void>;
-    readDevice(deviceId: DeviceId): Promise<null | DeviceData>;
-    updateDevice(deviceId: DeviceId, data: Partial<DeviceData>): Promise<void>;
-    deleteDevice(deviceId: DeviceId): Promise<void>;
-    createToken(id: TokenId, data: TokenData, refreshToken?: RefreshToken): Promise<void>;
-    readToken(tokenId: TokenId): Promise<TokenInfo | null>;
-    deleteToken(tokenId: TokenId): Promise<void>;
-    rotateToken(tokenId: TokenId, newTokenId: TokenId, newRefreshToken: RefreshToken, newData: NewTokenData): Promise<void>;
-    findTokenByRefreshToken(refreshToken: RefreshToken): Promise<TokenInfo | null>;
-    findTokenByCode(code: Code): Promise<TokenInfo | null>;
 }
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=account-manager.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"account-manager.d.ts","sourceRoot":"","sources":["../../src/account-manager/account-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAI9C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAQ1C,OAAO,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAA;AACpE,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAsB,MAAM,MAAM,CAAA;AACvE,OAAO,KAAK,OAAO,MAAM,mBAAmB,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAG/D,OAAO,KAAK,MAAM,MAAM,kBAAkB,CAAA;AAC1C,OAAO,KAAK,QAAQ,MAAM,oBAAoB,CAAA;AAK9C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAEtE,qBAAa,cAAc;IAIvB,QAAQ,CAAC,UAAU,EAAE,UAAU;IAC/B,QAAQ,CAAC,MAAM,EAAE,SAAS;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM;IAC3B,QAAQ,CAAC,oBAAoB,EAAE,MAAM,EAAE;IANzC,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAA;gBAGX,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,oBAAoB,EAAE,MAAM,EAAE,EACvC,EAAE,EAAE,cAAc;IAKd,cAAc;IAKpB,KAAK;IAOC,UAAU,CACd,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,OAAO,CAAC,iBAAiB,GAChC,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;IAIzB,WAAW,CACf,IAAI,EAAE,MAAM,EAAE,EACd,KAAK,CAAC,EAAE,OAAO,CAAC,iBAAiB,GAChC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAI/B,iBAAiB,CACrB,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,OAAO,CAAC,iBAAiB,GAChC,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;IAIzB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMjD,cAAc,CAClB,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,OAAO,CAAC,iBAAiB,GAChC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAKnB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAU7D,0BAA0B,CAC9B,MAAM,EAAE,MAAM,EACd,EACE,GAAG,EACH,aAAa,GACd,GAAE;QACD,GAAG,CAAC,EAAE,MAAM,CAAA;QACZ,aAAa,CAAC,EAAE,OAAO,CAAA;KACnB,GACL,OAAO,CAAC,MAAM,CAAC;IAyCZ,aAAa,CAAC,EAClB,GAAG,EACH,MAAM,EACN,KAAK,EACL,QAAQ,EACR,OAAO,EACP,OAAO,EACP,UAAU,EACV,WAAW,EACX,UAAU,GACX,EAAE;QACD,GAAG,EAAE,MAAM,CAAA;QACX,MAAM,EAAE,MAAM,CAAA;QACd,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,OAAO,EAAE,GAAG,CAAA;QACZ,OAAO,EAAE,MAAM,CAAA;QACf,UAAU,CAAC,EAAE,MAAM,CAAA;QACnB,WAAW,CAAC,EAAE,OAAO,CAAA;QACrB,UAAU,CAAC,EAAE,MAAM,CAAA;KACpB;IA+BK,uBAAuB,CAAC,IAAI,EAAE;QAClC,GAAG,EAAE,MAAM,CAAA;QACX,MAAM,EAAE,MAAM,CAAA;QACd,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,OAAO,EAAE,GAAG,CAAA;QACZ,OAAO,EAAE,MAAM,CAAA;QACf,UAAU,CAAC,EAAE,MAAM,CAAA;QACnB,WAAW,CAAC,EAAE,OAAO,CAAA;KACtB;;;;IAeK,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAIxC,aAAa,CAAC,GAAG,EAAE,MAAM;IAIzB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU;IAUjD,qBAAqB,CAAC,GAAG,EAAE,MAAM;;;;IAIjC,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM;IAIjD,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;IAIzD,eAAe,CAAC,GAAG,EAAE,MAAM;IAO3B,aAAa,CACjB,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,QAAQ,CAAC,eAAe,GAAG,IAAI,EAC5C,aAAa,UAAQ;;;;IAgBjB,kBAAkB,CAAC,EAAE,EAAE,MAAM;IAwD7B,kBAAkB,CAAC,EAAE,EAAE,MAAM;IAO7B,KAAK,CAAC,EACV,UAAU,EACV,QAAQ,GACT,EAAE;QACD,UAAU,EAAE,MAAM,CAAA;QAClB,QAAQ,EAAE,MAAM,CAAA;KACjB,GAAG,OAAO,CAAC;QACV,IAAI,EAAE,YAAY,CAAA;QAClB,WAAW,EAAE,QAAQ,CAAC,eAAe,GAAG,IAAI,CAAA;QAC5C,aAAa,EAAE,OAAO,CAAA;KACvB,CAAC;IA8CI,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO;IAIhE,gBAAgB,CAAC,GAAG,EAAE,MAAM;;;;;IAI5B,qBAAqB,CACzB,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC;IAIb,iBAAiB,CACrB,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,QAAQ,CAAC,eAAe,GAAG,IAAI,CAAC;IAIrC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAY3C,uBAAuB,CAAC,IAAI,EAAE,MAAM;IAIpC,iBAAiB,CACrB,QAAQ,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,EAChD,QAAQ,EAAE,MAAM;IAKZ,wBAAwB,CAC5B,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EAAE,EACf,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,CAAC,GAAG,CAAC;IAWX,sBAAsB,CAAC,GAAG,EAAE,MAAM;IAKlC,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE;IAItC,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE;IAItC,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE;;;;IAIlC,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO;IAIxD,kBAAkB,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;KAAE;IAOhE,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB;IAIxD,qBAAqB,CACzB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,iBAAiB,EAC1B,KAAK,EAAE,MAAM;IAKT,+BAA+B,CACnC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,iBAAiB,EAC1B,KAAK,EAAE,MAAM;IAMT,YAAY,CAAC,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAYjD,WAAW,CAAC,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAUhD,aAAa,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IASvD,qBAAqB,CAAC,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE;CAWpE"}

package/dist/account-manager/{index.js → account-manager.js}

@@ -25,45 +25,32 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccountManager = exports.formatAccountStatus = exports.AccountStatus = void 0;
 const common_1 = require("@atproto/common");
+const syntax_1 = require("@atproto/syntax");
 const xrpc_server_1 = require("@atproto/xrpc-server");
 const auth_verifier_1 = require("../auth-verifier");
 const db_1 = require("../db");
+const explicit_slurs_1 = require("../handle/explicit-slurs");
+const index_1 = require("../handle/index");
 const db_2 = require("./db");
 const account = __importStar(require("./helpers/account"));
 const account_1 = require("./helpers/account");
 const auth = __importStar(require("./helpers/auth"));
-const authRequest = __importStar(require("./helpers/authorization-request"));
-const device = __importStar(require("./helpers/device"));
-const deviceAccount = __importStar(require("./helpers/device-account"));
 const emailToken = __importStar(require("./helpers/email-token"));
 const invite = __importStar(require("./helpers/invite"));
 const password = __importStar(require("./helpers/password"));
 const repo = __importStar(require("./helpers/repo"));
 const scrypt = __importStar(require("./helpers/scrypt"));
 const token = __importStar(require("./helpers/token"));
-const usedRefreshToken = __importStar(require("./helpers/used-refresh-token"));
 var account_2 = require("./helpers/account");
 Object.defineProperty(exports, "AccountStatus", { enumerable: true, get: function () { return account_2.AccountStatus; } });
 Object.defineProperty(exports, "formatAccountStatus", { enumerable: true, get: function () { return account_2.formatAccountStatus; } });
 class AccountManager {
-    constructor(actorStore, imageUrlBuilder, backgroundQueue, dbLocation, jwtKey, serviceDid, disableWalAutoCheckpoint = false) {
-        Object.defineProperty(this, "actorStore", {
+    constructor(idResolver, jwtKey, serviceDid, serviceHandleDomains, db) {
+        Object.defineProperty(this, "idResolver", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: actorStore
-        });
-        Object.defineProperty(this, "imageUrlBuilder", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: imageUrlBuilder
-        });
-        Object.defineProperty(this, "backgroundQueue", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: backgroundQueue
+            value: idResolver
         });
         Object.defineProperty(this, "jwtKey", {
             enumerable: true,
@@ -77,13 +64,19 @@ class AccountManager {
             writable: true,
             value: serviceDid
         });
+        Object.defineProperty(this, "serviceHandleDomains", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: serviceHandleDomains
+        });
         Object.defineProperty(this, "db", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        this.db = (0, db_2.getDb)(dbLocation, disableWalAutoCheckpoint);
+        this.db = (0, db_2.getDb)(db.accountDbLoc, db.disableWalAutoCheckpoint);
     }
     async migrateOrThrow() {
         await this.db.ensureWal();
@@ -121,18 +114,36 @@ class AccountManager {
         const res = account.formatAccountStatus(got);
         return res.active ? account_1.AccountStatus.Active : res.status;
     }
-    async createAccount(opts) {
-        const { did, handle, email, password, repoCid, repoRev, inviteCode, deactivated, } = opts;
+    async normalizeAndValidateHandle(handle, { did, allowAnyValid, } = {}) {
+        const normalized = (0, index_1.baseNormalizeAndValidate)(handle);
+        // tld validation
+        if (!(0, syntax_1.isValidTld)(normalized)) {
+            throw new xrpc_server_1.InvalidRequestError('Handle TLD is invalid or disallowed', 'InvalidHandle');
+        }
+        // slur check
+        if (!allowAnyValid && (0, explicit_slurs_1.hasExplicitSlur)(normalized)) {
+            throw new xrpc_server_1.InvalidRequestError('Inappropriate language in handle', 'InvalidHandle');
+        }
+        if ((0, index_1.isServiceDomain)(normalized, this.serviceHandleDomains)) {
+            // verify constraints on a service domain
+            (0, index_1.ensureHandleServiceConstraints)(normalized, this.serviceHandleDomains, allowAnyValid);
+        }
+        else {
+            if (did == null) {
+                throw new xrpc_server_1.InvalidRequestError('Not a supported handle domain', 'UnsupportedDomain');
+            }
+            // verify resolution of a non-service domain
+            const resolvedDid = await this.idResolver.handle.resolve(normalized);
+            if (resolvedDid !== did) {
+                throw new xrpc_server_1.InvalidRequestError('External handle did not resolve to DID');
+            }
+        }
+        return normalized;
+    }
+    async createAccount({ did, handle, email, password, repoCid, repoRev, inviteCode, deactivated, refreshJwt, }) {
         const passwordScrypt = password
             ? await scrypt.genSaltAndHash(password)
             : undefined;
-        const { accessJwt, refreshJwt } = await auth.createTokens({
-            did,
-            jwtKey: this.jwtKey,
-            serviceDid: this.serviceDid,
-            scope: auth_verifier_1.AuthScope.Access,
-        });
-        const refreshPayload = auth.decodeRefreshToken(refreshJwt);
         const now = new Date().toISOString();
         await this.db.transaction(async (dbTxn) => {
             if (inviteCode) {
@@ -148,10 +159,20 @@ class AccountManager {
                     inviteCode,
                     now,
                 }),
-                auth.storeRefreshToken(dbTxn, refreshPayload, null),
+                refreshJwt &&
+                    auth.storeRefreshToken(dbTxn, auth.decodeRefreshToken(refreshJwt), null),
                 repo.updateRoot(dbTxn, did, repoCid, repoRev),
             ]);
         });
+    }
+    async createAccountAndSession(opts) {
+        const { accessJwt, refreshJwt } = await auth.createTokens({
+            did: opts.did,
+            jwtKey: this.jwtKey,
+            serviceDid: this.serviceDid,
+            scope: auth_verifier_1.AuthScope.Access,
+        });
+        await this.createAccount({ ...opts, refreshJwt });
         return { accessJwt, refreshJwt };
     }
     // @NOTE should always be paired with a sequenceHandle().
@@ -375,182 +396,6 @@ class AccountManager {
             auth.revokeRefreshTokensByDid(dbTxn, did),
         ]));
     }
-    // AccountStore
-    async buildAccount(row) {
-        const account = deviceAccount.toAccount(row, this.serviceDid);
-        if (!account.name || !account.picture) {
-            const did = account.sub;
-            const profile = await this.actorStore.read(did, async (store) => {
-                return store.record.getProfileRecord();
-            });
-            if (profile) {
-                const { avatar, displayName } = profile;
-                account.name || (account.name = displayName);
-                account.picture || (account.picture = avatar
-                    ? this.imageUrlBuilder.build('avatar', did, avatar.ref.toString())
-                    : undefined);
-            }
-        }
-        return account;
-    }
-    async authenticateAccount({ username: identifier, password, remember = false }, deviceId) {
-        try {
-            const { user, appPassword } = await this.login({ identifier, password });
-            if (appPassword) {
-                throw new xrpc_server_1.AuthRequiredError('App passwords are not allowed');
-            }
-            await this.db.executeWithRetry(deviceAccount.createOrUpdateQB(this.db, deviceId, user.did, remember));
-            return await this.getDeviceAccount(deviceId, user.did);
-        }
-        catch (err) {
-            if (err instanceof xrpc_server_1.AuthRequiredError)
-                return null;
-            throw err;
-        }
-    }
-    async addAuthorizedClient(deviceId, sub, clientId) {
-        await this.db.transaction(async (dbTxn) => {
-            const row = await deviceAccount
-                .readQB(dbTxn, deviceId, sub)
-                .executeTakeFirstOrThrow();
-            const { authorizedClients } = deviceAccount.toDeviceAccountInfo(row);
-            if (!authorizedClients.includes(clientId)) {
-                await deviceAccount
-                    .updateQB(dbTxn, deviceId, sub, {
-                    authorizedClients: [...authorizedClients, clientId],
-                })
-                    .execute();
-            }
-        });
-    }
-    async getDeviceAccount(deviceId, sub) {
-        const row = await deviceAccount
-            .getAccountInfoQB(this.db, deviceId, sub)
-            .executeTakeFirst();
-        if (!row)
-            return null;
-        return {
-            account: await this.buildAccount(row),
-            info: deviceAccount.toDeviceAccountInfo(row),
-        };
-    }
-    async listDeviceAccounts(deviceId) {
-        const rows = await deviceAccount
-            .listRememberedQB(this.db, deviceId)
-            .execute();
-        return Promise.all(rows.map(async (row) => ({
-            account: await this.buildAccount(row),
-            info: deviceAccount.toDeviceAccountInfo(row),
-        })));
-    }
-    async removeDeviceAccount(deviceId, sub) {
-        await this.db.executeWithRetry(deviceAccount.removeQB(this.db, deviceId, sub));
-    }
-    // RequestStore
-    async createRequest(id, data) {
-        await this.db.executeWithRetry(authRequest.createQB(this.db, id, data));
-    }
-    async readRequest(id) {
-        try {
-            const row = await authRequest.readQB(this.db, id).executeTakeFirst();
-            if (!row)
-                return null;
-            return authRequest.rowToRequestData(row);
-        }
-        finally {
-            // Take the opportunity to clean up expired requests. Do this after we got
-            // the current (potentially expired) request data to allow the provider to
-            // handle expired requests.
-            this.backgroundQueue.add(async () => {
-                await this.db.executeWithRetry(authRequest.removeOldExpiredQB(this.db));
-            });
-        }
-    }
-    async updateRequest(id, data) {
-        await this.db.executeWithRetry(authRequest.updateQB(this.db, id, data));
-    }
-    async deleteRequest(id) {
-        await this.db.executeWithRetry(authRequest.removeByIdQB(this.db, id));
-    }
-    async findRequestByCode(code) {
-        const row = await authRequest.findByCodeQB(this.db, code).executeTakeFirst();
-        return row ? authRequest.rowToFoundRequestResult(row) : null;
-    }
-    // DeviceStore
-    async createDevice(deviceId, data) {
-        await this.db.executeWithRetry(device.createQB(this.db, deviceId, data));
-    }
-    async readDevice(deviceId) {
-        const row = await device.readQB(this.db, deviceId).executeTakeFirst();
-        return row ? device.rowToDeviceData(row) : null;
-    }
-    async updateDevice(deviceId, data) {
-        await this.db.executeWithRetry(device.updateQB(this.db, deviceId, data));
-    }
-    async deleteDevice(deviceId) {
-        // Will cascade to device_account (device_account_device_id_fk)
-        await this.db.executeWithRetry(device.removeQB(this.db, deviceId));
-    }
-    // TokenStore
-    async createToken(id, data, refreshToken) {
-        await this.db.transaction(async (dbTxn) => {
-            if (refreshToken) {
-                const { count } = await usedRefreshToken
-                    .countQB(dbTxn, refreshToken)
-                    .executeTakeFirstOrThrow();
-                if (count > 0) {
-                    throw new Error('Refresh token already in use');
-                }
-            }
-            return token.createQB(dbTxn, id, data, refreshToken).execute();
-        });
-    }
-    async readToken(tokenId) {
-        const row = await token.findByQB(this.db, { tokenId }).executeTakeFirst();
-        return row ? token.toTokenInfo(row, this.serviceDid) : null;
-    }
-    async deleteToken(tokenId) {
-        // Will cascade to used_refresh_token (used_refresh_token_fk)
-        await this.db.executeWithRetry(token.removeQB(this.db, tokenId));
-    }
-    async rotateToken(tokenId, newTokenId, newRefreshToken, newData) {
-        const err = await this.db.transaction(async (dbTxn) => {
-            const { id, currentRefreshToken } = await token
-                .forRotateQB(dbTxn, tokenId)
-                .executeTakeFirstOrThrow();
-            if (currentRefreshToken) {
-                await usedRefreshToken
-                    .insertQB(dbTxn, id, currentRefreshToken)
-                    .execute();
-            }
-            const { count } = await usedRefreshToken
-                .countQB(dbTxn, newRefreshToken)
-                .executeTakeFirstOrThrow();
-            if (count > 0) {
-                // Do NOT throw (we don't want the transaction to be rolled back)
-                return new Error('New refresh token already in use');
-            }
-            await token
-                .rotateQB(dbTxn, id, newTokenId, newRefreshToken, newData)
-                .execute();
-        });
-        if (err)
-            throw err;
-    }
-    async findTokenByRefreshToken(refreshToken) {
-        const used = await usedRefreshToken
-            .findByTokenQB(this.db, refreshToken)
-            .executeTakeFirst();
-        const search = used
-            ? { id: used.tokenId }
-            : { currentRefreshToken: refreshToken };
-        const row = await token.findByQB(this.db, search).executeTakeFirst();
-        return row ? token.toTokenInfo(row, this.serviceDid) : null;
-    }
-    async findTokenByCode(code) {
-        const row = await token.findByQB(this.db, { code }).executeTakeFirst();
-        return row ? token.toTokenInfo(row, this.serviceDid) : null;
-    }
 }
 exports.AccountManager = AccountManager;
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=account-manager.js.map

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

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

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

@@ -19,20 +19,20 @@ export declare enum AccountStatus {
     Deactivated = "deactivated"
 }
 export declare const selectAccountQB: (db: AccountDb, flags?: AvailabilityFlags) => import("kysely/dist/cjs/parser/select-parser").QueryBuilderWithSelection<{
-    repo_root: import("../db").RepoRoot;
-    token: import("../db").Token;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
+    token: import("../db").Token;
     actor: import("../db").Actor;
     app_password: import("../db").AppPassword;
     invite_code: import("../db").InviteCode;
     invite_code_use: import("../db").InviteCodeUse;
     refresh_token: import("../db").RefreshToken;
+    repo_root: import("../db").RepoRoot;
     email_token: import("../db").EmailToken;
     authorization_request: import("../db").AuthorizationRequest;
     device: import("../db").Device;
     device_account: import("../db").DeviceAccount;
     used_refresh_token: import("../db").UsedRefreshToken;
-}, "account" | "actor", import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>>, Partial<Omit<{}, never>>>, "actor.did" | "account.email" | "account.invitesDisabled" | "account.emailConfirmedAt" | "actor.takedownRef" | "actor.createdAt" | "actor.handle" | "actor.deactivatedAt" | "actor.deleteAfter">;
+}, "account" | "actor", import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>>, Partial<Omit<{}, never>>>, "actor.did" | "account.email" | "account.invitesDisabled" | "account.emailConfirmedAt" | "actor.handle" | "actor.createdAt" | "actor.takedownRef" | "actor.deactivatedAt" | "actor.deleteAfter">;
 export declare const getAccount: (db: AccountDb, handleOrDid: string, flags?: AvailabilityFlags) => Promise<ActorAccount | null>;
 export declare const getAccounts: (db: AccountDb, dids: string[], flags?: AvailabilityFlags) => Promise<Map<string, ActorAccount>>;
 export declare const getAccountByEmail: (db: AccountDb, email: string, flags?: AvailabilityFlags) => Promise<ActorAccount | null>;

package/dist/account-manager/helpers/device-account.d.ts

@@ -17,44 +17,44 @@ export declare const updateQB: (db: AccountDb, deviceId: DeviceId, did: string,
     authorizedClients?: OAuthClientId[];
     remember?: boolean;
 }) => import("kysely").UpdateQueryBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../db").DatabaseSchema, "device_account">, "device_account", "device_account", import("kysely").UpdateResult>;
-export declare const createOrUpdateQB: (db: AccountDb, deviceId: DeviceId, did: string, remember: boolean) => import("kysely").InsertQueryBuilder<import("../db").DatabaseSchema, "device_account", import("kysely").InsertResult>;
+export declare const createOrUpdateQB: (db: AccountDb, deviceId: DeviceId, did: string, remember: boolean) => import("kysely").InsertQueryBuilder<import("../db").DatabaseSchema, "device_account", import("kysely").Selection<import("../db").DatabaseSchema, "device_account", "authenticatedAt" | "remember" | "authorizedClients">>;
 export declare const getAccountInfoQB: (db: AccountDb, deviceId: DeviceId, did: string) => import("kysely").SelectQueryBuilder<{
-    repo_root: import("../db").RepoRoot;
-    token: import("../db").Token;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
+    token: import("../db").Token;
     actor: import("../db").Actor;
     app_password: import("../db").AppPassword;
     invite_code: import("../db").InviteCode;
     invite_code_use: import("../db").InviteCodeUse;
     refresh_token: import("../db").RefreshToken;
+    repo_root: import("../db").RepoRoot;
     email_token: import("../db").EmailToken;
     authorization_request: import("../db").AuthorizationRequest;
     device: import("../db").Device;
     device_account: DeviceAccount;
     used_refresh_token: import("../db").UsedRefreshToken;
 }, "account" | "actor" | "device" | "device_account", Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
-    repo_root: import("../db").RepoRoot;
-    token: import("../db").Token;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
+    token: import("../db").Token;
     actor: import("../db").Actor;
     app_password: import("../db").AppPassword;
     invite_code: import("../db").InviteCode;
     invite_code_use: import("../db").InviteCodeUse;
     refresh_token: import("../db").RefreshToken;
+    repo_root: import("../db").RepoRoot;
     email_token: import("../db").EmailToken;
     authorization_request: import("../db").AuthorizationRequest;
     device: import("../db").Device;
     device_account: DeviceAccount;
     used_refresh_token: import("../db").UsedRefreshToken;
-}, "account" | "actor", "actor.did" | "account.email" | "account.invitesDisabled" | "account.emailConfirmedAt" | "actor.takedownRef" | "actor.createdAt" | "actor.handle" | "actor.deactivatedAt" | "actor.deleteAfter"> & import("kysely").Selection<{
-    repo_root: import("../db").RepoRoot;
-    token: import("../db").Token;
+}, "account" | "actor", "actor.did" | "account.email" | "account.invitesDisabled" | "account.emailConfirmedAt" | "actor.handle" | "actor.createdAt" | "actor.takedownRef" | "actor.deactivatedAt" | "actor.deleteAfter"> & import("kysely").Selection<{
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
+    token: import("../db").Token;
     actor: import("../db").Actor;
     app_password: import("../db").AppPassword;
     invite_code: import("../db").InviteCode;
     invite_code_use: import("../db").InviteCodeUse;
     refresh_token: import("../db").RefreshToken;
+    repo_root: import("../db").RepoRoot;
     email_token: import("../db").EmailToken;
     authorization_request: import("../db").AuthorizationRequest;
     device: import("../db").Device;
@@ -62,42 +62,42 @@ export declare const getAccountInfoQB: (db: AccountDb, deviceId: DeviceId, did:
     used_refresh_token: import("../db").UsedRefreshToken;
 }, "account" | "actor" | "device" | "device_account", "device_account.authenticatedAt" | "device_account.remember" | "device_account.authorizedClients">>;
 export declare const listRememberedQB: (db: AccountDb, deviceId: DeviceId) => import("kysely").SelectQueryBuilder<{
-    repo_root: import("../db").RepoRoot;
-    token: import("../db").Token;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
+    token: import("../db").Token;
     actor: import("../db").Actor;
     app_password: import("../db").AppPassword;
     invite_code: import("../db").InviteCode;
     invite_code_use: import("../db").InviteCodeUse;
     refresh_token: import("../db").RefreshToken;
+    repo_root: import("../db").RepoRoot;
     email_token: import("../db").EmailToken;
     authorization_request: import("../db").AuthorizationRequest;
     device: import("../db").Device;
     device_account: DeviceAccount;
     used_refresh_token: import("../db").UsedRefreshToken;
 }, "account" | "actor" | "device" | "device_account", Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
-    repo_root: import("../db").RepoRoot;
-    token: import("../db").Token;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
+    token: import("../db").Token;
     actor: import("../db").Actor;
     app_password: import("../db").AppPassword;
     invite_code: import("../db").InviteCode;
     invite_code_use: import("../db").InviteCodeUse;
     refresh_token: import("../db").RefreshToken;
+    repo_root: import("../db").RepoRoot;
     email_token: import("../db").EmailToken;
     authorization_request: import("../db").AuthorizationRequest;
     device: import("../db").Device;
     device_account: DeviceAccount;
     used_refresh_token: import("../db").UsedRefreshToken;
-}, "account" | "actor", "actor.did" | "account.email" | "account.invitesDisabled" | "account.emailConfirmedAt" | "actor.takedownRef" | "actor.createdAt" | "actor.handle" | "actor.deactivatedAt" | "actor.deleteAfter"> & import("kysely").Selection<{
-    repo_root: import("../db").RepoRoot;
-    token: import("../db").Token;
+}, "account" | "actor", "actor.did" | "account.email" | "account.invitesDisabled" | "account.emailConfirmedAt" | "actor.handle" | "actor.createdAt" | "actor.takedownRef" | "actor.deactivatedAt" | "actor.deleteAfter"> & import("kysely").Selection<{
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
+    token: import("../db").Token;
     actor: import("../db").Actor;
     app_password: import("../db").AppPassword;
     invite_code: import("../db").InviteCode;
     invite_code_use: import("../db").InviteCodeUse;
     refresh_token: import("../db").RefreshToken;
+    repo_root: import("../db").RepoRoot;
     email_token: import("../db").EmailToken;
     authorization_request: import("../db").AuthorizationRequest;
     device: import("../db").Device;

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

@@ -1 +1 @@
-{"version":3,"file":"device-account.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/device-account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,UAAU,EAAE,MAAM,QAAQ,CAAA;AAC/C,OAAO,EACL,OAAO,EACP,iBAAiB,EACjB,QAAQ,EACR,aAAa,EACd,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAC3D,OAAO,EAAE,YAAY,EAAmB,MAAM,WAAW,CAAA;AAEzD,MAAM,MAAM,uBAAuB,GAAG,IAAI,CACxC,UAAU,CAAC,aAAa,CAAC,EACzB,iBAAiB,GAAG,mBAAmB,GAAG,UAAU,CACrD,CAAA;AAcD,MAAM,MAAM,eAAe,GAAG;IAC5B,eAAe,EAAE,IAAI,CAAA;IACrB,iBAAiB,EAAE,aAAa,EAAE,CAAA;IAClC,QAAQ,EAAE,OAAO,CAAA;CAClB,CAAA;AAqBD,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,uBAAuB,GAC3B,iBAAiB,CAMnB;AAED,wBAAgB,SAAS,CACvB,GAAG,EAAE,UAAU,CAAC,YAAY,CAAC,EAC7B,QAAQ,EAAE,MAAM,GACf,OAAO,CAQT;AAED,eAAO,MAAM,MAAM,OAAQ,SAAS,YAAY,QAAQ,OAAO,MAAM,+PAKJ,CAAA;AAEjE,eAAO,MAAM,QAAQ,OACf,SAAS,YACH,QAAQ,OACb,MAAM,SACJ;IACL,eAAe,CAAC,EAAE,IAAI,CAAA;IACtB,iBAAiB,CAAC,EAAE,aAAa,EAAE,CAAA;IACnC,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,iNAMkC,CAAA;AAErC,eAAO,MAAM,gBAAgB,OACvB,SAAS,YACH,QAAQ,OACb,MAAM,YACD,OAAO,yHAYlB,CAAA;AAED,eAAO,MAAM,gBAAgB,OACvB,SAAS,YACH,QAAQ,OACb,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yJAGZ,CAAA;AAED,eAAO,MAAM,gBAAgB,OAAQ,SAAS,YAAY,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yJACU,CAAA;AAE5E,eAAO,MAAM,QAAQ,OAAQ,SAAS,YAAY,QAAQ,OAAO,MAAM,+LAI5C,CAAA"}
+{"version":3,"file":"device-account.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/device-account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,UAAU,EAAE,MAAM,QAAQ,CAAA;AAC/C,OAAO,EACL,OAAO,EACP,iBAAiB,EACjB,QAAQ,EACR,aAAa,EACd,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAC3D,OAAO,EAAE,YAAY,EAAmB,MAAM,WAAW,CAAA;AAEzD,MAAM,MAAM,uBAAuB,GAAG,IAAI,CACxC,UAAU,CAAC,aAAa,CAAC,EACzB,iBAAiB,GAAG,mBAAmB,GAAG,UAAU,CACrD,CAAA;AAcD,MAAM,MAAM,eAAe,GAAG;IAC5B,eAAe,EAAE,IAAI,CAAA;IACrB,iBAAiB,EAAE,aAAa,EAAE,CAAA;IAClC,QAAQ,EAAE,OAAO,CAAA;CAClB,CAAA;AAqBD,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,uBAAuB,GAC3B,iBAAiB,CAMnB;AAED,wBAAgB,SAAS,CACvB,GAAG,EAAE,UAAU,CAAC,YAAY,CAAC,EAC7B,QAAQ,EAAE,MAAM,GACf,OAAO,CAQT;AAED,eAAO,MAAM,MAAM,OAAQ,SAAS,YAAY,QAAQ,OAAO,MAAM,+PAKJ,CAAA;AAEjE,eAAO,MAAM,QAAQ,OACf,SAAS,YACH,QAAQ,OACb,MAAM,SACJ;IACL,eAAe,CAAC,EAAE,IAAI,CAAA;IACtB,iBAAiB,CAAC,EAAE,aAAa,EAAE,CAAA;IACnC,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,iNAMkC,CAAA;AAErC,eAAO,MAAM,gBAAgB,OACvB,SAAS,YACH,QAAQ,OACb,MAAM,YACD,OAAO,8NAalB,CAAA;AAED,eAAO,MAAM,gBAAgB,OACvB,SAAS,YACH,QAAQ,OACb,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yJAGZ,CAAA;AAED,eAAO,MAAM,gBAAgB,OAAQ,SAAS,YAAY,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yJACU,CAAA;AAE5E,eAAO,MAAM,QAAQ,OAAQ,SAAS,YAAY,QAAQ,OAAO,MAAM,+LAI5C,CAAA"}

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

@@ -65,7 +65,8 @@ const createOrUpdateQB = (db, deviceId, did, remember) => {
     return db.db
         .insertInto('device_account')
         .values({ did, deviceId, authorizedClients, ...values })
-        .onConflict((oc) => oc.columns(['deviceId', 'did']).doUpdateSet(values));
+        .onConflict((oc) => oc.columns(['deviceId', 'did']).doUpdateSet(values))
+        .returning(['remember', 'authorizedClients', 'authenticatedAt']);
 };
 exports.createOrUpdateQB = createOrUpdateQB;
 const getAccountInfoQB = (db, deviceId, did) => {