@headless-lms/server 0.4.0 → 0.5.0

package/dist/http/routes/member/profile.js

@@ -1,11 +1,18 @@
 import { refusals } from "../../schemas/shared.js";
+import { resolveCaller } from "../../scope.js";
 import { UpdateProfile, UserProfile } from "../../schemas/profile.js";
 import "../../schemas/index.js";
-import { actorOf } from "./actor.js";
 //#region src/http/routes/member/profile.ts
 async function memberProfileRoutes(app, container) {
 	const r = app.withTypeProvider();
 	const tags = ["Profile"];
+	async function memberOf(req) {
+		const caller = await resolveCaller(container, req);
+		return {
+			...caller.actor,
+			userId: caller.userId
+		};
+	}
 	r.route({
 		method: "GET",
 		url: "/api/member/profile",
@@ -14,11 +21,14 @@ async function memberProfileRoutes(app, container) {
 			operationId: "getMemberProfile",
 			tags,
 			summary: "Read your profile",
-			description: "For any signed-in person. The profile is yours across organizations; `imageUrl` is set only when the photo was uploaded in this organization. Before you save one, every field is empty.",
-			response: { 200: UserProfile }
+			description: "For any active member of the organization. The profile is yours across organizations; `imageUrl` is set only when the photo was uploaded in this organization. Before you save one, every field is empty.",
+			response: {
+				200: UserProfile,
+				...refusals(403)
+			}
 		},
 		handler: async (req) => {
-			return container.identity.profileOf(req.orgId, req.userId);
+			return container.identity.profileOf(await memberOf(req));
 		}
 	});
 	r.route({
@@ -37,8 +47,7 @@ async function memberProfileRoutes(app, container) {
 			}
 		},
 		handler: async (req) => {
-			const orgUser = await actorOf(container, req.orgId, req.userId);
-			return container.identity.updateProfile(req.orgId, req.userId, req.userId, orgUser.id, req.body);
+			return container.identity.updateProfile(req.body, await memberOf(req));
 		}
 	});
 }

package/dist/http/routes/member/profile.js.map

@@ -1 +1 @@
-{"version":3,"file":"profile.js","names":[],"sources":["../../../../src/http/routes/member/profile.ts"],"sourcesContent":["import type { FastifyInstance } from 'fastify';\nimport type { ZodTypeProvider } from 'fastify-type-provider-zod';\nimport type { Container } from '../../../app/container.js';\nimport { actorOf } from './actor.js';\nimport { UpdateProfile, UserProfile, refusals } from '../../schemas/index.js';\n\nexport async function memberProfileRoutes(\n  app: FastifyInstance,\n  container: Container,\n): Promise<void> {\n  const r = app.withTypeProvider<ZodTypeProvider>();\n  const tags = ['Profile'];\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/profile',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getMemberProfile',\n      tags,\n      summary: 'Read your profile',\n      description:\n        'For any signed-in person. The profile is yours across organizations; `imageUrl` is set only when the photo was uploaded in this organization. Before you save one, every field is empty.',\n      response: { 200: UserProfile },\n    },\n    handler: async (req) => {\n      return container.identity.profileOf(req.orgId, req.userId);\n    },\n  });\n\n  r.route({\n    method: 'PATCH',\n    url: '/api/member/profile',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'updateMemberProfile',\n      tags,\n      summary: 'Update your profile',\n      description:\n        'For a member of the organization. Changes only the fields sent; null clears one. 404 when `imageAssetId` is not a finalized image you uploaded here.',\n      body: UpdateProfile,\n      response: { 200: UserProfile, ...refusals(403, 404) },\n    },\n    handler: async (req) => {\n      const orgUser = await actorOf(container, req.orgId, req.userId);\n      return container.identity.updateProfile(\n        req.orgId,\n        req.userId,\n        req.userId,\n        orgUser.id,\n        req.body,\n      );\n    },\n  });\n}\n"],"mappings":";;;;;AAMA,eAAsB,oBACpB,KACA,WACe;CACf,MAAM,IAAI,IAAI,iBAAkC;CAChD,MAAM,OAAO,CAAC,SAAS;CAEvB,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb;GACA,SAAS;GACT,aACE;GACF,UAAU,EAAE,KAAK,YAAY;EAC/B;EACA,SAAS,OAAO,QAAQ;GACtB,OAAO,UAAU,SAAS,UAAU,IAAI,OAAO,IAAI,MAAM;EAC3D;CACF,CAAC;CAED,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb;GACA,SAAS;GACT,aACE;GACF,MAAM;GACN,UAAU;IAAE,KAAK;IAAa,GAAG,SAAS,KAAK,GAAG;GAAE;EACtD;EACA,SAAS,OAAO,QAAQ;GACtB,MAAM,UAAU,MAAM,QAAQ,WAAW,IAAI,OAAO,IAAI,MAAM;GAC9D,OAAO,UAAU,SAAS,cACxB,IAAI,OACJ,IAAI,QACJ,IAAI,QACJ,QAAQ,IACR,IAAI,IACN;EACF;CACF,CAAC;AACH"}
+{"version":3,"file":"profile.js","names":[],"sources":["../../../../src/http/routes/member/profile.ts"],"sourcesContent":["import type { FastifyInstance, FastifyRequest } from 'fastify';\nimport type { ZodTypeProvider } from 'fastify-type-provider-zod';\nimport type { Container } from '../../../app/container.js';\nimport { resolveCaller } from '../../scope.js';\nimport { UpdateProfile, UserProfile, refusals } from '../../schemas/index.js';\n\nexport async function memberProfileRoutes(\n  app: FastifyInstance,\n  container: Container,\n): Promise<void> {\n  const r = app.withTypeProvider<ZodTypeProvider>();\n  const tags = ['Profile'];\n\n  async function memberOf(req: FastifyRequest) {\n    const caller = await resolveCaller(container, req);\n    return { ...caller.actor, userId: caller.userId };\n  }\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/profile',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getMemberProfile',\n      tags,\n      summary: 'Read your profile',\n      description:\n        'For any active member of the organization. The profile is yours across organizations; `imageUrl` is set only when the photo was uploaded in this organization. Before you save one, every field is empty.',\n      response: { 200: UserProfile, ...refusals(403) },\n    },\n    handler: async (req) => {\n      return container.identity.profileOf(await memberOf(req));\n    },\n  });\n\n  r.route({\n    method: 'PATCH',\n    url: '/api/member/profile',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'updateMemberProfile',\n      tags,\n      summary: 'Update your profile',\n      description:\n        'For a member of the organization. Changes only the fields sent; null clears one. 404 when `imageAssetId` is not a finalized image you uploaded here.',\n      body: UpdateProfile,\n      response: { 200: UserProfile, ...refusals(403, 404) },\n    },\n    handler: async (req) => {\n      return container.identity.updateProfile(req.body, await memberOf(req));\n    },\n  });\n}\n"],"mappings":";;;;;AAMA,eAAsB,oBACpB,KACA,WACe;CACf,MAAM,IAAI,IAAI,iBAAkC;CAChD,MAAM,OAAO,CAAC,SAAS;CAEvB,eAAe,SAAS,KAAqB;EAC3C,MAAM,SAAS,MAAM,cAAc,WAAW,GAAG;EACjD,OAAO;GAAE,GAAG,OAAO;GAAO,QAAQ,OAAO;EAAO;CAClD;CAEA,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb;GACA,SAAS;GACT,aACE;GACF,UAAU;IAAE,KAAK;IAAa,GAAG,SAAS,GAAG;GAAE;EACjD;EACA,SAAS,OAAO,QAAQ;GACtB,OAAO,UAAU,SAAS,UAAU,MAAM,SAAS,GAAG,CAAC;EACzD;CACF,CAAC;CAED,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb;GACA,SAAS;GACT,aACE;GACF,MAAM;GACN,UAAU;IAAE,KAAK;IAAa,GAAG,SAAS,KAAK,GAAG;GAAE;EACtD;EACA,SAAS,OAAO,QAAQ;GACtB,OAAO,UAAU,SAAS,cAAc,IAAI,MAAM,MAAM,SAAS,GAAG,CAAC;EACvE;CACF,CAAC;AACH"}

package/dist/http/routes/member/progress.js

@@ -1,8 +1,7 @@
 import { refusals } from "../../schemas/shared.js";
+import { resolveActor } from "../../scope.js";
 import { CourseProgress, MemberCourseIdParam, ProgressStatus, ReportProgress } from "../../schemas/member.js";
 import "../../schemas/index.js";
-import { actorOf } from "./actor.js";
-import { NotFoundError } from "@headless-lms/core/shared/errors";
 //#region src/http/routes/member/progress.ts
 async function memberProgressRoutes(app, container) {
 	const r = app.withTypeProvider();
@@ -15,7 +14,7 @@ async function memberProgressRoutes(app, container) {
 			operationId: "reportProgress",
 			tags: ["Progress"],
 			summary: "Report usage on an activity; the progress service decides completion",
-			description: "For a member who can open the course. Reports facts, never a decision: the service decides whether the activity is complete. 404 when the activity or its course is not published, or you cannot open it.",
+			description: "For a member who can open the course, through a grant or `courses:read` on it. Reports facts, never a decision: the service decides whether the activity is complete. 404 when the activity is not published, or you cannot open its course.",
 			body: ReportProgress,
 			response: {
 				200: ProgressStatus,
@@ -23,12 +22,11 @@ async function memberProgressRoutes(app, container) {
 			}
 		},
 		handler: async (req) => {
-			const orgUser = await actorOf(container, req.orgId, req.userId);
-			return { status: (await container.progress.report(req.orgId, {
-				orgUserId: orgUser.id,
+			const actor = await resolveActor(container, req);
+			return { status: (await container.progress.report({
 				activityId: req.body.activity,
 				reports: req.body.reports
-			})).completedAt ? "completed" : "in-progress" };
+			}, actor)).completedAt ? "completed" : "in-progress" };
 		}
 	});
 	r.route({
@@ -47,10 +45,8 @@ async function memberProgressRoutes(app, container) {
 			}
 		},
 		handler: async (req) => {
-			const orgUser = await actorOf(container, req.orgId, req.userId);
-			const view = await member.courseProgress(req.orgId, orgUser.id, req.params.courseId);
-			if (!view) throw new NotFoundError("Course", req.params.courseId);
-			return view;
+			const actor = await resolveActor(container, req);
+			return member.courseProgress(req.params.courseId, actor);
 		}
 	});
 }

package/dist/http/routes/member/progress.js.map

@@ -1 +1 @@
-{"version":3,"file":"progress.js","names":[],"sources":["../../../../src/http/routes/member/progress.ts"],"sourcesContent":["import type { FastifyInstance } from 'fastify';\nimport type { ZodTypeProvider } from 'fastify-type-provider-zod';\nimport {\n  CourseProgress,\n  MemberCourseIdParam,\n  ProgressStatus,\n  ReportProgress,\n  refusals,\n} from '../../schemas/index.js';\nimport { NotFoundError } from '@headless-lms/core/shared/errors';\nimport type { Container } from '../../../app/container.js';\nimport { actorOf } from './actor.js';\n\nexport async function memberProgressRoutes(\n  app: FastifyInstance,\n  container: Container,\n): Promise<void> {\n  const r = app.withTypeProvider<ZodTypeProvider>();\n  const member = container.reporting.member;\n\n  r.route({\n    method: 'POST',\n    url: '/api/member/progress',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'reportProgress',\n      tags: ['Progress'],\n      summary: 'Report usage on an activity; the progress service decides completion',\n      description:\n        'For a member who can open the course. Reports facts, never a decision: the service decides whether the activity is complete. 404 when the activity or its course is not published, or you cannot open it.',\n      body: ReportProgress,\n      response: { 200: ProgressStatus, ...refusals(403, 404) },\n    },\n    handler: async (req) => {\n      const orgUser = await actorOf(container, req.orgId, req.userId);\n      const record = await container.progress.report(req.orgId, {\n        orgUserId: orgUser.id,\n        activityId: req.body.activity,\n        reports: req.body.reports,\n      });\n      return { status: record.completedAt ? ('completed' as const) : ('in-progress' as const) };\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/courses/:courseId/progress',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getMemberCourseProgress',\n      tags: ['Progress'],\n      summary: 'Your progress in one course',\n      description:\n        \"For a member of the organization, derived from the course's current structure. 404 when the course is not published or you do not hold it.\",\n      params: MemberCourseIdParam,\n      response: { 200: CourseProgress, ...refusals(403, 404) },\n    },\n    handler: async (req) => {\n      const orgUser = await actorOf(container, req.orgId, req.userId);\n      const view = await member.courseProgress(req.orgId, orgUser.id, req.params.courseId);\n      if (!view) {\n        throw new NotFoundError('Course', req.params.courseId);\n      }\n      return view;\n    },\n  });\n}\n"],"mappings":";;;;;;AAaA,eAAsB,qBACpB,KACA,WACe;CACf,MAAM,IAAI,IAAI,iBAAkC;CAChD,MAAM,SAAS,UAAU,UAAU;CAEnC,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb,MAAM,CAAC,UAAU;GACjB,SAAS;GACT,aACE;GACF,MAAM;GACN,UAAU;IAAE,KAAK;IAAgB,GAAG,SAAS,KAAK,GAAG;GAAE;EACzD;EACA,SAAS,OAAO,QAAQ;GACtB,MAAM,UAAU,MAAM,QAAQ,WAAW,IAAI,OAAO,IAAI,MAAM;GAM9D,OAAO,EAAE,SAAQ,MALI,UAAU,SAAS,OAAO,IAAI,OAAO;IACxD,WAAW,QAAQ;IACnB,YAAY,IAAI,KAAK;IACrB,SAAS,IAAI,KAAK;GACpB,CAAC,EAAA,CACuB,cAAe,cAAyB,cAAwB;EAC1F;CACF,CAAC;CAED,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb,MAAM,CAAC,UAAU;GACjB,SAAS;GACT,aACE;GACF,QAAQ;GACR,UAAU;IAAE,KAAK;IAAgB,GAAG,SAAS,KAAK,GAAG;GAAE;EACzD;EACA,SAAS,OAAO,QAAQ;GACtB,MAAM,UAAU,MAAM,QAAQ,WAAW,IAAI,OAAO,IAAI,MAAM;GAC9D,MAAM,OAAO,MAAM,OAAO,eAAe,IAAI,OAAO,QAAQ,IAAI,IAAI,OAAO,QAAQ;GACnF,IAAI,CAAC,MACH,MAAM,IAAI,cAAc,UAAU,IAAI,OAAO,QAAQ;GAEvD,OAAO;EACT;CACF,CAAC;AACH"}
+{"version":3,"file":"progress.js","names":[],"sources":["../../../../src/http/routes/member/progress.ts"],"sourcesContent":["import type { FastifyInstance } from 'fastify';\nimport type { ZodTypeProvider } from 'fastify-type-provider-zod';\nimport {\n  CourseProgress,\n  MemberCourseIdParam,\n  ProgressStatus,\n  ReportProgress,\n  refusals,\n} from '../../schemas/index.js';\nimport type { Container } from '../../../app/container.js';\nimport { resolveActor } from '../../scope.js';\n\nexport async function memberProgressRoutes(\n  app: FastifyInstance,\n  container: Container,\n): Promise<void> {\n  const r = app.withTypeProvider<ZodTypeProvider>();\n  const member = container.reporting.member;\n\n  r.route({\n    method: 'POST',\n    url: '/api/member/progress',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'reportProgress',\n      tags: ['Progress'],\n      summary: 'Report usage on an activity; the progress service decides completion',\n      description:\n        'For a member who can open the course, through a grant or `courses:read` on it. Reports facts, never a decision: the service decides whether the activity is complete. 404 when the activity is not published, or you cannot open its course.',\n      body: ReportProgress,\n      response: { 200: ProgressStatus, ...refusals(403, 404) },\n    },\n    handler: async (req) => {\n      const actor = await resolveActor(container, req);\n      const record = await container.progress.report(\n        { activityId: req.body.activity, reports: req.body.reports },\n        actor,\n      );\n      return { status: record.completedAt ? ('completed' as const) : ('in-progress' as const) };\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/courses/:courseId/progress',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getMemberCourseProgress',\n      tags: ['Progress'],\n      summary: 'Your progress in one course',\n      description:\n        \"For a member of the organization, derived from the course's current structure. 404 when the course is not published or you do not hold it.\",\n      params: MemberCourseIdParam,\n      response: { 200: CourseProgress, ...refusals(403, 404) },\n    },\n    handler: async (req) => {\n      const actor = await resolveActor(container, req);\n      return member.courseProgress(req.params.courseId, actor);\n    },\n  });\n}\n"],"mappings":";;;;;AAYA,eAAsB,qBACpB,KACA,WACe;CACf,MAAM,IAAI,IAAI,iBAAkC;CAChD,MAAM,SAAS,UAAU,UAAU;CAEnC,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb,MAAM,CAAC,UAAU;GACjB,SAAS;GACT,aACE;GACF,MAAM;GACN,UAAU;IAAE,KAAK;IAAgB,GAAG,SAAS,KAAK,GAAG;GAAE;EACzD;EACA,SAAS,OAAO,QAAQ;GACtB,MAAM,QAAQ,MAAM,aAAa,WAAW,GAAG;GAK/C,OAAO,EAAE,SAAQ,MAJI,UAAU,SAAS,OACtC;IAAE,YAAY,IAAI,KAAK;IAAU,SAAS,IAAI,KAAK;GAAQ,GAC3D,KACF,EAAA,CACwB,cAAe,cAAyB,cAAwB;EAC1F;CACF,CAAC;CAED,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb,MAAM,CAAC,UAAU;GACjB,SAAS;GACT,aACE;GACF,QAAQ;GACR,UAAU;IAAE,KAAK;IAAgB,GAAG,SAAS,KAAK,GAAG;GAAE;EACzD;EACA,SAAS,OAAO,QAAQ;GACtB,MAAM,QAAQ,MAAM,aAAa,WAAW,GAAG;GAC/C,OAAO,OAAO,eAAe,IAAI,OAAO,UAAU,KAAK;EACzD;CACF,CAAC;AACH"}