@atproto/bsky 0.0.172 → 0.0.173

package/dist/lexicon/types/app/bsky/unspecced/initAgeAssurance.d.ts

@@ -23,6 +23,7 @@ export interface HandlerSuccess {
 export interface HandlerError {
     status: number;
     message?: string;
+    error?: 'InvalidEmail' | 'DidTooLong';
 }
 export type HandlerOutput = HandlerError | HandlerSuccess;
 //# sourceMappingURL=initAgeAssurance.d.ts.map

package/dist/lexicon/types/app/bsky/unspecced/initAgeAssurance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initAgeAssurance.d.ts","sourceRoot":"","sources":["../../../../../../src/lexicon/types/app/bsky/unspecced/initAgeAssurance.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,KAAK,oBAAoB,MAAM,WAAW,CAAA;AAMtD,MAAM,MAAM,WAAW,GAAG,EAAE,CAAA;AAE5B,MAAM,WAAW,WAAW;IAC1B,kEAAkE;IAClE,KAAK,EAAE,MAAM,CAAA;IACb,oFAAoF;IACpF,QAAQ,EAAE,MAAM,CAAA;IAChB,yDAAyD;IACzD,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,MAAM,YAAY,GAAG,oBAAoB,CAAC,iBAAiB,CAAA;AAEjE,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,IAAI,EAAE,WAAW,CAAA;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,IAAI,EAAE,YAAY,CAAA;IAClB,OAAO,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;CACpC;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,MAAM,aAAa,GAAG,YAAY,GAAG,cAAc,CAAA"}
+{"version":3,"file":"initAgeAssurance.d.ts","sourceRoot":"","sources":["../../../../../../src/lexicon/types/app/bsky/unspecced/initAgeAssurance.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,KAAK,oBAAoB,MAAM,WAAW,CAAA;AAMtD,MAAM,MAAM,WAAW,GAAG,EAAE,CAAA;AAE5B,MAAM,WAAW,WAAW;IAC1B,kEAAkE;IAClE,KAAK,EAAE,MAAM,CAAA;IACb,oFAAoF;IACpF,QAAQ,EAAE,MAAM,CAAA;IAChB,yDAAyD;IACzD,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,MAAM,YAAY,GAAG,oBAAoB,CAAC,iBAAiB,CAAA;AAEjE,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,IAAI,EAAE,WAAW,CAAA;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,IAAI,EAAE,YAAY,CAAA;IAClB,OAAO,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;CACpC;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,cAAc,GAAG,YAAY,CAAA;CACtC;AAED,MAAM,MAAM,aAAa,GAAG,YAAY,GAAG,cAAc,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.172",
+  "version": "0.0.173",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -52,8 +52,8 @@
     "zod": "3.23.8",
     "@atproto-labs/fetch-node": "0.1.9",
     "@atproto-labs/xrpc-utils": "0.0.17",
-    "@atproto/api": "^0.15.26",
     "@atproto/common": "^0.4.11",
+    "@atproto/api": "^0.15.26",
     "@atproto/crypto": "^0.4.4",
     "@atproto/did": "^0.1.5",
     "@atproto/identity": "^0.4.8",

package/src/api/app/bsky/unspecced/initAgeAssurance.ts

@@ -8,7 +8,10 @@ import {
 } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
 import { GateID } from '../../../../feature-gates'
+import { KwsExternalPayloadError } from '../../../../kws'
 import { Server } from '../../../../lexicon'
+import { InputSchema } from '../../../../lexicon/types/app/bsky/unspecced/initAgeAssurance'
+import { httpLogger as log } from '../../../../logger'
 import { KwsExternalPayload } from '../../../kws/types'
 import { createStashEvent, getClientUa } from '../../../kws/util'
 
@@ -30,12 +33,7 @@ export default function (server: Server, ctx: AppContext) {
         throw new ForbiddenError()
       }
 
-      const { email, language, countryCode } = input.body
-      if (!isEmailValid(email) || isDisposableEmail(email)) {
-        throw new InvalidRequestError(
-          'This email address is not supported, please use a different email.',
-        )
-      }
+      const { countryCode, email, language } = validateInput(input.body)
 
       const attemptId = crypto.randomUUID()
       // Assumes `app.set('trust proxy', ...)` configured with `true` or specific values.
@@ -43,12 +41,26 @@ export default function (server: Server, ctx: AppContext) {
       const initUa = getClientUa(req)
       const externalPayload: KwsExternalPayload = { actorDid, attemptId }
 
-      await ctx.kwsClient.sendEmail({
-        countryCode: countryCode.toUpperCase(),
-        email,
-        externalPayload,
-        language,
-      })
+      try {
+        await ctx.kwsClient.sendEmail({
+          countryCode: countryCode.toUpperCase(),
+          email,
+          externalPayload,
+          language,
+        })
+      } catch (err) {
+        if (err instanceof KwsExternalPayloadError) {
+          log.error(
+            { externalPayload },
+            'Age Assurance flow failed because external payload got too long, which is caused by the DID being too long',
+          )
+          throw new InvalidRequestError(
+            'Age Assurance flow failed because DID is too long',
+            'DidTooLong',
+          )
+        }
+        throw err
+      }
 
       const event = await createStashEvent(ctx, {
         actorDid,
@@ -69,3 +81,44 @@ export default function (server: Server, ctx: AppContext) {
     },
   })
 }
+
+// Supported languages for KWS Adult Verification.
+// This list comes from KWS's AV Developer Guide PDF doc.
+const kwsAvSupportedLanguages = [
+  'en',
+  'ar',
+  'zh-Hans',
+  'nl',
+  'tl',
+  'fr',
+  'de',
+  'id',
+  'it',
+  'ja',
+  'ko',
+  'pl',
+  'pt-BR',
+  'pt',
+  'ru',
+  'es',
+  'th',
+  'tr',
+  'vi',
+]
+
+const validateInput = (input: InputSchema): InputSchema => {
+  const { countryCode, email, language } = input
+
+  if (!isEmailValid(email) || isDisposableEmail(email)) {
+    throw new InvalidRequestError(
+      'This email address is not supported, please use a different email.',
+      'InvalidEmail',
+    )
+  }
+
+  return {
+    countryCode,
+    email,
+    language: kwsAvSupportedLanguages.includes(language) ? language : 'en',
+  }
+}

package/src/kws.ts

@@ -14,6 +14,9 @@ const authResponseSchema = z.object({
   access_token: z.string(),
 })
 
+const EXTERNAL_PAYLOAD_CHAR_LIMIT = 200
+export class KwsExternalPayloadError extends Error {}
+
 export class KwsClient {
   constructor(public cfg: KwsConfig) {}
 
@@ -76,6 +79,11 @@ export class KwsClient {
     externalPayload: KwsExternalPayload
     language: string
   }) {
+    const serializedExternalPayload = serializeExternalPayload(externalPayload)
+    if (serializedExternalPayload.length > EXTERNAL_PAYLOAD_CHAR_LIMIT) {
+      throw new KwsExternalPayloadError()
+    }
+
     const res = await this.fetchWithAuth(
       `${this.cfg.apiOrigin}/v1/verifications/send-email`,
       {
@@ -86,7 +94,7 @@ export class KwsClient {
         },
         body: JSON.stringify({
           email,
-          externalPayload: serializeExternalPayload(externalPayload),
+          externalPayload: serializedExternalPayload,
           language,
           location: countryCode,
           userContext: 'adult',

package/src/lexicon/lexicons.ts

@@ -11589,6 +11589,14 @@ export const schemaDict = {
             ref: 'lex:app.bsky.unspecced.defs#ageAssuranceState',
           },
         },
+        errors: [
+          {
+            name: 'InvalidEmail',
+          },
+          {
+            name: 'DidTooLong',
+          },
+        ],
       },
     },
   },

package/src/lexicon/types/app/bsky/unspecced/initAgeAssurance.ts

@@ -42,6 +42,7 @@ export interface HandlerSuccess {
 export interface HandlerError {
   status: number
   message?: string
+  error?: 'InvalidEmail' | 'DidTooLong'
 }
 
 export type HandlerOutput = HandlerError | HandlerSuccess