@ampless/backend 0.2.0-alpha.11 → 0.2.0-alpha.13

package/dist/functions/mcp-handler.js

@@ -627,17 +627,26 @@ async function validateBearer(plaintext) {
   );
   const row = res.Item;
   if (!row?.value) return null;
-  let meta;
-  try {
-    meta = JSON.parse(row.value);
-  } catch {
-    console.error("[mcp-handler] could not parse token row", { hash });
+  const meta = decodeTokenMeta(row.value);
+  if (!meta) {
+    console.error("[mcp-handler] could not decode token row", { hash, valueType: typeof row.value });
     return null;
   }
   if (meta.revokedAt) return null;
   if (meta.expiresAt && new Date(meta.expiresAt).getTime() <= Date.now()) return null;
   return meta;
 }
+function decodeTokenMeta(value) {
+  if (typeof value === "object") return value;
+  if (typeof value === "string") {
+    try {
+      return JSON.parse(value);
+    } catch {
+      return null;
+    }
+  }
+  return null;
+}
 var cachedCtx = null;
 function makeContext(meta) {
   if (cachedCtx && cachedCtx.defaultSiteId === (meta.scope.siteId ?? "default")) {

package/dist/index.d.ts

@@ -149,22 +149,6 @@ interface AmplessSchemaModelsOpts {
      * pattern as `AmplessAuthConfigOpts.postConfirmation`.
      */
     userAdminFunction?: unknown;
-    /**
-     * Optional Amplify `defineFunction` ref backing the MCP HTTP Lambda.
-     * When supplied, the Post and PostTag models gain an `allow.resource(...)`
-     * authorization clause granting the Lambda `query` + `mutate` access
-     * via AppSync IAM auth. The existing group-based clauses stay intact —
-     * this just adds a second principal so the Lambda can dispatch tool
-     * calls under its own scoped role, with no Cognito identity or
-     * shared API key involved.
-     *
-     * Phase 4 covers Post + PostTag only (the read/write surface for the
-     * post CRUD tools). Media gets the same treatment in Phase 5 once
-     * the presigned-PUT upload flow lands.
-     *
-     * Typed as `unknown` for the same reason as `userAdminFunction`.
-     */
-    mcpHandlerFunction?: unknown;
 }
 /**
  * The Ampless model + custom query definitions, returned as a plain
@@ -205,6 +189,44 @@ declare function amplessSchemaModels(a: any, opts?: AmplessSchemaModelsOpts): {
  * when there are no custom models.
  */
 declare function extendAmplessSchema(a: any, custom?: Record<string, any>, opts?: AmplessSchemaModelsOpts): any;
+interface AmplessSchemaAuthorizationOpts {
+    /**
+     * Optional Amplify `defineFunction` ref for the MCP HTTP handler.
+     * When supplied, the schema gains `allow.resource(fn).to(['query',
+     * 'mutate'])` so the Lambda can sign AppSync requests with SigV4
+     * under its own IAM role (no Cognito identity / shared API key).
+     *
+     * Resource auth is currently only honoured at schema scope by
+     * `@aws-amplify/data-schema` (model-level `.authorization` callbacks
+     * destructure `resource` out of their `allow` parameter), so this
+     * grant applies broadly — every model the Lambda calls is reachable.
+     * That's wider than strictly necessary; the MCP tools' GraphQL
+     * operations narrow the effective surface to Post / PostTag in
+     * Phase 4 and Media in Phase 5.
+     *
+     * Typed as `unknown` for the same reason `userAdminFunction` /
+     * `mcpHandlerFunction` are in other helpers — `defineFunction`'s
+     * return type carries internal pnpm paths that don't survive
+     * declaration emit.
+     */
+    mcpHandlerFunction?: unknown;
+}
+/**
+ * Schema-level authorization rules for ampless. Pass the result into
+ * `a.schema({...}).authorization((allow) => [...])` in the user's
+ * `amplify/data/resource.ts`. When no Lambda function refs are
+ * supplied the function returns `[]`, so the schema stays unaffected.
+ *
+ * Usage:
+ *
+ *     const schema = a.schema({
+ *       ...amplessSchemaModels(a, { resolverPaths, userAdminFunction }),
+ *       ...customSchemaModels(a),
+ *     }).authorization((allow) => amplessSchemaAuthorization(allow, {
+ *       mcpHandlerFunction: mcpHandler,
+ *     }))
+ */
+declare function amplessSchemaAuthorization(allow: any, opts?: AmplessSchemaAuthorizationOpts): unknown[];
 /**
  * Standard authorization modes for ampless. `userPool` is the default
  * (admin/editor access); the API key serves the public read endpoints
@@ -215,4 +237,4 @@ declare function extendAmplessSchema(a: any, custom?: Record<string, any>, opts?
  */
 declare const defaultAuthorizationModes: Parameters<typeof defineData>[0]['authorizationModes'];
 
-export { type AmplessAuthConfigOpts, type AmplessBackend, type AmplessResolverPaths, type AmplessSchemaModelsOpts, DEFAULT_RESOLVER_PATHS, type DefineAmplessBackendOpts, amplessAuthConfig, amplessSchemaModels, amplessStorageConfig, defaultAuthorizationModes, defineAmplessBackend, extendAmplessSchema };
+export { type AmplessAuthConfigOpts, type AmplessBackend, type AmplessResolverPaths, type AmplessSchemaAuthorizationOpts, type AmplessSchemaModelsOpts, DEFAULT_RESOLVER_PATHS, type DefineAmplessBackendOpts, amplessAuthConfig, amplessSchemaAuthorization, amplessSchemaModels, amplessStorageConfig, defaultAuthorizationModes, defineAmplessBackend, extendAmplessSchema };

package/dist/index.js

@@ -277,8 +277,7 @@ function amplessSchemaModels(a, opts = {}) {
       index("siteIdStatus").sortKeys(["publishedAt"]).name("bySiteIdStatus"),
       index("siteIdSlug").name("bySiteIdSlug")
     ]).authorization((allow) => [
-      allow.groups(["ampless-admin", "ampless-editor"]),
-      ...opts.mcpHandlerFunction ? [allow.resource(opts.mcpHandlerFunction).to(["query", "mutate"])] : []
+      allow.groups(["ampless-admin", "ampless-editor"])
     ]),
     Page: a.model({
       siteId: a.string().required(),
@@ -332,8 +331,7 @@ function amplessSchemaModels(a, opts = {}) {
       // Full tag list of the post (for chip rendering on tag pages).
       tags: a.string().array()
     }).identifier(["siteIdTag", "publishedAtPostId"]).authorization((allow) => [
-      allow.groups(["ampless-admin", "ampless-editor"]),
-      ...opts.mcpHandlerFunction ? [allow.resource(opts.mcpHandlerFunction).to(["query", "mutate"])] : []
+      allow.groups(["ampless-admin", "ampless-editor"])
     ]),
     // Generic key/value store. Two roles in one table:
     //   - Site settings: PK = `siteconfig:{siteId}`, SK = dotted key
@@ -456,6 +454,13 @@ function extendAmplessSchema(a, custom, opts) {
     ...custom ?? {}
   });
 }
+function amplessSchemaAuthorization(allow, opts = {}) {
+  const rules = [];
+  if (opts.mcpHandlerFunction) {
+    rules.push(allow.resource(opts.mcpHandlerFunction).to(["query", "mutate"]));
+  }
+  return rules;
+}
 var defaultAuthorizationModes = {
   defaultAuthorizationMode: "userPool",
   apiKeyAuthorizationMode: { expiresInDays: 365 }
@@ -463,6 +468,7 @@ var defaultAuthorizationModes = {
 export {
   DEFAULT_RESOLVER_PATHS,
   amplessAuthConfig,
+  amplessSchemaAuthorization,
   amplessSchemaModels,
   amplessStorageConfig,
   defaultAuthorizationModes,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampless/backend",
-  "version": "0.2.0-alpha.11",
+  "version": "0.2.0-alpha.13",
   "description": "Amplify Gen 2 backend factories for ampless: auth, data, storage, event processors, API key renewer",
   "license": "MIT",
   "type": "module",