@atproto/pds 0.3.0 → 0.3.2

package/dist/lexicon/lexicons.d.ts

@@ -1670,6 +1670,8 @@ export declare const schemaDict: {
                             };
                             reason: {
                                 type: string;
+                                maxGraphemes: number;
+                                maxLength: number;
                             };
                             subject: {
                                 type: string;
@@ -2756,6 +2758,9 @@ export declare const schemaDict: {
                             emailConfirmed: {
                                 type: string;
                             };
+                            didDoc: {
+                                type: string;
+                            };
                         };
                     };
                 };
@@ -2914,6 +2919,18 @@ export declare const schemaDict: {
             main: {
                 type: string;
                 description: string;
+                input: {
+                    encoding: string;
+                    schema: {
+                        type: string;
+                        properties: {
+                            did: {
+                                type: string;
+                                description: string;
+                            };
+                        };
+                    };
+                };
                 output: {
                     encoding: string;
                     schema: {

package/dist/lexicon/types/com/atproto/server/createAccount.d.ts

@@ -3,13 +3,13 @@ import { HandlerAuth } from '@atproto/xrpc-server';
 export interface QueryParams {
 }
 export interface InputSchema {
-    email: string;
+    email?: string;
     handle: string;
     did?: string;
     inviteCode?: string;
-    password: string;
+    password?: string;
     recoveryKey?: string;
-    plcOp?: Uint8Array;
+    plcOp?: {};
     [k: string]: unknown;
 }
 export interface OutputSchema {

package/dist/lexicon/types/com/atproto/server/getSession.d.ts

@@ -8,6 +8,7 @@ export interface OutputSchema {
     did: string;
     email?: string;
     emailConfirmed?: boolean;
+    didDoc?: {};
     [k: string]: unknown;
 }
 export declare type HandlerInput = undefined;

package/dist/lexicon/types/com/atproto/server/reserveSigningKey.d.ts

@@ -2,12 +2,18 @@ import express from 'express';
 import { HandlerAuth } from '@atproto/xrpc-server';
 export interface QueryParams {
 }
-export declare type InputSchema = undefined;
+export interface InputSchema {
+    did?: string;
+    [k: string]: unknown;
+}
 export interface OutputSchema {
     signingKey: string;
     [k: string]: unknown;
 }
-export declare type HandlerInput = undefined;
+export interface HandlerInput {
+    encoding: 'application/json';
+    body: InputSchema;
+}
 export interface HandlerSuccess {
     encoding: 'application/json';
     body: OutputSchema;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [
@@ -43,16 +43,16 @@
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
     "zod": "^3.21.4",
-    "@atproto/api": "^0.6.21",
-    "@atproto/aws": "^0.1.3",
-    "@atproto/common": "^0.3.2",
-    "@atproto/crypto": "^0.2.2",
-    "@atproto/identity": "^0.3.0",
-    "@atproto/lexicon": "^0.2.3",
-    "@atproto/repo": "^0.3.3",
-    "@atproto/syntax": "^0.1.3",
-    "@atproto/xrpc": "^0.3.3",
-    "@atproto/xrpc-server": "^0.3.3"
+    "@atproto/api": "^0.6.23",
+    "@atproto/aws": "^0.1.4",
+    "@atproto/common": "^0.3.3",
+    "@atproto/crypto": "^0.2.3",
+    "@atproto/identity": "^0.3.1",
+    "@atproto/lexicon": "^0.3.0",
+    "@atproto/repo": "^0.3.4",
+    "@atproto/syntax": "^0.1.4",
+    "@atproto/xrpc": "^0.4.0",
+    "@atproto/xrpc-server": "^0.4.0"
   },
   "devDependencies": {
     "@did-plc/server": "^0.0.1",
@@ -67,10 +67,10 @@
     "@types/sharp": "^0.31.0",
     "axios": "^0.27.2",
     "ws": "^8.12.0",
-    "@atproto/api": "^0.6.21",
-    "@atproto/bsky": "^0.0.12",
-    "@atproto/dev-env": "^0.2.12",
-    "@atproto/lex-cli": "^0.2.3"
+    "@atproto/api": "^0.6.23",
+    "@atproto/bsky": "^0.0.14",
+    "@atproto/dev-env": "^0.2.14",
+    "@atproto/lex-cli": "^0.2.4"
   },
   "scripts": {
     "codegen": "lex gen-server ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/*",

package/src/api/com/atproto/server/createAccount.ts

@@ -21,7 +21,11 @@ export default function (server: Server, ctx: AppContext) {
     },
     handler: async ({ input, req }) => {
       const { email, password, inviteCode } = input.body
-      if (input.body.plcOp) {
+      if (!email) {
+        throw new InvalidRequestError('Missing input: "email"')
+      } else if (!password) {
+        throw new InvalidRequestError('Missing input: "password"')
+      } else if (input.body.plcOp) {
         throw new InvalidRequestError('Unsupported input: "plcOp"')
       }
 

package/src/api/com/atproto/server/getSession.ts

@@ -1,13 +1,17 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import AppContext from '../../../../context'
 import { Server } from '../../../../lexicon'
+import { didDocForSession } from './util'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.getSession({
     auth: ctx.authVerifier.access,
     handler: async ({ auth }) => {
       const did = auth.credentials.did
-      const user = await ctx.services.account(ctx.db).getAccount(did)
+      const [user, didDoc] = await Promise.all([
+        ctx.services.account(ctx.db).getAccount(did),
+        didDocForSession(ctx, did),
+      ])
       if (!user) {
         throw new InvalidRequestError(
           `Could not find user info for account: ${did}`,
@@ -18,6 +22,7 @@ export default function (server: Server, ctx: AppContext) {
         body: {
           handle: user.handle,
           did: user.did,
+          didDoc,
           email: user.email,
           emailConfirmed: !!user.emailConfirmedAt,
         },

package/src/lexicon/lexicons.ts

@@ -1826,6 +1826,8 @@ export const schemaDict = {
               },
               reason: {
                 type: 'string',
+                maxGraphemes: 2000,
+                maxLength: 20000,
               },
               subject: {
                 type: 'union',
@@ -2487,7 +2489,7 @@ export const schemaDict = {
           encoding: 'application/json',
           schema: {
             type: 'object',
-            required: ['handle', 'email', 'password'],
+            required: ['handle'],
             properties: {
               email: {
                 type: 'string',
@@ -2510,7 +2512,7 @@ export const schemaDict = {
                 type: 'string',
               },
               plcOp: {
-                type: 'bytes',
+                type: 'unknown',
               },
             },
           },
@@ -3005,6 +3007,9 @@ export const schemaDict = {
               emailConfirmed: {
                 type: 'boolean',
               },
+              didDoc: {
+                type: 'unknown',
+              },
             },
           },
         },
@@ -3168,6 +3173,18 @@ export const schemaDict = {
       main: {
         type: 'procedure',
         description: 'Reserve a repo signing key for account creation.',
+        input: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            properties: {
+              did: {
+                type: 'string',
+                description: 'The did to reserve a new did:key for',
+              },
+            },
+          },
+        },
         output: {
           encoding: 'application/json',
           schema: {

package/src/lexicon/types/com/atproto/server/createAccount.ts

@@ -11,13 +11,13 @@ import { HandlerAuth } from '@atproto/xrpc-server'
 export interface QueryParams {}
 
 export interface InputSchema {
-  email: string
+  email?: string
   handle: string
   did?: string
   inviteCode?: string
-  password: string
+  password?: string
   recoveryKey?: string
-  plcOp?: Uint8Array
+  plcOp?: {}
   [k: string]: unknown
 }
 

package/src/lexicon/types/com/atproto/server/getSession.ts

@@ -17,6 +17,7 @@ export interface OutputSchema {
   did: string
   email?: string
   emailConfirmed?: boolean
+  didDoc?: {}
   [k: string]: unknown
 }
 

package/src/lexicon/types/com/atproto/server/reserveSigningKey.ts

@@ -10,7 +10,11 @@ import { HandlerAuth } from '@atproto/xrpc-server'
 
 export interface QueryParams {}
 
-export type InputSchema = undefined
+export interface InputSchema {
+  /** The did to reserve a new did:key for */
+  did?: string
+  [k: string]: unknown
+}
 
 export interface OutputSchema {
   /** Public signing key in the form of a did:key. */
@@ -18,7 +22,10 @@ export interface OutputSchema {
   [k: string]: unknown
 }
 
-export type HandlerInput = undefined
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
 
 export interface HandlerSuccess {
   encoding: 'application/json'

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022-2023 Bluesky PBC
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.