@atproto/pds 0.4.34 → 0.4.35

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atproto/pds
 
+## 0.4.35
+
+### Patch Changes
+
+- [#2482](https://github.com/bluesky-social/atproto/pull/2482) [`a8d6c1123`](https://github.com/bluesky-social/atproto/commit/a8d6c112359f5c4c0cfbe2df63443ed275f2a646) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Add OAuth provider capability & support for DPoP signed tokens
+
+- Updated dependencies [[`a8d6c1123`](https://github.com/bluesky-social/atproto/commit/a8d6c112359f5c4c0cfbe2df63443ed275f2a646)]:
+  - @atproto/oauth-provider@0.1.0
+  - @atproto-labs/fetch-node@0.1.0
+
 ## 0.4.34
 
 ### Patch Changes

package/dist/account-manager/db/migrations/004-oauth.d.ts

@@ -0,0 +1,4 @@
+import { Kysely } from 'kysely';
+export declare function up(db: Kysely<unknown>): Promise<void>;
+export declare function down(db: Kysely<unknown>): Promise<void>;
+//# sourceMappingURL=004-oauth.d.ts.map

package/dist/account-manager/db/migrations/004-oauth.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"004-oauth.d.ts","sourceRoot":"","sources":["../../../../src/account-manager/db/migrations/004-oauth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAO,MAAM,QAAQ,CAAA;AAEpC,wBAAsB,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CA+G3D;AAED,wBAAsB,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAM7D"}

package/dist/account-manager/db/migrations/004-oauth.js

@@ -0,0 +1,106 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+const kysely_1 = require("kysely");
+async function up(db) {
+    await db.schema
+        .createTable('authorization_request')
+        .addColumn('id', 'varchar', (col) => col.primaryKey())
+        .addColumn('did', 'varchar')
+        .addColumn('deviceId', 'varchar')
+        .addColumn('clientId', 'varchar', (col) => col.notNull())
+        .addColumn('clientAuth', 'varchar', (col) => col.notNull())
+        .addColumn('parameters', 'varchar', (col) => col.notNull())
+        .addColumn('expiresAt', 'varchar', (col) => col.notNull())
+        .addColumn('code', 'varchar')
+        .execute();
+    await db.schema
+        .createIndex('authorization_request_code_idx')
+        .unique()
+        .on('authorization_request')
+        // https://github.com/kysely-org/kysely/issues/302
+        .expression((0, kysely_1.sql) `code DESC) WHERE (code IS NOT NULL`)
+        .execute();
+    await db.schema
+        .createIndex('authorization_request_expires_at_idx')
+        .on('authorization_request')
+        .column('expiresAt')
+        .execute();
+    await db.schema
+        .createTable('device')
+        .addColumn('id', 'varchar', (col) => col.primaryKey())
+        .addColumn('sessionId', 'varchar', (col) => col.notNull())
+        .addColumn('userAgent', 'varchar')
+        .addColumn('ipAddress', 'varchar', (col) => col.notNull())
+        .addColumn('lastSeenAt', 'varchar', (col) => col.notNull())
+        .addUniqueConstraint('device_session_id_idx', ['sessionId'])
+        .execute();
+    await db.schema
+        .createTable('device_account')
+        .addColumn('did', 'varchar', (col) => col.notNull())
+        .addColumn('deviceId', 'varchar', (col) => col.notNull())
+        .addColumn('authenticatedAt', 'varchar', (col) => col.notNull())
+        .addColumn('remember', 'boolean', (col) => col.notNull())
+        .addColumn('authorizedClients', 'varchar', (col) => col.notNull())
+        .addPrimaryKeyConstraint('device_account_pk', [
+        'deviceId', // first because this table will be joined from the "device" table
+        'did',
+    ])
+        .addForeignKeyConstraint('device_account_device_id_fk', ['deviceId'], 'device', ['id'], (qb) => qb.onDelete('cascade').onUpdate('cascade'))
+        .execute();
+    await db.schema
+        .createTable('token')
+        .addColumn('id', 'integer', (col) => col.primaryKey().autoIncrement())
+        .addColumn('did', 'varchar', (col) => col.notNull())
+        .addColumn('tokenId', 'varchar', (col) => col.notNull())
+        .addColumn('createdAt', 'varchar', (col) => col.notNull())
+        .addColumn('updatedAt', 'varchar', (col) => col.notNull())
+        .addColumn('expiresAt', 'varchar', (col) => col.notNull())
+        .addColumn('clientId', 'varchar', (col) => col.notNull())
+        .addColumn('clientAuth', 'varchar', (col) => col.notNull())
+        .addColumn('deviceId', 'varchar')
+        .addColumn('parameters', 'varchar', (col) => col.notNull())
+        .addColumn('details', 'varchar')
+        .addColumn('code', 'varchar')
+        .addColumn('currentRefreshToken', 'varchar')
+        .addUniqueConstraint('token_current_refresh_token_unique_idx', [
+        'currentRefreshToken',
+    ])
+        .addUniqueConstraint('token_id_unique_idx', ['tokenId'])
+        .execute();
+    await db.schema
+        .createIndex('token_did_idx')
+        .on('token')
+        .column('did')
+        .execute();
+    await db.schema
+        .createIndex('token_code_idx')
+        .unique()
+        .on('token')
+        // https://github.com/kysely-org/kysely/issues/302
+        .expression((0, kysely_1.sql) `code DESC) WHERE (code IS NOT NULL`)
+        .execute();
+    await db.schema
+        .createTable('used_refresh_token')
+        .addColumn('refreshToken', 'varchar', (col) => col.primaryKey())
+        .addColumn('tokenId', 'integer', (col) => col.notNull())
+        .addForeignKeyConstraint('used_refresh_token_fk', ['tokenId'], 'token', ['id'], 
+    // uses "used_refresh_token_id_idx" index (when cascading)
+    (qb) => qb.onDelete('cascade').onUpdate('cascade'))
+        .execute();
+    await db.schema
+        .createIndex('used_refresh_token_id_idx')
+        .on('used_refresh_token')
+        .column('tokenId')
+        .execute();
+}
+exports.up = up;
+async function down(db) {
+    await db.schema.dropTable('used_refresh_token').execute();
+    await db.schema.dropTable('token').execute();
+    await db.schema.dropTable('device_account').execute();
+    await db.schema.dropTable('device').execute();
+    await db.schema.dropTable('authorization_request').execute();
+}
+exports.down = down;
+//# sourceMappingURL=004-oauth.js.map

package/dist/account-manager/db/migrations/004-oauth.js.map

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

package/dist/account-manager/db/migrations/index.d.ts

@@ -1,10 +1,12 @@
 import * as mig001 from './001-init';
 import * as mig002 from './002-account-deactivation';
 import * as mig003 from './003-privileged-app-passwords';
+import * as mig004 from './004-oauth';
 declare const _default: {
     '001': typeof mig001;
     '002': typeof mig002;
     '003': typeof mig003;
+    '004': typeof mig004;
 };
 export default _default;
 //# sourceMappingURL=index.d.ts.map

package/dist/account-manager/db/migrations/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/account-manager/db/migrations/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,YAAY,CAAA;AACpC,OAAO,KAAK,MAAM,MAAM,4BAA4B,CAAA;AACpD,OAAO,KAAK,MAAM,MAAM,gCAAgC,CAAA;;;;;;AAExD,wBAIC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/account-manager/db/migrations/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,YAAY,CAAA;AACpC,OAAO,KAAK,MAAM,MAAM,4BAA4B,CAAA;AACpD,OAAO,KAAK,MAAM,MAAM,gCAAgC,CAAA;AACxD,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;;;;;;;AAErC,wBAKC"}

package/dist/account-manager/db/migrations/index.js

@@ -26,9 +26,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const mig001 = __importStar(require("./001-init"));
 const mig002 = __importStar(require("./002-account-deactivation"));
 const mig003 = __importStar(require("./003-privileged-app-passwords"));
+const mig004 = __importStar(require("./004-oauth"));
 exports.default = {
     '001': mig001,
     '002': mig002,
     '003': mig003,
+    '004': mig004,
 };
 //# sourceMappingURL=index.js.map

package/dist/account-manager/db/migrations/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/account-manager/db/migrations/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAoC;AACpC,mEAAoD;AACpD,uEAAwD;AAExD,kBAAe;IACb,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;CACd,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/account-manager/db/migrations/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAoC;AACpC,mEAAoD;AACpD,uEAAwD;AACxD,oDAAqC;AAErC,kBAAe;IACb,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;CACd,CAAA"}

package/dist/account-manager/db/schema/authorization-request.d.ts

@@ -0,0 +1,19 @@
+import { Code, DeviceId, OAuthClientId, RequestId } from '@atproto/oauth-provider';
+import { Selectable } from 'kysely';
+import { DateISO, JsonObject } from '../../../db';
+export interface AuthorizationRequest {
+    id: RequestId;
+    did: string | null;
+    deviceId: DeviceId | null;
+    clientId: OAuthClientId;
+    clientAuth: JsonObject;
+    parameters: JsonObject;
+    expiresAt: DateISO;
+    code: Code | null;
+}
+export type AuthorizationRequestEntry = Selectable<AuthorizationRequest>;
+export declare const tableName = "authorization_request";
+export type PartialDB = {
+    [tableName]: AuthorizationRequest;
+};
+//# sourceMappingURL=authorization-request.d.ts.map

package/dist/account-manager/db/schema/authorization-request.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"authorization-request.d.ts","sourceRoot":"","sources":["../../../../src/account-manager/db/schema/authorization-request.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,QAAQ,EACR,aAAa,EACb,SAAS,EACV,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAEjD,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,SAAS,CAAA;IACb,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;IAClB,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAA;IAEzB,QAAQ,EAAE,aAAa,CAAA;IACvB,UAAU,EAAE,UAAU,CAAA;IACtB,UAAU,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,OAAO,CAAA;IAClB,IAAI,EAAE,IAAI,GAAG,IAAI,CAAA;CAClB;AAED,MAAM,MAAM,yBAAyB,GAAG,UAAU,CAAC,oBAAoB,CAAC,CAAA;AAExE,eAAO,MAAM,SAAS,0BAA0B,CAAA;AAEhD,MAAM,MAAM,SAAS,GAAG;IAAE,CAAC,SAAS,CAAC,EAAE,oBAAoB,CAAA;CAAE,CAAA"}

package/dist/account-manager/db/schema/authorization-request.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tableName = void 0;
+exports.tableName = 'authorization_request';
+//# sourceMappingURL=authorization-request.js.map

package/dist/account-manager/db/schema/authorization-request.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"authorization-request.js","sourceRoot":"","sources":["../../../../src/account-manager/db/schema/authorization-request.ts"],"names":[],"mappings":";;;AAuBa,QAAA,SAAS,GAAG,uBAAuB,CAAA"}

package/dist/account-manager/db/schema/device-account.d.ts

@@ -0,0 +1,14 @@
+import { DeviceId } from '@atproto/oauth-provider';
+import { DateISO, JsonArray } from '../../../db';
+export interface DeviceAccount {
+    did: string;
+    deviceId: DeviceId;
+    authenticatedAt: DateISO;
+    authorizedClients: JsonArray;
+    remember: 0 | 1;
+}
+export declare const tableName = "device_account";
+export type PartialDB = {
+    [tableName]: DeviceAccount;
+};
+//# sourceMappingURL=device-account.d.ts.map

package/dist/account-manager/db/schema/device-account.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"device-account.d.ts","sourceRoot":"","sources":["../../../../src/account-manager/db/schema/device-account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEhD,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,EAAE,QAAQ,CAAA;IAElB,eAAe,EAAE,OAAO,CAAA;IACxB,iBAAiB,EAAE,SAAS,CAAA;IAC5B,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAA;CAChB;AAED,eAAO,MAAM,SAAS,mBAAmB,CAAA;AAEzC,MAAM,MAAM,SAAS,GAAG;IAAE,CAAC,SAAS,CAAC,EAAE,aAAa,CAAA;CAAE,CAAA"}

package/dist/account-manager/db/schema/device-account.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tableName = void 0;
+exports.tableName = 'device_account';
+//# sourceMappingURL=device-account.js.map

package/dist/account-manager/db/schema/device-account.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"device-account.js","sourceRoot":"","sources":["../../../../src/account-manager/db/schema/device-account.ts"],"names":[],"mappings":";;;AAYa,QAAA,SAAS,GAAG,gBAAgB,CAAA"}

package/dist/account-manager/db/schema/device.d.ts

@@ -0,0 +1,16 @@
+import { DeviceId, SessionId } from '@atproto/oauth-provider';
+import { Selectable } from 'kysely';
+import { DateISO } from '../../../db';
+export interface Device {
+    id: DeviceId;
+    sessionId: SessionId;
+    userAgent: string | null;
+    ipAddress: string;
+    lastSeenAt: DateISO;
+}
+export type DeviceEntry = Selectable<Device>;
+export declare const tableName = "device";
+export type PartialDB = {
+    [tableName]: Device;
+};
+//# sourceMappingURL=device.d.ts.map

package/dist/account-manager/db/schema/device.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../../../src/account-manager/db/schema/device.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAErC,MAAM,WAAW,MAAM;IACrB,EAAE,EAAE,QAAQ,CAAA;IACZ,SAAS,EAAE,SAAS,CAAA;IAEpB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,OAAO,CAAA;CACpB;AAED,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,CAAA;AAE5C,eAAO,MAAM,SAAS,WAAW,CAAA;AAEjC,MAAM,MAAM,SAAS,GAAG;IAAE,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA"}

package/dist/account-manager/db/schema/device.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tableName = void 0;
+exports.tableName = 'device';
+//# sourceMappingURL=device.js.map

package/dist/account-manager/db/schema/device.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"device.js","sourceRoot":"","sources":["../../../../src/account-manager/db/schema/device.ts"],"names":[],"mappings":";;;AAea,QAAA,SAAS,GAAG,QAAQ,CAAA"}

package/dist/account-manager/db/schema/index.d.ts

@@ -1,13 +1,23 @@
 import * as actor from './actor';
 import * as account from './account';
+import * as device from './device';
+import * as deviceAccount from './device-account';
+import * as oauthRequest from './authorization-request';
+import * as token from './token';
+import * as usedRefreshToken from './used-refresh-token';
 import * as repoRoot from './repo-root';
 import * as refreshToken from './refresh-token';
 import * as appPassword from './app-password';
 import * as inviteCode from './invite-code';
 import * as emailToken from './email-token';
-export type DatabaseSchema = actor.PartialDB & account.PartialDB & refreshToken.PartialDB & appPassword.PartialDB & repoRoot.PartialDB & inviteCode.PartialDB & emailToken.PartialDB;
+export type DatabaseSchema = actor.PartialDB & account.PartialDB & device.PartialDB & deviceAccount.PartialDB & oauthRequest.PartialDB & token.PartialDB & usedRefreshToken.PartialDB & refreshToken.PartialDB & appPassword.PartialDB & repoRoot.PartialDB & inviteCode.PartialDB & emailToken.PartialDB;
 export type { Actor, ActorEntry } from './actor';
 export type { Account, AccountEntry } from './account';
+export type { Device } from './device';
+export type { DeviceAccount } from './device-account';
+export type { AuthorizationRequest } from './authorization-request';
+export type { Token } from './token';
+export type { UsedRefreshToken } from './used-refresh-token';
 export type { RepoRoot } from './repo-root';
 export type { RefreshToken } from './refresh-token';
 export type { AppPassword } from './app-password';

package/dist/account-manager/db/schema/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/account-manager/db/schema/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,SAAS,CAAA;AAChC,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AACpC,OAAO,KAAK,QAAQ,MAAM,aAAa,CAAA;AACvC,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,WAAW,MAAM,gBAAgB,CAAA;AAC7C,OAAO,KAAK,UAAU,MAAM,eAAe,CAAA;AAC3C,OAAO,KAAK,UAAU,MAAM,eAAe,CAAA;AAE3C,MAAM,MAAM,cAAc,GAAG,KAAK,CAAC,SAAS,GAC1C,OAAO,CAAC,SAAS,GACjB,YAAY,CAAC,SAAS,GACtB,WAAW,CAAC,SAAS,GACrB,QAAQ,CAAC,SAAS,GAClB,UAAU,CAAC,SAAS,GACpB,UAAU,CAAC,SAAS,CAAA;AAEtB,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAChD,YAAY,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACtD,YAAY,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAC3C,YAAY,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AACnD,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACjD,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC9D,YAAY,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/account-manager/db/schema/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,SAAS,CAAA;AAChC,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AACpC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAA;AAClC,OAAO,KAAK,aAAa,MAAM,kBAAkB,CAAA;AACjD,OAAO,KAAK,YAAY,MAAM,yBAAyB,CAAA;AACvD,OAAO,KAAK,KAAK,MAAM,SAAS,CAAA;AAChC,OAAO,KAAK,gBAAgB,MAAM,sBAAsB,CAAA;AACxD,OAAO,KAAK,QAAQ,MAAM,aAAa,CAAA;AACvC,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,WAAW,MAAM,gBAAgB,CAAA;AAC7C,OAAO,KAAK,UAAU,MAAM,eAAe,CAAA;AAC3C,OAAO,KAAK,UAAU,MAAM,eAAe,CAAA;AAE3C,MAAM,MAAM,cAAc,GAAG,KAAK,CAAC,SAAS,GAC1C,OAAO,CAAC,SAAS,GACjB,MAAM,CAAC,SAAS,GAChB,aAAa,CAAC,SAAS,GACvB,YAAY,CAAC,SAAS,GACtB,KAAK,CAAC,SAAS,GACf,gBAAgB,CAAC,SAAS,GAC1B,YAAY,CAAC,SAAS,GACtB,WAAW,CAAC,SAAS,GACrB,QAAQ,CAAC,SAAS,GAClB,UAAU,CAAC,SAAS,GACpB,UAAU,CAAC,SAAS,CAAA;AAEtB,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAChD,YAAY,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACtD,YAAY,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACtC,YAAY,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AACrD,YAAY,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AACnE,YAAY,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AACpC,YAAY,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,YAAY,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAC3C,YAAY,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AACnD,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACjD,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC9D,YAAY,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA"}

package/dist/account-manager/db/schema/token.d.ts

@@ -0,0 +1,24 @@
+import { Code, DeviceId, OAuthClientId, RefreshToken, Sub, TokenId } from '@atproto/oauth-provider';
+import { Generated, Selectable } from 'kysely';
+import { DateISO, JsonArray, JsonObject } from '../../../db/cast';
+export interface Token {
+    id: Generated<number>;
+    did: Sub;
+    tokenId: TokenId;
+    createdAt: DateISO;
+    updatedAt: DateISO;
+    expiresAt: DateISO;
+    clientId: OAuthClientId;
+    clientAuth: JsonObject;
+    deviceId: DeviceId | null;
+    parameters: JsonObject;
+    details: JsonArray | null;
+    code: Code | null;
+    currentRefreshToken: RefreshToken | null;
+}
+export type TokenEntry = Selectable<Token>;
+export declare const tableName = "token";
+export type PartialDB = {
+    [tableName]: Token;
+};
+//# sourceMappingURL=token.d.ts.map

package/dist/account-manager/db/schema/token.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../../src/account-manager/db/schema/token.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,QAAQ,EACR,aAAa,EACb,YAAY,EACZ,GAAG,EACH,OAAO,EACR,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAE9C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAEjE,MAAM,WAAW,KAAK;IACpB,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,CAAA;IACrB,GAAG,EAAE,GAAG,CAAA;IAER,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,OAAO,CAAA;IAClB,SAAS,EAAE,OAAO,CAAA;IAClB,SAAS,EAAE,OAAO,CAAA;IAClB,QAAQ,EAAE,aAAa,CAAA;IACvB,UAAU,EAAE,UAAU,CAAA;IACtB,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAA;IACzB,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,SAAS,GAAG,IAAI,CAAA;IACzB,IAAI,EAAE,IAAI,GAAG,IAAI,CAAA;IACjB,mBAAmB,EAAE,YAAY,GAAG,IAAI,CAAA;CACzC;AAED,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;AAE1C,eAAO,MAAM,SAAS,UAAU,CAAA;AAEhC,MAAM,MAAM,SAAS,GAAG;IAAE,CAAC,SAAS,CAAC,EAAE,KAAK,CAAA;CAAE,CAAA"}

package/dist/account-manager/db/schema/token.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tableName = void 0;
+exports.tableName = 'token';
+//# sourceMappingURL=token.js.map

package/dist/account-manager/db/schema/token.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../../src/account-manager/db/schema/token.ts"],"names":[],"mappings":";;;AA+Ba,QAAA,SAAS,GAAG,OAAO,CAAA"}

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

@@ -0,0 +1,12 @@
+import { RefreshToken } from '@atproto/oauth-provider';
+import { Selectable } from 'kysely';
+export interface UsedRefreshToken {
+    tokenId: number;
+    refreshToken: RefreshToken;
+}
+export type UsedRefreshTokenEntry = Selectable<UsedRefreshToken>;
+export declare const tableName = "used_refresh_token";
+export type PartialDB = {
+    [tableName]: UsedRefreshToken;
+};
+//# sourceMappingURL=used-refresh-token.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"used-refresh-token.d.ts","sourceRoot":"","sources":["../../../../src/account-manager/db/schema/used-refresh-token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAEnC,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,YAAY,CAAA;CAC3B;AAED,MAAM,MAAM,qBAAqB,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAA;AAEhE,eAAO,MAAM,SAAS,uBAAuB,CAAA;AAE7C,MAAM,MAAM,SAAS,GAAG;IAAE,CAAC,SAAS,CAAC,EAAE,gBAAgB,CAAA;CAAE,CAAA"}

package/dist/account-manager/db/schema/used-refresh-token.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tableName = void 0;
+exports.tableName = 'used_refresh_token';
+//# sourceMappingURL=used-refresh-token.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"used-refresh-token.js","sourceRoot":"","sources":["../../../../src/account-manager/db/schema/used-refresh-token.ts"],"names":[],"mappings":";;;AAUa,QAAA,SAAS,GAAG,oBAAoB,CAAA"}

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

@@ -6,8 +6,6 @@ export type ActorAccount = ActorEntry & {
     email: string | null;
     emailConfirmedAt: string | null;
     invitesDisabled: 0 | 1 | null;
-    active: boolean;
-    status?: AccountStatus;
 };
 export type AvailabilityFlags = {
     includeTakenDown?: boolean;
@@ -20,6 +18,21 @@ export declare enum AccountStatus {
     Deleted = "deleted",
     Deactivated = "deactivated"
 }
+export declare const selectAccountQB: (db: AccountDb, flags?: AvailabilityFlags) => import("kysely/dist/cjs/parser/select-parser").QueryBuilderWithSelection<{
+    account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
+    token: import("../db").Token;
+    actor: import("../db").Actor;
+    device: import("../db").Device;
+    device_account: import("../db").DeviceAccount;
+    authorization_request: import("../db").AuthorizationRequest;
+    used_refresh_token: import("../db").UsedRefreshToken;
+    repo_root: import("../db").RepoRoot;
+    refresh_token: import("../db").RefreshToken;
+    app_password: import("../db").AppPassword;
+    invite_code: import("../db").InviteCode;
+    invite_code_use: import("../db").InviteCodeUse;
+    email_token: import("../db").EmailToken;
+}, "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 getAccountByEmail: (db: AccountDb, email: string, flags?: AvailabilityFlags) => Promise<ActorAccount | null>;
 export declare const registerActor: (db: AccountDb, opts: {
@@ -43,11 +56,20 @@ export declare const getAccountAdminStatus: (db: AccountDb, did: string) => Prom
 export declare const updateAccountTakedownStatus: (db: AccountDb, did: string, takedown: StatusAttr) => Promise<void>;
 export declare const deactivateAccount: (db: AccountDb, did: string, deleteAfter: string | null) => Promise<void>;
 export declare const activateAccount: (db: AccountDb, did: string) => Promise<void>;
-export declare const formatAccountStatus: (account: {
+export declare const formatAccountStatus: (account: null | {
     takedownRef: string | null;
     deactivatedAt: string | null;
 }) => {
-    active: boolean;
-    status?: AccountStatus;
+    readonly active: false;
+    readonly status: AccountStatus.Deleted;
+} | {
+    readonly active: false;
+    readonly status: AccountStatus.Takendown;
+} | {
+    readonly active: false;
+    readonly status: AccountStatus.Deactivated;
+} | {
+    readonly active: true;
+    readonly status: undefined;
 };
 //# sourceMappingURL=account.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/account.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAA;AAGvE,qBAAa,sBAAuB,SAAQ,KAAK;CAAG;AAEpD,MAAM,MAAM,YAAY,GAAG,UAAU,GAAG;IACtC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,eAAe,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,CAAA;IAC7B,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,CAAC,EAAE,aAAa,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC7B,CAAA;AAED,oBAAY,aAAa;IACvB,MAAM,WAAW;IACjB,SAAS,cAAc;IACvB,SAAS,cAAc;IACvB,OAAO,YAAY;IACnB,WAAW,gBAAgB;CAC5B;AAyBD,eAAO,MAAM,UAAU,+BAER,MAAM,UACX,iBAAiB,KACxB,QAAQ,YAAY,GAAG,IAAI,CAW7B,CAAA;AAED,eAAO,MAAM,iBAAiB,yBAErB,MAAM,UACL,iBAAiB,KACxB,QAAQ,YAAY,GAAG,IAAI,CAK7B,CAAA;AAED,eAAO,MAAM,aAAa,wBAElB;IACJ,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB,kBAqBF,CAAA;AAED,eAAO,MAAM,eAAe,wBAEpB;IACJ,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;IACb,cAAc,EAAE,MAAM,CAAA;CACvB,kBAiBF,CAAA;AAED,eAAO,MAAM,aAAa,uBAEnB,MAAM,KACV,QAAQ,IAAI,CAkBd,CAAA;AAED,eAAO,MAAM,YAAY,uBAElB,MAAM,UACH,MAAM,kBAcf,CAAA;AAED,eAAO,MAAM,WAAW,uBAEjB,MAAM,SACJ,MAAM,kBAkBd,CAAA;AAED,eAAO,MAAM,mBAAmB,uBAEzB,MAAM,oBACO,MAAM,kBAQzB,CAAA;AAED,eAAO,MAAM,qBAAqB,uBAE3B,MAAM,KACV,QAAQ;IAAE,QAAQ,EAAE,UAAU,CAAC;IAAC,WAAW,EAAE,UAAU,CAAA;CAAE,GAAG,IAAI,CAYlE,CAAA;AAED,eAAO,MAAM,2BAA2B,uBAEjC,MAAM,YACD,UAAU,kBAQrB,CAAA;AAED,eAAO,MAAM,iBAAiB,uBAEvB,MAAM,eACE,MAAM,GAAG,IAAI,kBAW3B,CAAA;AAED,eAAO,MAAM,eAAe,uBAA8B,MAAM,kBAU/D,CAAA;AAED,eAAO,MAAM,mBAAmB,YAAa;IAC3C,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;CAC7B,KAAG;IACF,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,CAAC,EAAE,aAAa,CAAA;CAavB,CAAA"}
+{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/account.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAA;AAGvE,qBAAa,sBAAuB,SAAQ,KAAK;CAAG;AAEpD,MAAM,MAAM,YAAY,GAAG,UAAU,GAAG;IACtC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,eAAe,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC7B,CAAA;AAED,oBAAY,aAAa;IACvB,MAAM,WAAW;IACjB,SAAS,cAAc;IACvB,SAAS,cAAc;IACvB,OAAO,YAAY;IACnB,WAAW,gBAAgB;CAC5B;AAED,eAAO,MAAM,eAAe,0BAA2B,iBAAiB;;;;;;;;;;;;;;oUAqBvE,CAAA;AAED,eAAO,MAAM,UAAU,+BAER,MAAM,UACX,iBAAiB,KACxB,QAAQ,YAAY,GAAG,IAAI,CAW7B,CAAA;AAED,eAAO,MAAM,iBAAiB,yBAErB,MAAM,UACL,iBAAiB,KACxB,QAAQ,YAAY,GAAG,IAAI,CAK7B,CAAA;AAED,eAAO,MAAM,aAAa,wBAElB;IACJ,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB,kBAqBF,CAAA;AAED,eAAO,MAAM,eAAe,wBAEpB;IACJ,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;IACb,cAAc,EAAE,MAAM,CAAA;CACvB,kBAiBF,CAAA;AAED,eAAO,MAAM,aAAa,uBAEnB,MAAM,KACV,QAAQ,IAAI,CAkBd,CAAA;AAED,eAAO,MAAM,YAAY,uBAElB,MAAM,UACH,MAAM,kBAcf,CAAA;AAED,eAAO,MAAM,WAAW,uBAEjB,MAAM,SACJ,MAAM,kBAkBd,CAAA;AAED,eAAO,MAAM,mBAAmB,uBAEzB,MAAM,oBACO,MAAM,kBAQzB,CAAA;AAED,eAAO,MAAM,qBAAqB,uBAE3B,MAAM,KACV,QAAQ;IAAE,QAAQ,EAAE,UAAU,CAAC;IAAC,WAAW,EAAE,UAAU,CAAA;CAAE,GAAG,IAAI,CAYlE,CAAA;AAED,eAAO,MAAM,2BAA2B,uBAEjC,MAAM,YACD,UAAU,kBAQrB,CAAA;AAED,eAAO,MAAM,iBAAiB,uBAEvB,MAAM,eACE,MAAM,GAAG,IAAI,kBAW3B,CAAA;AAED,eAAO,MAAM,eAAe,uBAA8B,MAAM,kBAU/D,CAAA;AAED,eAAO,MAAM,mBAAmB,YACrB,IAAI,GAAG;IACd,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;CAC7B;;;;;;;;;;;;CAWF,CAAA"}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatAccountStatus = exports.activateAccount = exports.deactivateAccount = exports.updateAccountTakedownStatus = exports.getAccountAdminStatus = exports.setEmailConfirmedAt = exports.updateEmail = exports.updateHandle = exports.deleteAccount = exports.registerAccount = exports.registerActor = exports.getAccountByEmail = exports.getAccount = exports.AccountStatus = exports.UserAlreadyExistsError = void 0;
+exports.formatAccountStatus = exports.activateAccount = exports.deactivateAccount = exports.updateAccountTakedownStatus = exports.getAccountAdminStatus = exports.setEmailConfirmedAt = exports.updateEmail = exports.updateHandle = exports.deleteAccount = exports.registerAccount = exports.registerActor = exports.getAccountByEmail = exports.getAccount = exports.selectAccountQB = exports.AccountStatus = exports.UserAlreadyExistsError = void 0;
 const db_1 = require("../../db");
 const common_1 = require("@atproto/common");
 class UserAlreadyExistsError extends Error {
@@ -34,8 +34,9 @@ const selectAccountQB = (db, flags) => {
         'account.invitesDisabled',
     ]);
 };
+exports.selectAccountQB = selectAccountQB;
 const getAccount = async (db, handleOrDid, flags) => {
-    const found = await selectAccountQB(db, flags)
+    const found = await (0, exports.selectAccountQB)(db, flags)
         .where((qb) => {
         if (handleOrDid.startsWith('did:')) {
             return qb.where('actor.did', '=', handleOrDid);
@@ -45,14 +46,14 @@ const getAccount = async (db, handleOrDid, flags) => {
         }
     })
         .executeTakeFirst();
-    return found ? { ...found, ...(0, exports.formatAccountStatus)(found) } : null;
+    return found || null;
 };
 exports.getAccount = getAccount;
 const getAccountByEmail = async (db, email, flags) => {
-    const found = await selectAccountQB(db, flags)
+    const found = await (0, exports.selectAccountQB)(db, flags)
         .where('email', '=', email.toLowerCase())
         .executeTakeFirst();
-    return found ? { ...found, ...(0, exports.formatAccountStatus)(found) } : null;
+    return found || null;
 };
 exports.getAccountByEmail = getAccountByEmail;
 const registerActor = async (db, opts) => {
@@ -180,18 +181,18 @@ const activateAccount = async (db, did) => {
 };
 exports.activateAccount = activateAccount;
 const formatAccountStatus = (account) => {
-    let status = undefined;
-    if (account.takedownRef) {
-        status = AccountStatus.Takendown;
+    if (!account) {
+        return { active: false, status: AccountStatus.Deleted };
+    }
+    else if (account.takedownRef) {
+        return { active: false, status: AccountStatus.Takendown };
     }
     else if (account.deactivatedAt) {
-        status = AccountStatus.Deactivated;
+        return { active: false, status: AccountStatus.Deactivated };
+    }
+    else {
+        return { active: true, status: undefined };
     }
-    const active = !status;
-    return {
-        active,
-        status,
-    };
 };
 exports.formatAccountStatus = formatAccountStatus;
 //# sourceMappingURL=account.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"account.js","sourceRoot":"","sources":["../../../src/account-manager/helpers/account.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"account.js","sourceRoot":"","sources":["../../../src/account-manager/helpers/account.ts"],"names":[],"mappings":";;;AAAA,iCAAqE;AAGrE,4CAAqC;AAErC,MAAa,sBAAuB,SAAQ,KAAK;CAAG;AAApD,wDAAoD;AAapD,IAAY,aAMX;AAND,WAAY,aAAa;IACvB,kCAAiB,CAAA;IACjB,wCAAuB,CAAA;IACvB,wCAAuB,CAAA;IACvB,oCAAmB,CAAA;IACnB,4CAA2B,CAAA;AAC7B,CAAC,EANW,aAAa,6BAAb,aAAa,QAMxB;AAEM,MAAM,eAAe,GAAG,CAAC,EAAa,EAAE,KAAyB,EAAE,EAAE;IAC1E,MAAM,EAAE,gBAAgB,GAAG,KAAK,EAAE,kBAAkB,GAAG,KAAK,EAAE,GAAG,KAAK,IAAI,EAAE,CAAA;IAC5E,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,CAAA;IAC7B,OAAO,EAAE,CAAC,EAAE;SACT,UAAU,CAAC,OAAO,CAAC;SACnB,QAAQ,CAAC,SAAS,EAAE,WAAW,EAAE,aAAa,CAAC;SAC/C,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,IAAA,yBAAoB,EAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;SAC3E,EAAE,CAAC,CAAC,kBAAkB,EAAE,CAAC,EAAE,EAAE,EAAE,CAC9B,EAAE,CAAC,KAAK,CAAC,qBAAqB,EAAE,IAAI,EAAE,IAAI,CAAC,CAC5C;SACA,MAAM,CAAC;QACN,WAAW;QACX,cAAc;QACd,iBAAiB;QACjB,mBAAmB;QACnB,qBAAqB;QACrB,mBAAmB;QACnB,eAAe;QACf,0BAA0B;QAC1B,yBAAyB;KAC1B,CAAC,CAAA;AACN,CAAC,CAAA;AArBY,QAAA,eAAe,mBAqB3B;AAEM,MAAM,UAAU,GAAG,KAAK,EAC7B,EAAa,EACb,WAAmB,EACnB,KAAyB,EACK,EAAE;IAChC,MAAM,KAAK,GAAG,MAAM,IAAA,uBAAe,EAAC,EAAE,EAAE,KAAK,CAAC;SAC3C,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;QACZ,IAAI,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YACnC,OAAO,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,WAAW,CAAC,CAAA;QAChD,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,WAAW,CAAC,CAAA;QACnD,CAAC;IACH,CAAC,CAAC;SACD,gBAAgB,EAAE,CAAA;IACrB,OAAO,KAAK,IAAI,IAAI,CAAA;AACtB,CAAC,CAAA;AAfY,QAAA,UAAU,cAetB;AAEM,MAAM,iBAAiB,GAAG,KAAK,EACpC,EAAa,EACb,KAAa,EACb,KAAyB,EACK,EAAE;IAChC,MAAM,KAAK,GAAG,MAAM,IAAA,uBAAe,EAAC,EAAE,EAAE,KAAK,CAAC;SAC3C,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC;SACxC,gBAAgB,EAAE,CAAA;IACrB,OAAO,KAAK,IAAI,IAAI,CAAA;AACtB,CAAC,CAAA;AATY,QAAA,iBAAiB,qBAS7B;AAEM,MAAM,aAAa,GAAG,KAAK,EAChC,EAAa,EACb,IAIC,EACD,EAAE;IACF,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAA;IACzC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IACtB,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAA;IAC7C,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,EAAE,CAAC,gBAAgB,CAC5C,EAAE,CAAC,EAAE;SACF,UAAU,CAAC,OAAO,CAAC;SACnB,MAAM,CAAC;QACN,GAAG;QACH,MAAM;QACN,SAAS;QACT,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI;QAC7C,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,GAAG,CAAC,GAAG,YAAG,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI;KACxE,CAAC;SACD,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;SAClC,SAAS,CAAC,KAAK,CAAC,CACpB,CAAA;IACD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,sBAAsB,EAAE,CAAA;IACpC,CAAC;AACH,CAAC,CAAA;AA3BY,QAAA,aAAa,iBA2BzB;AAEM,MAAM,eAAe,GAAG,KAAK,EAClC,EAAa,EACb,IAIC,EACD,EAAE;IACF,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,IAAI,CAAA;IAC3C,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,EAAE,CAAC,gBAAgB,CAC5C,EAAE,CAAC,EAAE;SACF,UAAU,CAAC,SAAS,CAAC;SACrB,MAAM,CAAC;QACN,GAAG;QACH,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE;QAC1B,cAAc;KACf,CAAC;SACD,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;SAClC,SAAS,CAAC,KAAK,CAAC,CACpB,CAAA;IACD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,sBAAsB,EAAE,CAAA;IACpC,CAAC;AACH,CAAC,CAAA;AAvBY,QAAA,eAAe,mBAuB3B;AAEM,MAAM,aAAa,GAAG,KAAK,EAChC,EAAa,EACb,GAAW,EACI,EAAE;IACjB,6EAA6E;IAC7E,2DAA2D;IAC3D,MAAM,EAAE,CAAC,gBAAgB,CACvB,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CACrD,CAAA;IACD,MAAM,EAAE,CAAC,gBAAgB,CACvB,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CACvD,CAAA;IACD,MAAM,EAAE,CAAC,gBAAgB,CACvB,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CACzD,CAAA;IACD,MAAM,EAAE,CAAC,gBAAgB,CACvB,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE,GAAG,CAAC,CAC3D,CAAA;IACD,MAAM,EAAE,CAAC,gBAAgB,CACvB,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,CAAC,CACvD,CAAA;AACH,CAAC,CAAA;AArBY,QAAA,aAAa,iBAqBzB;AAEM,MAAM,YAAY,GAAG,KAAK,EAC/B,EAAa,EACb,GAAW,EACX,MAAc,EACd,EAAE;IACF,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,EAAE,CAAC,gBAAgB,CACrC,EAAE,CAAC,EAAE;SACF,WAAW,CAAC,OAAO,CAAC;SACpB,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;SACf,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC;SACtB,cAAc,CACb,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,SAAS,EAAE,CACnE,CACJ,CAAA;IACD,IAAI,GAAG,CAAC,cAAc,GAAG,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,sBAAsB,EAAE,CAAA;IACpC,CAAC;AACH,CAAC,CAAA;AAjBY,QAAA,YAAY,gBAiBxB;AAEM,MAAM,WAAW,GAAG,KAAK,EAC9B,EAAa,EACb,GAAW,EACX,KAAa,EACb,EAAE;IACF,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,gBAAgB,CACvB,EAAE,CAAC,EAAE;aACF,WAAW,CAAC,SAAS,CAAC;aACtB,GAAG,CAAC;YACH,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE;YAC1B,gBAAgB,EAAE,IAAI;SACvB,CAAC;aACD,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAC1B,CAAA;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,IAAA,yBAAoB,EAAC,GAAG,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,sBAAsB,EAAE,CAAA;QACpC,CAAC;QACD,MAAM,GAAG,CAAA;IACX,CAAC;AACH,CAAC,CAAA;AArBY,QAAA,WAAW,eAqBvB;AAEM,MAAM,mBAAmB,GAAG,KAAK,EACtC,EAAa,EACb,GAAW,EACX,gBAAwB,EACxB,EAAE;IACF,MAAM,EAAE,CAAC,gBAAgB,CACvB,EAAE,CAAC,EAAE;SACF,WAAW,CAAC,SAAS,CAAC;SACtB,GAAG,CAAC,EAAE,gBAAgB,EAAE,CAAC;SACzB,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAC1B,CAAA;AACH,CAAC,CAAA;AAXY,QAAA,mBAAmB,uBAW/B;AAEM,MAAM,qBAAqB,GAAG,KAAK,EACxC,EAAa,EACb,GAAW,EACwD,EAAE;IACrE,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,EAAE;SACpB,UAAU,CAAC,OAAO,CAAC;SACnB,MAAM,CAAC,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;SACxC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC;SACtB,gBAAgB,EAAE,CAAA;IACrB,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAA;IACrB,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW;QAC9B,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,WAAW,EAAE;QACzC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA;IACtB,MAAM,WAAW,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA;IAC9E,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAA;AAClC,CAAC,CAAA;AAfY,QAAA,qBAAqB,yBAejC;AAEM,MAAM,2BAA2B,GAAG,KAAK,EAC9C,EAAa,EACb,GAAW,EACX,QAAoB,EACpB,EAAE;IACF,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO;QAClC,CAAC,CAAC,QAAQ,CAAC,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QAC1C,CAAC,CAAC,IAAI,CAAA;IACR,MAAM,EAAE,CAAC,gBAAgB,CACvB,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CACvE,CAAA;AACH,CAAC,CAAA;AAXY,QAAA,2BAA2B,+BAWvC;AAEM,MAAM,iBAAiB,GAAG,KAAK,EACpC,EAAa,EACb,GAAW,EACX,WAA0B,EAC1B,EAAE;IACF,MAAM,EAAE,CAAC,gBAAgB,CACvB,EAAE,CAAC,EAAE;SACF,WAAW,CAAC,OAAO,CAAC;SACpB,GAAG,CAAC;QACH,aAAa,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACvC,WAAW;KACZ,CAAC;SACD,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAC1B,CAAA;AACH,CAAC,CAAA;AAdY,QAAA,iBAAiB,qBAc7B;AAEM,MAAM,eAAe,GAAG,KAAK,EAAE,EAAa,EAAE,GAAW,EAAE,EAAE;IAClE,MAAM,EAAE,CAAC,gBAAgB,CACvB,EAAE,CAAC,EAAE;SACF,WAAW,CAAC,OAAO,CAAC;SACpB,GAAG,CAAC;QACH,aAAa,EAAE,IAAI;QACnB,WAAW,EAAE,IAAI;KAClB,CAAC;SACD,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAC1B,CAAA;AACH,CAAC,CAAA;AAVY,QAAA,eAAe,mBAU3B;AAEM,MAAM,mBAAmB,GAAG,CACjC,OAGC,EACD,EAAE;IACF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,CAAC,OAAO,EAAW,CAAA;IAClE,CAAC;SAAM,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;QAC/B,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,CAAC,SAAS,EAAW,CAAA;IACpE,CAAC;SAAM,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;QACjC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,CAAC,WAAW,EAAW,CAAA;IACtE,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAW,CAAA;IACrD,CAAC;AACH,CAAC,CAAA;AAfY,QAAA,mBAAmB,uBAe/B"}

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

@@ -0,0 +1,12 @@
+import { Code, FoundRequestResult, RequestData, RequestId, UpdateRequestData } from '@atproto/oauth-provider';
+import { AccountDb, AuthorizationRequest } from '../db';
+import { Selectable } from 'kysely';
+export declare const rowToRequestData: (row: Selectable<AuthorizationRequest>) => RequestData;
+export declare const rowToFoundRequestResult: (row: Selectable<AuthorizationRequest>) => FoundRequestResult;
+export declare const createQB: (db: AccountDb, id: RequestId, data: RequestData) => import("kysely").InsertQueryBuilder<import("../db").DatabaseSchema, "authorization_request", import("kysely").InsertResult>;
+export declare const readQB: (db: AccountDb, id: RequestId) => import("kysely/dist/cjs/parser/select-parser").SelectAllQueryBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../db").DatabaseSchema, "authorization_request">, "authorization_request", {}, "authorization_request">;
+export declare const updateQB: (db: AccountDb, id: RequestId, { code, sub, deviceId, expiresAt }: UpdateRequestData) => import("kysely").UpdateQueryBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../db").DatabaseSchema, "authorization_request">, "authorization_request", "authorization_request", import("kysely").UpdateResult>;
+export declare const removeOldExpiredQB: (db: AccountDb, delay?: number) => import("kysely").DeleteQueryBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../db").DatabaseSchema, "authorization_request">, "authorization_request", import("kysely").DeleteResult>;
+export declare const removeByIdQB: (db: AccountDb, id: RequestId) => import("kysely").DeleteQueryBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../db").DatabaseSchema, "authorization_request">, "authorization_request", import("kysely").DeleteResult>;
+export declare const findByCodeQB: (db: AccountDb, code: Code) => import("kysely/dist/cjs/parser/select-parser").SelectAllQueryBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../db").DatabaseSchema, "authorization_request">, "authorization_request", {}, "authorization_request">;
+//# sourceMappingURL=authorization-request.d.ts.map

package/dist/account-manager/helpers/authorization-request.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"authorization-request.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/authorization-request.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,kBAAkB,EAClB,WAAW,EACX,SAAS,EACT,iBAAiB,EAClB,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAA;AAEvD,OAAO,EAAc,UAAU,EAAE,MAAM,QAAQ,CAAA;AAE/C,eAAO,MAAM,gBAAgB,QACtB,WAAW,oBAAoB,CAAC,KACpC,WAQD,CAAA;AAEF,eAAO,MAAM,uBAAuB,QAC7B,WAAW,oBAAoB,CAAC,KACpC,kBAGD,CAAA;AAiBF,eAAO,MAAM,QAAQ,sBAAuB,SAAS,QAAQ,WAAW,gIACM,CAAA;AAE9E,eAAO,MAAM,MAAM,sBAAuB,SAAS,4OACyB,CAAA;AAE5E,eAAO,MAAM,QAAQ,sBAEf,SAAS,sCACuB,iBAAiB,sOAQ9B,CAAA;AAEzB,eAAO,MAAM,kBAAkB,6OAMsC,CAAA;AAErE,eAAO,MAAM,YAAY,sBAAuB,SAAS,6MACO,CAAA;AAEhE,eAAO,MAAM,YAAY,wBAAyB,IAAI,4OAMtC,CAAA"}