@reclaimprotocol/client 0.1.0-dev.2 → 0.1.1

package/src/result.ts

@@ -11,14 +11,18 @@
  */
 import { sha256 } from '@noble/hashes/sha2.js'
 import { keccak_256 } from '@noble/hashes/sha3.js'
-import type { JWK } from 'jose'
-import { compactDecrypt, CompactEncrypt, importJWK } from 'jose'
+import { decrypt as eciesDecrypt, encrypt as eciesEncrypt } from 'eciesjs'
 import type { components } from './types/openapi.gen.ts'
 import { type NestedProofOutcome, verifyNestedProof } from './attestor-proof.ts'
 import { canonicalJson } from './canonical.ts'
 import type { DecryptionKey } from './enckeys.ts'
 import { b64url, base64urlToBytes, bytesToHex, hexToBytes } from './encoding.ts'
-import { fetchJwks, jwkToUncompressedPublicKey, selectKey } from './jwks.ts'
+import {
+	fetchJwks,
+	type Jwk,
+	jwkToUncompressedPublicKey,
+	selectKey,
+} from './jwks.ts'
 import { addressFromUncompressedPubkey, secp } from './secp.ts'
 
 export interface Jws {
@@ -47,32 +51,33 @@ export interface VerifyResultOutcome {
 }
 
 /**
- * JWE-encrypt `plaintext` for the holder of `publicJwk` (an X25519 public JWK,
- * `{kty:'OKP', crv:'X25519', x}`) as a compact JWE (`ECDH-ES + A256GCM`). Used
- * by the first-party Verification Client to encrypt the signed JWS for each
- * Consumer before submitting it to the Builder (which only relays the
- * ciphertext). Consumers never call this — they only {@link decryptCallback}.
+ * ECIES-encrypt `plaintext` for the holder of `publicJwk` (the org's secp256k1
+ * **eth** public JWK, `{kty:'EC', crv:'secp256k1', x, y}`) — `eciesjs` defaults
+ * (secp256k1 + AES-256-GCM). Used by the first-party Verification Client to
+ * encrypt the signed JWS for the Consumer before submitting it to the Builder
+ * (which only relays the ciphertext). Consumers never call this — they only
+ * {@link decryptCallback}.
  *
  * `plaintext` is bytes (e.g. `new TextEncoder().encode(JSON.stringify(jws))`);
- * returns the compact JWE string.
+ * returns the ciphertext as a base64url string (single token, never starts with
+ * `{`, so {@link decryptCallback} can tell it apart from a plaintext JWS JSON).
  */
-export async function encryptForPublicJwk(
-	publicJwk: JWK,
+export async function encryptForEthPublicKey(
+	publicJwk: Jwk,
 	plaintext: Uint8Array,
 ): Promise<string> {
-	const key = await importJWK(publicJwk, 'ECDH-ES')
-	return new CompactEncrypt(plaintext)
-		.setProtectedHeader({ alg: 'ECDH-ES', enc: 'A256GCM' })
-		.encrypt(key)
+	// Uncompressed `0x04`‖X‖Y bytes — what eciesjs accepts as the recipient key.
+	const pubBytes = hexToBytes(jwkToUncompressedPublicKey(publicJwk))
+	return b64url(eciesEncrypt(pubBytes, plaintext))
 }
 
 /**
  * What a consumer's callback endpoint receives — the Builder POSTs the JSON
  * `VerificationResultDelivery` envelope: plaintext `sessionId`/`event`/
- * `timestamp` routing hints. For terminal events `data` is a compact JWE
- * string wrapping the signed JWS (or the plaintext JWS JSON when the org has
- * no encryption credential). The envelope is unauthenticated; trust only the
- * decrypted+verified JWS.
+ * `timestamp` routing hints. For terminal events `data` is an ECIES ciphertext
+ * (base64url) wrapping the signed JWS (or the plaintext JWS JSON when the org
+ * has no key / `canEncryptResult` is off). The envelope is unauthenticated;
+ * trust only the decrypted+verified JWS.
  *
  * Derived from the generated spec type so it can't drift; the hint fields
  * are relaxed to optional — decryption only needs `data`.
@@ -91,9 +96,9 @@ export type CallbackBody =
 	| ArrayBuffer
 
 /** Normalize any {@link CallbackBody} to the terminal-result `data` string —
- *  either a compact JWE (`xxxx.yyyy.zzzz.aaaa.bbbb`) or the plaintext JWS JSON
- *  (`{…}`). The envelope object/text wraps it in `.data`; raw bytes are decoded
- *  to text first. */
+ *  either an ECIES ciphertext (base64url) or the plaintext JWS JSON (`{…}`).
+ *  The envelope object/text wraps it in `.data`; raw bytes are decoded to text
+ *  first. */
 function payloadFrom(body: CallbackBody): string {
 	if(typeof body === 'string') {
 		const s = body.trim()
@@ -123,10 +128,10 @@ function payloadFrom(body: CallbackBody): string {
 }
 
 /**
- * Decrypt a delivered terminal callback to the signed JWS. `data` is either a
- * compact JWE (decrypted with the X25519 `privateKey`) or — when the org has no
- * encryption credential — the plaintext JWS JSON. A compact JWE has exactly
- * five dot-separated base64url segments; a JSON JWS starts with `{`.
+ * Decrypt a delivered terminal callback to the signed JWS. `data` is either an
+ * ECIES ciphertext (base64url, decrypted with the eth `privateKey` scalar) or —
+ * when the org has no key / `canEncryptResult` is off — the plaintext JWS JSON.
+ * A JSON JWS starts with `{`; anything else is the ECIES ciphertext.
  *
  * `privateKey` may be absent (plaintext delivery); an encrypted delivery with
  * no key throws a clear error.
@@ -143,16 +148,16 @@ export async function decryptCallback(
 		return JSON.parse(trimmed) as Jws
 	}
 
-	// Otherwise it's a compact JWE — five base64url segments.
+	// Otherwise it's an ECIES ciphertext (base64url).
 	if(!privateKey) {
 		throw new Error(
-			'received an encrypted (JWE) delivery but no decryption credential was '
-				+ 'configured — pass the X25519 private key (JWK/PEM): '
+			'received an encrypted (ECIES) delivery but no decryption credential was '
+				+ 'configured — pass the eth private key (0x-hex): '
 				+ 'results.receive(body, { credential }) or decrypt(body, credential)',
 		)
 	}
 
-	const { plaintext } = await compactDecrypt(trimmed, privateKey)
+	const plaintext = eciesDecrypt(privateKey, base64urlToBytes(trimmed))
 	return JSON.parse(new TextDecoder().decode(plaintext)) as Jws
 }
 
@@ -242,6 +247,8 @@ export interface VerifyResultFullOptions {
 }
 
 export interface ResultProofOutcome {
+	/** Which provider this proof belongs to (results grouped per provider). */
+	providerId?: string
 	requestId?: string
 	proofValid: boolean
 	reason?: string
@@ -361,54 +368,68 @@ export async function verifyResultFull(
 		return fail('expired')
 	}
 
-	// 3. Per-result nested attestor proof + content_hash binding.
-	const results = Array.isArray(payload.results)
+	// 3. Per-provider, per-request nested attestor proof + content_hash binding.
+	// `results` is grouped by provider: [{ provider_id, resolved_version,
+	// requests: [...] }]. Every request across every provider must verify.
+	const providerResults = Array.isArray(payload.results)
 		? (payload.results as Record<string, unknown>[])
 		: []
 	const proofs: ResultProofOutcome[] = []
-	for(const r of results) {
-		const requestId =
-			typeof r.request_id === 'string' ? r.request_id : undefined
-		if(typeof r.proof !== 'string') {
-			proofs.push({ requestId, proofValid: false, reason: 'proof-missing' })
-			continue
-		}
+	for(const prov of providerResults) {
+		const providerId =
+			typeof prov.provider_id === 'string' ? prov.provider_id : undefined
+		const requests = Array.isArray(prov.requests)
+			? (prov.requests as Record<string, unknown>[])
+			: []
+		for(const r of requests) {
+			const requestId =
+				typeof r.request_id === 'string' ? r.request_id : undefined
+			if(typeof r.proof !== 'string') {
+				proofs.push({
+					providerId, requestId, proofValid: false, reason: 'proof-missing',
+				})
+				continue
+			}
 
-		const np: NestedProofOutcome = verifyNestedProof(r.proof, {
-			attestorAddresses: opts.attestorAddresses,
-		})
-		if(!np.valid) {
-			proofs.push({
-				requestId,
-				proofValid: false,
-				reason: np.reason,
-				attestorAddress: np.attestorAddress,
+			const np: NestedProofOutcome = verifyNestedProof(r.proof, {
+				attestorAddresses: opts.attestorAddresses,
 			})
-			continue
-		}
-
-		if(
-			typeof r.content_hash === 'string' &&
-			r.extracted_parameters &&
-			typeof r.extracted_parameters === 'object'
-		) {
-			const params = r.extracted_parameters as Record<string, string>
-			if(contentHash(params).toLowerCase() !== r.content_hash.toLowerCase()) {
+			if(!np.valid) {
 				proofs.push({
+					providerId,
 					requestId,
 					proofValid: false,
-					reason: 'content-hash-mismatch',
+					reason: np.reason,
 					attestorAddress: np.attestorAddress,
 				})
 				continue
 			}
-		}
 
-		proofs.push({
-			requestId,
-			proofValid: true,
-			attestorAddress: np.attestorAddress,
-		})
+			if(
+				typeof r.content_hash === 'string' &&
+				r.extracted_parameters &&
+				typeof r.extracted_parameters === 'object'
+			) {
+				const params = r.extracted_parameters as Record<string, string>
+				if(contentHash(params).toLowerCase() !== r.content_hash.toLowerCase()) {
+					proofs.push({
+						providerId,
+						requestId,
+						proofValid: false,
+						reason: 'content-hash-mismatch',
+						attestorAddress: np.attestorAddress,
+					})
+					continue
+				}
+			}
+
+			proofs.push({
+				providerId,
+				requestId,
+				proofValid: true,
+				attestorAddress: np.attestorAddress,
+			})
+		}
 	}
 
 	if(!proofs.every((p) => p.proofValid)) {

package/src/routes.gen.ts

@@ -13,6 +13,7 @@ export const ROUTES = {
 	"AdminSessions": {"method":"get","path":"/admin/sessions"},
 	"AdminThemes": {"method":"get","path":"/admin/themes"},
 	"AdminUsers": {"method":"get","path":"/admin/users"},
+	"AttachLanding": {"method":"get","path":"/attach"},
 	"AttachPage": {"method":"get","path":"/attach/{code}"},
 	"CancelPublicListingRequest": {"method":"post","path":"/providers/{providerId}/versions/{version}/cancel-review"},
 	"ComponentsDemo": {"method":"get","path":"/components_demo"},
@@ -30,11 +31,15 @@ export const ROUTES = {
 	"DeleteOrg": {"method":"delete","path":"/orgs/{orgId}"},
 	"DeleteOrgBilling": {"method":"delete","path":"/orgs/{orgId}/billing"},
 	"DeleteOrgCallbackSubscription": {"method":"delete","path":"/orgs/{orgId}/callback-subscriptions/{subscriptionId}"},
-	"DeleteOrgCredential": {"method":"delete","path":"/orgs/{orgId}/credential"},
 	"DeleteOrgIcon": {"method":"delete","path":"/orgs/{orgId}/icon"},
+	"DeleteOrgKeypair": {"method":"delete","path":"/orgs/{orgId}/keypair"},
 	"DeleteProvider": {"method":"delete","path":"/providers/{providerId}"},
 	"DeleteProviderVersion": {"method":"delete","path":"/providers/{providerId}/versions/{version}"},
 	"DeleteTheme": {"method":"delete","path":"/orgs/{orgId}/themes/{themeId}"},
+	"DiscoverResolve": {"method":"get","path":"/discover/resolve"},
+	"DiscoverTeachAgent": {"method":"get","path":"/discover/teach"},
+	"DiscoverWebsites": {"method":"get","path":"/discover/websites"},
+	"DisposeVerificationSession": {"method":"post","path":"/v/{sessionId}/dispose"},
 	"Docs": {"method":"get","path":"/docs"},
 	"ExplorePreviewImage": {"method":"get","path":"/og/explore.png"},
 	"GetAttachSession": {"method":"get","path":"/credentials/attach/sessions/{code}"},
@@ -42,7 +47,7 @@ export const ROUTES = {
 	"GetMe": {"method":"get","path":"/me"},
 	"GetOrg": {"method":"get","path":"/orgs/{orgId}"},
 	"GetOrgBilling": {"method":"get","path":"/orgs/{orgId}/billing"},
-	"GetOrgCredential": {"method":"get","path":"/orgs/{orgId}/credential"},
+	"GetOrgKeypair": {"method":"get","path":"/orgs/{orgId}/keypair"},
 	"GetOrgSession": {"method":"get","path":"/orgs/{orgId}/sessions/{sessionId}"},
 	"GetOrgToken": {"method":"get","path":"/orgs/{orgId}/token"},
 	"GetProvider": {"method":"get","path":"/providers/{providerId}"},
@@ -81,13 +86,17 @@ export const ROUTES = {
 	"RetryCallbackDlq": {"method":"post","path":"/verifications/callback-dlq/{dlqId}/retry"},
 	"RetryVerificationCallback": {"method":"post","path":"/verifications/sessions/{sessionId}/retry-callback"},
 	"Robots": {"method":"get","path":"/robots.txt"},
-	"SetOrgCredential": {"method":"put","path":"/orgs/{orgId}/credential"},
+	"SearchOrgMembers": {"method":"get","path":"/orgs/{orgId}/members"},
+	"SetOrgKeypair": {"method":"put","path":"/orgs/{orgId}/keypair"},
 	"SetupProviderCreate": {"method":"post","path":"/providers/setup"},
+	"SiteBuild": {"method":"get","path":"/site/{domain}/build"},
+	"SiteBuildTry": {"method":"post","path":"/site/{domain}/try"},
 	"Sitemap": {"method":"get","path":"/sitemap.xml"},
+	"SitePage": {"method":"get","path":"/site/{domain}"},
+	"SitePanel": {"method":"get","path":"/site/{domain}/panel"},
 	"SubmitProviderVersionForReview": {"method":"post","path":"/providers/{providerId}/versions/{version}/review"},
 	"SubmitVerificationResult": {"method":"post","path":"/verifications/sessions/{sessionId}/result"},
 	"TransferProvider": {"method":"post","path":"/providers/{providerId}/transfer"},
-	"UpdateMe": {"method":"patch","path":"/me"},
 	"UpdateOrg": {"method":"patch","path":"/orgs/{orgId}"},
 	"UpdateOrgBilling": {"method":"put","path":"/orgs/{orgId}/billing"},
 	"UpdateOrgIcon": {"method":"put","path":"/orgs/{orgId}/icon"},

package/src/secp.ts

@@ -15,7 +15,7 @@ secp.hashes.hmacSha256 = (key: Uint8Array, msg: Uint8Array) => {
 	return hmac(sha256, key, msg)
 }
 
-export { keccak_256, secp }
+export { secp }
 
 /** Lowercase 0x ETH address from an uncompressed (65-byte) public key:
  *  keccak256 of the 64-byte X‖Y (drop the 0x04 prefix), last 20 bytes. */