@headless-lms/server 0.3.0 → 0.5.0

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

@@ -1 +1 @@
-{"version":3,"file":"files.js","names":["actorOf","memberOf"],"sources":["../../../../src/http/routes/member/files.ts"],"sourcesContent":["// Member file proxies. Each route checks access with the context that owns the\n// file, then redirects to a short-lived signed storage URL. Every refusal is a\n// 404, so a response never confirms that a file exists. A 403 only means the\n// caller is not a member of the organization.\nimport type { FastifyInstance, FastifyReply } from 'fastify';\nimport type { ZodTypeProvider } from 'fastify-type-provider-zod';\nimport { z } from 'zod';\nimport { NotFoundError } from '@headless-lms/core/shared/errors';\nimport {\n  ActivityFileParams,\n  CommunityThumbnailParams,\n  CourseThumbnailParams,\n  DownloadFileParams,\n  DownloadThumbnailParams,\n  MessageAttachmentParams,\n  PersonImageParams,\n  PostCoverParams,\n  UploadFileParams,\n  refusals,\n} from '../../schemas/index.js';\nimport { actorOf as memberOf } from './actor.js';\nimport type { Container } from '../../../app/container.js';\n\nconst tags = ['Files'];\nconst responses = { 302: z.void(), ...refusals(403, 404) };\n\nfunction redirect(reply: FastifyReply, url: string | null, what: string, id: string) {\n  if (!url) {\n    throw new NotFoundError(what, id);\n  }\n  return reply\n    .header('cache-control', 'no-store')\n    .header('referrer-policy', 'no-referrer')\n    .redirect(url, 302);\n}\n\nexport async function memberFileRoutes(app: FastifyInstance, container: Container): Promise<void> {\n  const r = app.withTypeProvider<ZodTypeProvider>();\n  const member = container.reporting.member;\n\n  async function actorOf(orgId: string, userId: string) {\n    const orgUser = await memberOf(container, orgId, userId);\n    return { id: orgUser.id, role: orgUser.role };\n  }\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/courses/:courseId/thumbnail',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getCourseThumbnail',\n      tags,\n      summary: \"Redirect to a course's thumbnail\",\n      description:\n        'Any org user may fetch the thumbnail of a published course; staff may fetch any. 404 when the course has no thumbnail.',\n      params: CourseThumbnailParams,\n      response: responses,\n    },\n    handler: async (req, reply) => {\n      const actor = await actorOf(req.orgId, req.userId);\n      const url = await member.thumbnailFile(req.orgId, actor, 'course', req.params.courseId);\n      return redirect(reply, url, 'Course thumbnail', req.params.courseId);\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/downloads/:downloadId/thumbnail',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getDownloadThumbnail',\n      tags,\n      summary: \"Redirect to a download's thumbnail\",\n      description:\n        'Any org user may fetch the thumbnail of a published download; staff may fetch any. 404 when the download has no thumbnail.',\n      params: DownloadThumbnailParams,\n      response: responses,\n    },\n    handler: async (req, reply) => {\n      const actor = await actorOf(req.orgId, req.userId);\n      const url = await member.thumbnailFile(req.orgId, actor, 'download', req.params.downloadId);\n      return redirect(reply, url, 'Download thumbnail', req.params.downloadId);\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/communities/:communityId/thumbnail',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getCommunityThumbnail',\n      tags,\n      summary: \"Redirect to a community's thumbnail\",\n      description:\n        'Any org user may fetch the thumbnail of a published community; staff may fetch any. 404 when the community has no thumbnail.',\n      params: CommunityThumbnailParams,\n      response: responses,\n    },\n    handler: async (req, reply) => {\n      const actor = await actorOf(req.orgId, req.userId);\n      const url = await member.thumbnailFile(req.orgId, actor, 'community', req.params.communityId);\n      return redirect(reply, url, 'Community thumbnail', req.params.communityId);\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/activities/:activityId/assets/:assetId',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getActivityFile',\n      tags,\n      summary: 'Redirect to a file used in a lesson',\n      description:\n        'Served when the student can open the course, the course and the lesson are published, and the lesson lists the file. Staff may fetch any file a lesson lists. Use the URL as an img, video or audio src.',\n      params: ActivityFileParams,\n      response: responses,\n    },\n    handler: async (req, reply) => {\n      const actor = await actorOf(req.orgId, req.userId);\n      const url = await member.activityFile(\n        req.orgId,\n        actor,\n        req.params.activityId,\n        req.params.assetId,\n      );\n      return redirect(reply, url, 'Lesson file', req.params.assetId);\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/downloads/:downloadId/assets/:assetId',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getDownloadFile',\n      tags,\n      summary: 'Redirect to a file in a download, saved under its display name',\n      description:\n        'Served when the student can open the download, it is published, and it lists the file. Staff may fetch any file a download lists. The storage link lives DELIVERY_URL_EXPIRY seconds.',\n      params: DownloadFileParams,\n      response: responses,\n    },\n    handler: async (req, reply) => {\n      const actor = await actorOf(req.orgId, req.userId);\n      const url = await member.downloadFile(\n        req.orgId,\n        actor,\n        req.params.downloadId,\n        req.params.assetId,\n      );\n      return redirect(reply, url, 'Download file', req.params.assetId);\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/posts/:postId/cover',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getPostCover',\n      tags,\n      summary: \"Redirect to a post's cover image\",\n      description: 'Served to whoever can read the post. 404 when the post has no cover.',\n      params: PostCoverParams,\n      response: responses,\n    },\n    handler: async (req, reply) => {\n      const actor = await actorOf(req.orgId, req.userId);\n      const url = await container.posts.coverFile(req.orgId, actor, req.params.postId);\n      return redirect(reply, url, 'Post cover', req.params.postId);\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/chats/:chatId/messages/:messageId/attachments/:assetId',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getMessageAttachment',\n      tags,\n      summary: 'Redirect to an image attached to a chat message',\n      description:\n        \"Served to the chat's participants while the message stands (staff also after it is deleted), and to moderators while the message is flagged.\",\n      params: MessageAttachmentParams,\n      response: responses,\n    },\n    handler: async (req, reply) => {\n      const actor = await actorOf(req.orgId, req.userId);\n      const url = await container.chats.attachmentFile(\n        req.orgId,\n        actor,\n        req.params.chatId,\n        req.params.messageId,\n        req.params.assetId,\n      );\n      return redirect(reply, url, 'Message attachment', req.params.assetId);\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/people/:orgUserId/image',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getPersonImage',\n      tags,\n      summary: \"Redirect to an org user's profile photo\",\n      description:\n        'Served to org users of the same organization when the photo belongs to it. 404 when the person has no photo here.',\n      params: PersonImageParams,\n      response: responses,\n    },\n    handler: async (req, reply) => {\n      await actorOf(req.orgId, req.userId);\n      const url = await member.personImage(req.orgId, req.params.orgUserId);\n      return redirect(reply, url, 'Profile photo', req.params.orgUserId);\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/uploads/:id/file',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getMemberUploadFile',\n      tags,\n      summary: 'Redirect to an image you uploaded',\n      description: 'Served only to the person who uploaded it, once it is finalized.',\n      params: UploadFileParams,\n      response: responses,\n    },\n    handler: async (req, reply) => {\n      const actor = await actorOf(req.orgId, req.userId);\n      const url = await container.assets.ownUploadFile(req.orgId, req.params.id, actor.id);\n      return redirect(reply, url, 'Upload', req.params.id);\n    },\n  });\n}\n"],"mappings":"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"}
+{"version":3,"file":"files.js","names":[],"sources":["../../../../src/http/routes/member/files.ts"],"sourcesContent":["// Member file proxies. Each route asks the context that owns the file, then\n// redirects to a short-lived signed storage URL. Every refusal is a 404, so a\n// response never confirms that a file exists. A 403 only means the caller is\n// not an active member of the organization.\nimport type { FastifyInstance, FastifyReply } from 'fastify';\nimport type { ZodTypeProvider } from 'fastify-type-provider-zod';\nimport { z } from 'zod';\nimport {\n  ActivityFileParams,\n  CommunityThumbnailParams,\n  CourseThumbnailParams,\n  DownloadFileParams,\n  DownloadThumbnailParams,\n  EventFileParams,\n  EventThumbnailParams,\n  MessageAttachmentParams,\n  PostCoverParams,\n  PostAssetParams,\n  UploadFileParams,\n  refusals,\n} from '../../schemas/index.js';\nimport { resolveActor } from '../../scope.js';\nimport type { Container } from '../../../app/container.js';\n\nconst tags = ['Files'];\nconst responses = { 302: z.void(), ...refusals(403, 404) };\n\nfunction redirect(reply: FastifyReply, url: string) {\n  return reply\n    .header('cache-control', 'no-store')\n    .header('referrer-policy', 'no-referrer')\n    .redirect(url, 302);\n}\n\nexport async function memberFileRoutes(app: FastifyInstance, container: Container): Promise<void> {\n  const r = app.withTypeProvider<ZodTypeProvider>();\n  const member = container.reporting.member;\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/courses/:courseId/thumbnail',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getCourseThumbnail',\n      tags,\n      summary: \"Redirect to a course's thumbnail\",\n      description:\n        'For an unpublished course, which only a holder of `courses:read` on it may fetch: a published course carries a public `thumbnailUrl` instead. 404 when the course has no thumbnail.',\n      params: CourseThumbnailParams,\n      response: responses,\n    },\n    handler: async (req, reply) => {\n      const actor = await resolveActor(container, req);\n      const url = await member.thumbnailFile('course', req.params.courseId, actor);\n      return redirect(reply, url);\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/events/:eventId/thumbnail',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getEventThumbnail',\n      tags,\n      summary: \"Redirect to an event's cover\",\n      description:\n        'For a draft event, which only a holder of `events:read` on it may fetch: a published or canceled event carries a public `thumbnailUrl` instead. 404 when the event read returns 404 or the event has no cover.',\n      params: EventThumbnailParams,\n      response: responses,\n    },\n    handler: async (req, reply) => {\n      const actor = await resolveActor(container, req);\n      const url = await member.thumbnailFile('event', req.params.eventId, actor);\n      return redirect(reply, url);\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/events/:eventId/assets/:assetId',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getEventFile',\n      tags,\n      summary: 'Redirect to a file attached to an event',\n      description:\n        'For a holder of `events:read` on the event or the org, or an attendee of the published or canceled event. Saved under its display name. 404 otherwise, or when the file is not attached to the event.',\n      params: EventFileParams,\n      response: responses,\n    },\n    handler: async (req, reply) => {\n      const actor = await resolveActor(container, req);\n      const url = await member.eventFile(req.params.eventId, req.params.assetId, actor);\n      return redirect(reply, url);\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/downloads/:downloadId/thumbnail',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getDownloadThumbnail',\n      tags,\n      summary: \"Redirect to a download's thumbnail\",\n      description:\n        'For an unpublished download, which only a holder of `downloads:read` on it may fetch: a published download carries a public `thumbnailUrl` instead. 404 when the download has no thumbnail.',\n      params: DownloadThumbnailParams,\n      response: responses,\n    },\n    handler: async (req, reply) => {\n      const actor = await resolveActor(container, req);\n      const url = await member.thumbnailFile('download', req.params.downloadId, actor);\n      return redirect(reply, url);\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/communities/:communityId/thumbnail',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getCommunityThumbnail',\n      tags,\n      summary: \"Redirect to a community's thumbnail\",\n      description:\n        'For an unpublished community, which only a holder of `communities:read` on it may fetch: a published community carries a public `thumbnailUrl` instead. 404 when the community has no thumbnail.',\n      params: CommunityThumbnailParams,\n      response: responses,\n    },\n    handler: async (req, reply) => {\n      const actor = await resolveActor(container, req);\n      const url = await member.thumbnailFile('community', req.params.communityId, actor);\n      return redirect(reply, url);\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/activities/:activityId/assets/:assetId',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getActivityFile',\n      tags,\n      summary: 'Redirect to a file used in a lesson',\n      description:\n        'Served when the person can open the course, the course and the lesson are published, and the lesson lists the file. A holder of `courses:read` on the course may fetch any file a lesson lists. Use the URL as an img, video or audio src.',\n      params: ActivityFileParams,\n      response: responses,\n    },\n    handler: async (req, reply) => {\n      const actor = await resolveActor(container, req);\n      const url = await member.activityFile(req.params.activityId, req.params.assetId, actor);\n      return redirect(reply, url);\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/downloads/:downloadId/assets/:assetId',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getDownloadFile',\n      tags,\n      summary: 'Redirect to a file in a download, saved under its display name',\n      description:\n        'Served when the person can open the download, it is published, and it lists the file. A holder of `downloads:read` on the download may fetch it unpublished. The storage link lives DELIVERY_URL_EXPIRY seconds.',\n      params: DownloadFileParams,\n      response: responses,\n    },\n    handler: async (req, reply) => {\n      const actor = await resolveActor(container, req);\n      const url = await member.downloadFile(req.params.downloadId, req.params.assetId, actor);\n      return redirect(reply, url);\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/posts/:postId/cover',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getPostCover',\n      tags,\n      summary: \"Redirect to a post's cover image\",\n      description:\n        'For a post that is not published, served to whoever can read it: a published post carries a public `coverUrl` instead. 404 when the post has no cover.',\n      params: PostCoverParams,\n      response: responses,\n    },\n    handler: async (req, reply) => {\n      const actor = await resolveActor(container, req);\n      const url = await container.posts.coverFile(req.params.postId, actor);\n      return redirect(reply, url);\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/posts/:postId/assets/:assetId',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getPostAsset',\n      tags,\n      summary: \"Redirect to a file in a post's body\",\n      description:\n        'Served to whoever can read the post while its body shows the file. Images, video, audio and PDFs open in place; any other file downloads under its name.',\n      params: PostAssetParams,\n      response: responses,\n    },\n    handler: async (req, reply) => {\n      const actor = await resolveActor(container, req);\n      const url = await container.posts.assetFile(req.params.postId, req.params.assetId, actor);\n      return redirect(reply, url);\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/chats/:chatId/messages/:messageId/attachments/:assetId',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getMessageAttachment',\n      tags,\n      summary: 'Redirect to an image attached to a chat message',\n      description:\n        \"Served to the chat's participants while the message stands, to holders of `communities:moderate` on the community also after it is deleted, and to them while the message is flagged.\",\n      params: MessageAttachmentParams,\n      response: responses,\n    },\n    handler: async (req, reply) => {\n      const actor = await resolveActor(container, req);\n      const url = await container.chats.attachmentFile(\n        req.params.chatId,\n        req.params.messageId,\n        req.params.assetId,\n        actor,\n      );\n      return redirect(reply, url);\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/uploads/:id/file',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getMemberUploadFile',\n      tags,\n      summary: 'Redirect to an image you uploaded',\n      description: 'Served only to the person who uploaded it, once it is finalized.',\n      params: UploadFileParams,\n      response: responses,\n    },\n    handler: async (req, reply) => {\n      const actor = await resolveActor(container, req);\n      const url = await container.assets.ownUploadFile(req.params.id, actor);\n      return redirect(reply, url);\n    },\n  });\n}\n"],"mappings":"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"}

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

@@ -4,8 +4,11 @@ import { memberCommentsRoutes } from "./comments.js";
 import { memberCommunityRoutes } from "./community.js";
 import { memberCoursesRoutes } from "./courses.js";
 import { memberDownloadsRoutes } from "./downloads.js";
+import { memberEventsRoutes } from "./events.js";
 import { memberFileRoutes } from "./files.js";
 import { memberNotificationRoutes } from "./notifications.js";
+import { memberNotificationSettingsRoutes } from "./notification-settings.js";
+import { memberDeviceRoutes } from "./devices.js";
 import { memberOrgRoutes } from "./org.js";
 import { memberPostRoutes } from "./posts.js";
 import { memberProfileRoutes } from "./profile.js";
@@ -22,8 +25,11 @@ async function memberRoutes(app, container) {
 	await memberCommentsRoutes(app, container);
 	await memberAssetsRoutes(app, container);
 	await memberDownloadsRoutes(app, container);
+	await memberEventsRoutes(app, container);
 	await memberFileRoutes(app, container);
 	await memberNotificationRoutes(app, container);
+	await memberNotificationSettingsRoutes(app, container);
+	await memberDeviceRoutes(app, container);
 }
 //#endregion
 export { memberRoutes };

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../../../src/http/routes/member/index.ts"],"sourcesContent":["// Student HTTP API under `/api/member`. Session-guarded like every\n// back-office route, but scoped by the session's `org_users` row —\n// the reads gate on the person's enrollments, not on staff role. One file per\n// resource; everything under `/api/member` lives in this directory and nowhere\n// else. The course, download, and progress reads call reporting/member.\nimport type { FastifyInstance } from 'fastify';\nimport type { Container } from '../../../app/container.js';\nimport { memberAssetsRoutes } from './assets.js';\nimport { memberChatRoutes } from './chats.js';\nimport { memberCommentsRoutes } from './comments.js';\nimport { memberCommunityRoutes } from './community.js';\nimport { memberCoursesRoutes } from './courses.js';\nimport { memberDownloadsRoutes } from './downloads.js';\nimport { memberFileRoutes } from './files.js';\nimport { memberNotificationRoutes } from './notifications.js';\nimport { memberOrgRoutes } from './org.js';\nimport { memberPostRoutes } from './posts.js';\nimport { memberProfileRoutes } from './profile.js';\nimport { memberProgressRoutes } from './progress.js';\n\nexport async function memberRoutes(app: FastifyInstance, container: Container): Promise<void> {\n  await memberOrgRoutes(app, container);\n  await memberProfileRoutes(app, container);\n  await memberCommunityRoutes(app, container);\n  await memberPostRoutes(app, container);\n  await memberChatRoutes(app, container);\n  await memberCoursesRoutes(app, container);\n  await memberProgressRoutes(app, container);\n  await memberCommentsRoutes(app, container);\n  await memberAssetsRoutes(app, container);\n  await memberDownloadsRoutes(app, container);\n  await memberFileRoutes(app, container);\n  await memberNotificationRoutes(app, container);\n}\n"],"mappings":";;;;;;;;;;;;;AAoBA,eAAsB,aAAa,KAAsB,WAAqC;CAC5F,MAAM,gBAAgB,KAAK,SAAS;CACpC,MAAM,oBAAoB,KAAK,SAAS;CACxC,MAAM,sBAAsB,KAAK,SAAS;CAC1C,MAAM,iBAAiB,KAAK,SAAS;CACrC,MAAM,iBAAiB,KAAK,SAAS;CACrC,MAAM,oBAAoB,KAAK,SAAS;CACxC,MAAM,qBAAqB,KAAK,SAAS;CACzC,MAAM,qBAAqB,KAAK,SAAS;CACzC,MAAM,mBAAmB,KAAK,SAAS;CACvC,MAAM,sBAAsB,KAAK,SAAS;CAC1C,MAAM,iBAAiB,KAAK,SAAS;CACrC,MAAM,yBAAyB,KAAK,SAAS;AAC/C"}
+{"version":3,"file":"index.js","names":[],"sources":["../../../../src/http/routes/member/index.ts"],"sourcesContent":["// Member HTTP API under `/api/member`. Every route resolves the caller's actor,\n// so only an active org user reaches it; the reads gate on the person's grants\n// and permissions. One file per resource; everything under `/api/member` lives\n// in this directory and nowhere else. The course, download, and progress reads\n// call reporting/member.\nimport type { FastifyInstance } from 'fastify';\nimport type { Container } from '../../../app/container.js';\nimport { memberAssetsRoutes } from './assets.js';\nimport { memberChatRoutes } from './chats.js';\nimport { memberCommentsRoutes } from './comments.js';\nimport { memberCommunityRoutes } from './community.js';\nimport { memberCoursesRoutes } from './courses.js';\nimport { memberDownloadsRoutes } from './downloads.js';\nimport { memberEventsRoutes } from './events.js';\nimport { memberFileRoutes } from './files.js';\nimport { memberNotificationRoutes } from './notifications.js';\nimport { memberNotificationSettingsRoutes } from './notification-settings.js';\nimport { memberDeviceRoutes } from './devices.js';\nimport { memberOrgRoutes } from './org.js';\nimport { memberPostRoutes } from './posts.js';\nimport { memberProfileRoutes } from './profile.js';\nimport { memberProgressRoutes } from './progress.js';\n\nexport async function memberRoutes(app: FastifyInstance, container: Container): Promise<void> {\n  await memberOrgRoutes(app, container);\n  await memberProfileRoutes(app, container);\n  await memberCommunityRoutes(app, container);\n  await memberPostRoutes(app, container);\n  await memberChatRoutes(app, container);\n  await memberCoursesRoutes(app, container);\n  await memberProgressRoutes(app, container);\n  await memberCommentsRoutes(app, container);\n  await memberAssetsRoutes(app, container);\n  await memberDownloadsRoutes(app, container);\n  await memberEventsRoutes(app, container);\n  await memberFileRoutes(app, container);\n  await memberNotificationRoutes(app, container);\n  await memberNotificationSettingsRoutes(app, container);\n  await memberDeviceRoutes(app, container);\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAuBA,eAAsB,aAAa,KAAsB,WAAqC;CAC5F,MAAM,gBAAgB,KAAK,SAAS;CACpC,MAAM,oBAAoB,KAAK,SAAS;CACxC,MAAM,sBAAsB,KAAK,SAAS;CAC1C,MAAM,iBAAiB,KAAK,SAAS;CACrC,MAAM,iBAAiB,KAAK,SAAS;CACrC,MAAM,oBAAoB,KAAK,SAAS;CACxC,MAAM,qBAAqB,KAAK,SAAS;CACzC,MAAM,qBAAqB,KAAK,SAAS;CACzC,MAAM,mBAAmB,KAAK,SAAS;CACvC,MAAM,sBAAsB,KAAK,SAAS;CAC1C,MAAM,mBAAmB,KAAK,SAAS;CACvC,MAAM,iBAAiB,KAAK,SAAS;CACrC,MAAM,yBAAyB,KAAK,SAAS;CAC7C,MAAM,iCAAiC,KAAK,SAAS;CACrD,MAAM,mBAAmB,KAAK,SAAS;AACzC"}

package/dist/http/routes/member/notification-settings.d.ts

@@ -0,0 +1,7 @@
+import { Container } from "../../../app/container.js";
+import { FastifyInstance } from "fastify";
+//#region src/http/routes/member/notification-settings.d.ts
+declare function memberNotificationSettingsRoutes(app: FastifyInstance, container: Container): Promise<void>;
+//#endregion
+export { memberNotificationSettingsRoutes };
+//# sourceMappingURL=notification-settings.d.ts.map

package/dist/http/routes/member/notification-settings.js

@@ -0,0 +1,100 @@
+import { refusals } from "../../schemas/shared.js";
+import { resolveCaller } from "../../scope.js";
+import { CommunityParam } from "../../schemas/chats.js";
+import { CommunityNotificationSettings, OrgNotificationSettings, PatchNotificationSettings } from "../../schemas/notifications.js";
+import "../../schemas/index.js";
+import { z } from "zod";
+//#region src/http/routes/member/notification-settings.ts
+async function memberNotificationSettingsRoutes(app, container) {
+	const r = app.withTypeProvider();
+	const tags = ["Notifications"];
+	async function memberOf(req) {
+		const caller = await resolveCaller(container, req);
+		return {
+			...caller.actor,
+			userId: caller.userId
+		};
+	}
+	r.route({
+		method: "GET",
+		url: "/api/member/communities/:communityId/settings/notifications",
+		preHandler: app.requireOrgSession,
+		schema: {
+			operationId: "getMemberCommunityNotificationSettings",
+			tags,
+			summary: "Read how you are told about each notification category in a community",
+			description: "For anyone who can open the community. One entry per category of the list in use that can apply to you, each with the channels it offers on this deployment, whether each is on for you and why (`locked`, `space`, `community`, `spaceDefault` or `default`), and `default`, what the channel would be without your own setting at that level. A per-space category also lists every space you can open, with its name. `digest` is the digest schedule of the community, null when it sends none. 404 when you cannot open the community.",
+			params: CommunityParam,
+			response: {
+				200: CommunityNotificationSettings,
+				...refusals(403, 404)
+			}
+		},
+		handler: async (req) => {
+			return container.reporting.member.communityNotificationSettings(req.params.communityId, await memberOf(req));
+		}
+	});
+	r.route({
+		method: "PATCH",
+		url: "/api/member/communities/:communityId/settings/notifications",
+		preHandler: app.requireOrgSession,
+		schema: {
+			operationId: "setMemberCommunityNotificationSettings",
+			tags,
+			summary: "Switch notification categories on or off per channel in a community",
+			description: "For anyone who can open the community. Each setting switches one category on one channel, for all spaces or, for a per-space category, for one space; `enabled: null` removes your choice so the default applies again. Settings left out keep their values. 404 when you cannot open the community; 422 when a category does not exist, does not offer the channel, the channel is locked, or `spaceId` is given for a category that is not per space.",
+			params: CommunityParam,
+			body: PatchNotificationSettings,
+			response: {
+				204: z.void(),
+				...refusals(400, 403, 404, 422)
+			}
+		},
+		handler: async (req, reply) => {
+			await container.notificationSettings.set({ communityId: req.params.communityId }, req.body.settings, await memberOf(req));
+			return reply.code(204).send();
+		}
+	});
+	r.route({
+		method: "GET",
+		url: "/api/member/settings/notifications",
+		preHandler: app.requireOrgSession,
+		schema: {
+			operationId: "getMemberNotificationSettings",
+			tags,
+			summary: "Read how you are told about notifications outside any community",
+			description: "For anyone signed in to the organization. The organization's categories that can apply to you, such as access and course content, each with the channels it offers, whether each is on for you, and `default`, what it would be without your own setting.",
+			response: {
+				200: OrgNotificationSettings,
+				...refusals(403)
+			}
+		},
+		handler: async (req) => {
+			return container.reporting.member.orgNotificationSettings(await memberOf(req));
+		}
+	});
+	r.route({
+		method: "PATCH",
+		url: "/api/member/settings/notifications",
+		preHandler: app.requireOrgSession,
+		schema: {
+			operationId: "setMemberNotificationSettings",
+			tags,
+			summary: "Switch notification categories outside any community on or off per channel",
+			description: "For anyone signed in to the organization. Works like the community settings, against the organization's categories; `enabled: null` removes your choice. 422 when a category does not exist, does not offer the channel, the channel is locked, or `spaceId` is given.",
+			body: PatchNotificationSettings,
+			response: {
+				204: z.void(),
+				...refusals(400, 403, 422)
+			}
+		},
+		handler: async (req, reply) => {
+			await container.notificationSettings.set("org", req.body.settings, await memberOf(req));
+			return reply.code(204).send();
+		}
+	});
+}
+//#endregion
+export { memberNotificationSettingsRoutes };
+
+//# sourceMappingURL=notification-settings.js.map

package/dist/http/routes/member/notification-settings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"notification-settings.js","names":[],"sources":["../../../../src/http/routes/member/notification-settings.ts"],"sourcesContent":["import type { FastifyInstance, FastifyRequest } from 'fastify';\nimport type { ZodTypeProvider } from 'fastify-type-provider-zod';\nimport { z } from 'zod';\nimport type { Container } from '../../../app/container.js';\nimport { resolveCaller } from '../../scope.js';\nimport {\n  CommunityParam,\n  CommunityNotificationSettings,\n  OrgNotificationSettings,\n  PatchNotificationSettings,\n  refusals,\n} from '../../schemas/index.js';\n\nexport async function memberNotificationSettingsRoutes(\n  app: FastifyInstance,\n  container: Container,\n): Promise<void> {\n  const r = app.withTypeProvider<ZodTypeProvider>();\n  const tags = ['Notifications'];\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/communities/:communityId/settings/notifications',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getMemberCommunityNotificationSettings',\n      tags,\n      summary: 'Read how you are told about each notification category in a community',\n      description:\n        'For anyone who can open the community. One entry per category of the list in use that can apply to you, each with the channels it offers on this deployment, whether each is on for you and why (`locked`, `space`, `community`, `spaceDefault` or `default`), and `default`, what the channel would be without your own setting at that level. A per-space category also lists every space you can open, with its name. `digest` is the digest schedule of the community, null when it sends none. 404 when you cannot open the community.',\n      params: CommunityParam,\n      response: { 200: CommunityNotificationSettings, ...refusals(403, 404) },\n    },\n    handler: async (req) => {\n      return container.reporting.member.communityNotificationSettings(\n        req.params.communityId,\n        await memberOf(req),\n      );\n    },\n  });\n\n  r.route({\n    method: 'PATCH',\n    url: '/api/member/communities/:communityId/settings/notifications',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'setMemberCommunityNotificationSettings',\n      tags,\n      summary: 'Switch notification categories on or off per channel in a community',\n      description:\n        'For anyone who can open the community. Each setting switches one category on one channel, for all spaces or, for a per-space category, for one space; `enabled: null` removes your choice so the default applies again. Settings left out keep their values. 404 when you cannot open the community; 422 when a category does not exist, does not offer the channel, the channel is locked, or `spaceId` is given for a category that is not per space.',\n      params: CommunityParam,\n      body: PatchNotificationSettings,\n      response: { 204: z.void(), ...refusals(400, 403, 404, 422) },\n    },\n    handler: async (req, reply) => {\n      await container.notificationSettings.set(\n        { communityId: req.params.communityId },\n        req.body.settings,\n        await memberOf(req),\n      );\n      return reply.code(204).send();\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/settings/notifications',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getMemberNotificationSettings',\n      tags,\n      summary: 'Read how you are told about notifications outside any community',\n      description:\n        \"For anyone signed in to the organization. The organization's categories that can apply to you, such as access and course content, each with the channels it offers, whether each is on for you, and `default`, what it would be without your own setting.\",\n      response: { 200: OrgNotificationSettings, ...refusals(403) },\n    },\n    handler: async (req) => {\n      return container.reporting.member.orgNotificationSettings(await memberOf(req));\n    },\n  });\n\n  r.route({\n    method: 'PATCH',\n    url: '/api/member/settings/notifications',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'setMemberNotificationSettings',\n      tags,\n      summary: 'Switch notification categories outside any community on or off per channel',\n      description:\n        \"For anyone signed in to the organization. Works like the community settings, against the organization's categories; `enabled: null` removes your choice. 422 when a category does not exist, does not offer the channel, the channel is locked, or `spaceId` is given.\",\n      body: PatchNotificationSettings,\n      response: { 204: z.void(), ...refusals(400, 403, 422) },\n    },\n    handler: async (req, reply) => {\n      await container.notificationSettings.set('org', req.body.settings, await memberOf(req));\n      return reply.code(204).send();\n    },\n  });\n}\n"],"mappings":";;;;;;;AAaA,eAAsB,iCACpB,KACA,WACe;CACf,MAAM,IAAI,IAAI,iBAAkC;CAChD,MAAM,OAAO,CAAC,eAAe;CAE7B,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,QAAQ;GACR,UAAU;IAAE,KAAK;IAA+B,GAAG,SAAS,KAAK,GAAG;GAAE;EACxE;EACA,SAAS,OAAO,QAAQ;GACtB,OAAO,UAAU,UAAU,OAAO,8BAChC,IAAI,OAAO,aACX,MAAM,SAAS,GAAG,CACpB;EACF;CACF,CAAC;CAED,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb;GACA,SAAS;GACT,aACE;GACF,QAAQ;GACR,MAAM;GACN,UAAU;IAAE,KAAK,EAAE,KAAK;IAAG,GAAG,SAAS,KAAK,KAAK,KAAK,GAAG;GAAE;EAC7D;EACA,SAAS,OAAO,KAAK,UAAU;GAC7B,MAAM,UAAU,qBAAqB,IACnC,EAAE,aAAa,IAAI,OAAO,YAAY,GACtC,IAAI,KAAK,UACT,MAAM,SAAS,GAAG,CACpB;GACA,OAAO,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK;EAC9B;CACF,CAAC;CAED,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb;GACA,SAAS;GACT,aACE;GACF,UAAU;IAAE,KAAK;IAAyB,GAAG,SAAS,GAAG;GAAE;EAC7D;EACA,SAAS,OAAO,QAAQ;GACtB,OAAO,UAAU,UAAU,OAAO,wBAAwB,MAAM,SAAS,GAAG,CAAC;EAC/E;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,EAAE,KAAK;IAAG,GAAG,SAAS,KAAK,KAAK,GAAG;GAAE;EACxD;EACA,SAAS,OAAO,KAAK,UAAU;GAC7B,MAAM,UAAU,qBAAqB,IAAI,OAAO,IAAI,KAAK,UAAU,MAAM,SAAS,GAAG,CAAC;GACtF,OAAO,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK;EAC9B;CACF,CAAC;AACH"}

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

@@ -1,12 +1,20 @@
-import { PageQuery, refusals } from "../../schemas/shared.js";
-import { MarkedRead, NotificationIdParam, NotificationPreferences, NotificationView, NotificationsPage, SetNotificationPreferences } from "../../schemas/notifications.js";
+import { refusals } from "../../schemas/shared.js";
+import { resolveCaller } from "../../scope.js";
+import { NotificationFilterQuery, NotificationIdParam, NotificationListQuery, NotificationUnreadCounts, NotificationView, NotificationsPage } from "../../schemas/notifications.js";
 import "../../schemas/index.js";
-import { actorOf } from "./actor.js";
+import { InvalidInputError } from "@headless-lms/core/shared/errors";
+import { z } from "zod";
 //#region src/http/routes/member/notifications.ts
 async function memberNotificationRoutes(app, container) {
 	const r = app.withTypeProvider();
-	const notifications = container.notifications;
 	const tags = ["Notifications"];
+	async function memberOf(req) {
+		const caller = await resolveCaller(container, req);
+		return {
+			...caller.actor,
+			userId: caller.userId
+		};
+	}
 	r.route({
 		method: "GET",
 		url: "/api/member/notifications",
@@ -14,84 +22,100 @@ async function memberNotificationRoutes(app, container) {
 		schema: {
 			operationId: "listMemberNotifications",
 			tags,
-			summary: "List your notifications, newest first, with your unread count",
-			description: "For any member of the organization. Each notification names what it refers to; a post or chat you can no longer see is null.",
-			querystring: PageQuery,
+			summary: "List your notifications, newest first, with the unread count of the same filters",
+			description: "For any member of the organization. Filters combine with AND; the values of one filter combine with OR, and `includeOrg=true` with `communityId` adds the org list, so one query reads a community with the course and account notifications. 400 for `includeOrg` without `communityId` or with `scope`. Each notification carries the current titles, names and excerpts of what it refers to; a subject or parent you can no longer open, or that was deleted, is null. `display` is the text stored when it was sent.",
+			querystring: NotificationListQuery,
 			response: {
 				200: NotificationsPage,
-				...refusals(403)
+				...refusals(400, 403)
 			}
 		},
 		handler: async (req) => {
-			const actor = await actorOf(container, req.orgId, req.userId);
-			return container.reporting.member.notifications(req.orgId, actor, req.userId, req.query);
+			const { page, pageSize, ...filter } = req.query;
+			return container.reporting.member.notifications(filter, {
+				page,
+				pageSize
+			}, await memberOf(req));
 		}
 	});
 	r.route({
-		method: "POST",
-		url: "/api/member/notifications/:notificationId/read",
+		method: "GET",
+		url: "/api/member/notifications/unread-counts",
 		preHandler: app.requireOrgSession,
 		schema: {
-			operationId: "markMemberNotificationRead",
+			operationId: "getMemberNotificationUnreadCounts",
 			tags,
-			summary: "Mark one of your notifications read",
-			description: "For any member of the organization. Returns the notification the way the list shows it. Marking a read notification keeps its first read time. 404 when it is not yours.",
-			params: NotificationIdParam,
+			summary: "Count your unread notifications in the org list and in each community",
+			description: "For any member of the organization. `org` counts the org list; `communities` has one entry per community you can open.",
 			response: {
-				200: NotificationView,
-				...refusals(403, 404)
+				200: NotificationUnreadCounts,
+				...refusals(403)
 			}
 		},
 		handler: async (req) => {
-			const actor = await actorOf(container, req.orgId, req.userId);
-			const notification = await notifications.markNotificationRead(req.orgId, req.userId, req.params.notificationId);
-			return container.reporting.member.notificationView(req.orgId, actor, notification);
+			return container.reporting.member.notificationUnreadCounts(await memberOf(req));
 		}
 	});
 	r.route({
-		method: "POST",
-		url: "/api/member/notifications/read",
+		method: "GET",
+		url: "/api/member/notifications/:notificationId",
 		preHandler: app.requireOrgSession,
 		schema: {
-			operationId: "markAllMemberNotificationsRead",
+			operationId: "getMemberNotification",
 			tags,
-			summary: "Mark all your notifications read",
-			description: "For any signed-in person in the organization. Returns how many were unread.",
-			response: { 200: MarkedRead }
+			summary: "Read one of your notifications",
+			description: "For any member of the organization. The notification as the list shows it, with current titles, names and excerpts; reading it does not mark it read. 404 when it is not yours or was not shown in the app.",
+			params: NotificationIdParam,
+			response: {
+				200: NotificationView,
+				...refusals(403, 404)
+			}
 		},
 		handler: async (req) => {
-			return notifications.markAllNotificationsRead(req.orgId, req.userId);
+			return container.reporting.member.notification(req.params.notificationId, await memberOf(req));
 		}
 	});
 	r.route({
-		method: "GET",
-		url: "/api/member/notification-preferences",
+		method: "POST",
+		url: "/api/member/notifications/:notificationId/read",
 		preHandler: app.requireOrgSession,
 		schema: {
-			operationId: "getMemberNotificationPreferences",
+			operationId: "markMemberNotificationRead",
 			tags,
-			summary: "Read how you are told about each kind of notification",
-			description: "For any signed-in person in the organization. One entry per kind; a kind you never set is on in the app and by email.",
-			response: { 200: NotificationPreferences }
+			summary: "Mark one of your notifications read",
+			description: "For any member of the organization. Marking a read notification keeps its first read time. 404 when it is not yours.",
+			params: NotificationIdParam,
+			response: {
+				204: z.void(),
+				...refusals(403, 404)
+			}
 		},
-		handler: async (req) => {
-			return notifications.notificationPreferences(req.orgId, req.userId);
+		handler: async (req, reply) => {
+			await container.notificationList.markRead(req.params.notificationId, await memberOf(req));
+			return reply.code(204).send();
 		}
 	});
 	r.route({
-		method: "PUT",
-		url: "/api/member/notification-preferences",
+		method: "POST",
+		url: "/api/member/notifications/read",
 		preHandler: app.requireOrgSession,
 		schema: {
-			operationId: "setMemberNotificationPreferences",
+			operationId: "markAllMemberNotificationsRead",
 			tags,
-			summary: "Set how you are told about the given kinds of notification",
-			description: "For any signed-in person in the organization. Changes only the kinds sent and returns every kind.",
-			body: SetNotificationPreferences,
-			response: { 200: NotificationPreferences }
+			summary: "Mark your notifications matching the filters read",
+			description: "For any member of the organization. Takes the filters of the list in the query string, `includeOrg` included; with none, marks every notification read. 400 when the request has a body.",
+			querystring: NotificationFilterQuery,
+			response: {
+				204: z.void(),
+				...refusals(400, 403)
+			}
 		},
-		handler: async (req) => {
-			return notifications.setNotificationPreferences(req.orgId, req.userId, req.body.preferences);
+		preValidation: async (req) => {
+			if (req.body !== void 0) throw new InvalidInputError("Mark-read takes its filters in the query string, not in a body");
+		},
+		handler: async (req, reply) => {
+			await container.notificationList.markAllRead(req.query, await memberOf(req));
+			return reply.code(204).send();
 		}
 	});
 }

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

@@ -1 +1 @@
-{"version":3,"file":"notifications.js","names":[],"sources":["../../../../src/http/routes/member/notifications.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 {\n  MarkedRead,\n  NotificationIdParam,\n  NotificationPreferences,\n  NotificationView,\n  NotificationsPage,\n  PageQuery,\n  SetNotificationPreferences,\n  refusals,\n} from '../../schemas/index.js';\n\nexport async function memberNotificationRoutes(\n  app: FastifyInstance,\n  container: Container,\n): Promise<void> {\n  const r = app.withTypeProvider<ZodTypeProvider>();\n  const notifications = container.notifications;\n  const tags = ['Notifications'];\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/notifications',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'listMemberNotifications',\n      tags,\n      summary: 'List your notifications, newest first, with your unread count',\n      description:\n        'For any member of the organization. Each notification names what it refers to; a post or chat you can no longer see is null.',\n      querystring: PageQuery,\n      response: { 200: NotificationsPage, ...refusals(403) },\n    },\n    handler: async (req) => {\n      const actor = await actorOf(container, req.orgId, req.userId);\n      return container.reporting.member.notifications(req.orgId, actor, req.userId, req.query);\n    },\n  });\n\n  r.route({\n    method: 'POST',\n    url: '/api/member/notifications/:notificationId/read',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'markMemberNotificationRead',\n      tags,\n      summary: 'Mark one of your notifications read',\n      description:\n        'For any member of the organization. Returns the notification the way the list shows it. Marking a read notification keeps its first read time. 404 when it is not yours.',\n      params: NotificationIdParam,\n      response: { 200: NotificationView, ...refusals(403, 404) },\n    },\n    handler: async (req) => {\n      const actor = await actorOf(container, req.orgId, req.userId);\n      const notification = await notifications.markNotificationRead(\n        req.orgId,\n        req.userId,\n        req.params.notificationId,\n      );\n      return container.reporting.member.notificationView(req.orgId, actor, notification);\n    },\n  });\n\n  r.route({\n    method: 'POST',\n    url: '/api/member/notifications/read',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'markAllMemberNotificationsRead',\n      tags,\n      summary: 'Mark all your notifications read',\n      description: 'For any signed-in person in the organization. Returns how many were unread.',\n      response: { 200: MarkedRead },\n    },\n    handler: async (req) => {\n      return notifications.markAllNotificationsRead(req.orgId, req.userId);\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/notification-preferences',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getMemberNotificationPreferences',\n      tags,\n      summary: 'Read how you are told about each kind of notification',\n      description:\n        'For any signed-in person in the organization. One entry per kind; a kind you never set is on in the app and by email.',\n      response: { 200: NotificationPreferences },\n    },\n    handler: async (req) => {\n      return notifications.notificationPreferences(req.orgId, req.userId);\n    },\n  });\n\n  r.route({\n    method: 'PUT',\n    url: '/api/member/notification-preferences',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'setMemberNotificationPreferences',\n      tags,\n      summary: 'Set how you are told about the given kinds of notification',\n      description:\n        'For any signed-in person in the organization. Changes only the kinds sent and returns every kind.',\n      body: SetNotificationPreferences,\n      response: { 200: NotificationPreferences },\n    },\n    handler: async (req) => {\n      return notifications.setNotificationPreferences(req.orgId, req.userId, req.body.preferences);\n    },\n  });\n}\n"],"mappings":";;;;;AAeA,eAAsB,yBACpB,KACA,WACe;CACf,MAAM,IAAI,IAAI,iBAAkC;CAChD,MAAM,gBAAgB,UAAU;CAChC,MAAM,OAAO,CAAC,eAAe;CAE7B,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb;GACA,SAAS;GACT,aACE;GACF,aAAa;GACb,UAAU;IAAE,KAAK;IAAmB,GAAG,SAAS,GAAG;GAAE;EACvD;EACA,SAAS,OAAO,QAAQ;GACtB,MAAM,QAAQ,MAAM,QAAQ,WAAW,IAAI,OAAO,IAAI,MAAM;GAC5D,OAAO,UAAU,UAAU,OAAO,cAAc,IAAI,OAAO,OAAO,IAAI,QAAQ,IAAI,KAAK;EACzF;CACF,CAAC;CAED,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb;GACA,SAAS;GACT,aACE;GACF,QAAQ;GACR,UAAU;IAAE,KAAK;IAAkB,GAAG,SAAS,KAAK,GAAG;GAAE;EAC3D;EACA,SAAS,OAAO,QAAQ;GACtB,MAAM,QAAQ,MAAM,QAAQ,WAAW,IAAI,OAAO,IAAI,MAAM;GAC5D,MAAM,eAAe,MAAM,cAAc,qBACvC,IAAI,OACJ,IAAI,QACJ,IAAI,OAAO,cACb;GACA,OAAO,UAAU,UAAU,OAAO,iBAAiB,IAAI,OAAO,OAAO,YAAY;EACnF;CACF,CAAC;CAED,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb;GACA,SAAS;GACT,aAAa;GACb,UAAU,EAAE,KAAK,WAAW;EAC9B;EACA,SAAS,OAAO,QAAQ;GACtB,OAAO,cAAc,yBAAyB,IAAI,OAAO,IAAI,MAAM;EACrE;CACF,CAAC;CAED,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb;GACA,SAAS;GACT,aACE;GACF,UAAU,EAAE,KAAK,wBAAwB;EAC3C;EACA,SAAS,OAAO,QAAQ;GACtB,OAAO,cAAc,wBAAwB,IAAI,OAAO,IAAI,MAAM;EACpE;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,EAAE,KAAK,wBAAwB;EAC3C;EACA,SAAS,OAAO,QAAQ;GACtB,OAAO,cAAc,2BAA2B,IAAI,OAAO,IAAI,QAAQ,IAAI,KAAK,WAAW;EAC7F;CACF,CAAC;AACH"}
+{"version":3,"file":"notifications.js","names":[],"sources":["../../../../src/http/routes/member/notifications.ts"],"sourcesContent":["import type { FastifyInstance, FastifyRequest } from 'fastify';\nimport type { ZodTypeProvider } from 'fastify-type-provider-zod';\nimport { z } from 'zod';\nimport type { Container } from '../../../app/container.js';\nimport { InvalidInputError } from '@headless-lms/core/shared/errors';\nimport { resolveCaller } from '../../scope.js';\nimport {\n  NotificationFilterQuery,\n  NotificationIdParam,\n  NotificationListQuery,\n  NotificationUnreadCounts,\n  NotificationView,\n  NotificationsPage,\n  refusals,\n} from '../../schemas/index.js';\n\nexport async function memberNotificationRoutes(\n  app: FastifyInstance,\n  container: Container,\n): Promise<void> {\n  const r = app.withTypeProvider<ZodTypeProvider>();\n  const tags = ['Notifications'];\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/notifications',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'listMemberNotifications',\n      tags,\n      summary: 'List your notifications, newest first, with the unread count of the same filters',\n      description:\n        'For any member of the organization. Filters combine with AND; the values of one filter combine with OR, and `includeOrg=true` with `communityId` adds the org list, so one query reads a community with the course and account notifications. 400 for `includeOrg` without `communityId` or with `scope`. Each notification carries the current titles, names and excerpts of what it refers to; a subject or parent you can no longer open, or that was deleted, is null. `display` is the text stored when it was sent.',\n      querystring: NotificationListQuery,\n      response: { 200: NotificationsPage, ...refusals(400, 403) },\n    },\n    handler: async (req) => {\n      const { page, pageSize, ...filter } = req.query;\n      return container.reporting.member.notifications(\n        filter,\n        { page, pageSize },\n        await memberOf(req),\n      );\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/notifications/unread-counts',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getMemberNotificationUnreadCounts',\n      tags,\n      summary: 'Count your unread notifications in the org list and in each community',\n      description:\n        'For any member of the organization. `org` counts the org list; `communities` has one entry per community you can open.',\n      response: { 200: NotificationUnreadCounts, ...refusals(403) },\n    },\n    handler: async (req) => {\n      return container.reporting.member.notificationUnreadCounts(await memberOf(req));\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/notifications/:notificationId',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getMemberNotification',\n      tags,\n      summary: 'Read one of your notifications',\n      description:\n        'For any member of the organization. The notification as the list shows it, with current titles, names and excerpts; reading it does not mark it read. 404 when it is not yours or was not shown in the app.',\n      params: NotificationIdParam,\n      response: { 200: NotificationView, ...refusals(403, 404) },\n    },\n    handler: async (req) => {\n      return container.reporting.member.notification(\n        req.params.notificationId,\n        await memberOf(req),\n      );\n    },\n  });\n\n  r.route({\n    method: 'POST',\n    url: '/api/member/notifications/:notificationId/read',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'markMemberNotificationRead',\n      tags,\n      summary: 'Mark one of your notifications read',\n      description:\n        'For any member of the organization. Marking a read notification keeps its first read time. 404 when it is not yours.',\n      params: NotificationIdParam,\n      response: { 204: z.void(), ...refusals(403, 404) },\n    },\n    handler: async (req, reply) => {\n      await container.notificationList.markRead(req.params.notificationId, await memberOf(req));\n      return reply.code(204).send();\n    },\n  });\n\n  r.route({\n    method: 'POST',\n    url: '/api/member/notifications/read',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'markAllMemberNotificationsRead',\n      tags,\n      summary: 'Mark your notifications matching the filters read',\n      description:\n        'For any member of the organization. Takes the filters of the list in the query string, `includeOrg` included; with none, marks every notification read. 400 when the request has a body.',\n      querystring: NotificationFilterQuery,\n      response: { 204: z.void(), ...refusals(400, 403) },\n    },\n    preValidation: async (req) => {\n      if (req.body !== undefined) {\n        throw new InvalidInputError(\n          'Mark-read takes its filters in the query string, not in a body',\n        );\n      }\n    },\n    handler: async (req, reply) => {\n      await container.notificationList.markAllRead(req.query, await memberOf(req));\n      return reply.code(204).send();\n    },\n  });\n}\n"],"mappings":";;;;;;;AAgBA,eAAsB,yBACpB,KACA,WACe;CACf,MAAM,IAAI,IAAI,iBAAkC;CAChD,MAAM,OAAO,CAAC,eAAe;CAE7B,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,aAAa;GACb,UAAU;IAAE,KAAK;IAAmB,GAAG,SAAS,KAAK,GAAG;GAAE;EAC5D;EACA,SAAS,OAAO,QAAQ;GACtB,MAAM,EAAE,MAAM,UAAU,GAAG,WAAW,IAAI;GAC1C,OAAO,UAAU,UAAU,OAAO,cAChC,QACA;IAAE;IAAM;GAAS,GACjB,MAAM,SAAS,GAAG,CACpB;EACF;CACF,CAAC;CAED,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb;GACA,SAAS;GACT,aACE;GACF,UAAU;IAAE,KAAK;IAA0B,GAAG,SAAS,GAAG;GAAE;EAC9D;EACA,SAAS,OAAO,QAAQ;GACtB,OAAO,UAAU,UAAU,OAAO,yBAAyB,MAAM,SAAS,GAAG,CAAC;EAChF;CACF,CAAC;CAED,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb;GACA,SAAS;GACT,aACE;GACF,QAAQ;GACR,UAAU;IAAE,KAAK;IAAkB,GAAG,SAAS,KAAK,GAAG;GAAE;EAC3D;EACA,SAAS,OAAO,QAAQ;GACtB,OAAO,UAAU,UAAU,OAAO,aAChC,IAAI,OAAO,gBACX,MAAM,SAAS,GAAG,CACpB;EACF;CACF,CAAC;CAED,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb;GACA,SAAS;GACT,aACE;GACF,QAAQ;GACR,UAAU;IAAE,KAAK,EAAE,KAAK;IAAG,GAAG,SAAS,KAAK,GAAG;GAAE;EACnD;EACA,SAAS,OAAO,KAAK,UAAU;GAC7B,MAAM,UAAU,iBAAiB,SAAS,IAAI,OAAO,gBAAgB,MAAM,SAAS,GAAG,CAAC;GACxF,OAAO,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK;EAC9B;CACF,CAAC;CAED,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb;GACA,SAAS;GACT,aACE;GACF,aAAa;GACb,UAAU;IAAE,KAAK,EAAE,KAAK;IAAG,GAAG,SAAS,KAAK,GAAG;GAAE;EACnD;EACA,eAAe,OAAO,QAAQ;GAC5B,IAAI,IAAI,SAAS,KAAA,GACf,MAAM,IAAI,kBACR,gEACF;EAEJ;EACA,SAAS,OAAO,KAAK,UAAU;GAC7B,MAAM,UAAU,iBAAiB,YAAY,IAAI,OAAO,MAAM,SAAS,GAAG,CAAC;GAC3E,OAAO,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK;EAC9B;CACF,CAAC;AACH"}

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

@@ -1,8 +1,7 @@
 import { refusals } from "../../schemas/shared.js";
-import { UnauthorizedError } from "../../plugins/auth.js";
+import { resolveActor } from "../../scope.js";
 import { MemberOrg, MemberViewer } from "../../schemas/member.js";
 import "../../schemas/index.js";
-import { actorOf } from "./actor.js";
 //#region src/http/routes/member/org.ts
 async function memberOrgRoutes(app, container) {
 	const r = app.withTypeProvider();
@@ -18,13 +17,7 @@ async function memberOrgRoutes(app, container) {
 			response: { 200: MemberOrg }
 		},
 		handler: async (req) => {
-			const org = await container.organizations.getById(req.orgId);
-			if (!org) throw new UnauthorizedError("Your session points to an organization that no longer exists");
-			return {
-				id: org.id,
-				name: org.name,
-				slug: org.slug
-			};
+			return container.organizations.portalIdentity(req.orgId);
 		}
 	});
 	r.route({
@@ -35,18 +28,15 @@ async function memberOrgRoutes(app, container) {
 			operationId: "getMemberViewer",
 			tags: ["Organizations"],
 			summary: "Get the caller's identity within the session's org",
-			description: "For a member of the organization: your org user id, which the member API keys on, and your role here.",
+			description: "For a member of the organization: your org user id, which the member API keys on, your org role, the permissions you hold anywhere, and those you hold on the org.",
 			response: {
 				200: MemberViewer,
 				...refusals(403)
 			}
 		},
 		handler: async (req) => {
-			const orgUser = await actorOf(container, req.orgId, req.userId);
-			return {
-				orgUserId: orgUser.id,
-				role: orgUser.role
-			};
+			const actor = await resolveActor(container, req);
+			return container.reporting.member.viewer(actor);
 		}
 	});
 }

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

@@ -1 +1 @@
-{"version":3,"file":"org.js","names":[],"sources":["../../../../src/http/routes/member/org.ts"],"sourcesContent":["import type { FastifyInstance } from 'fastify';\nimport type { ZodTypeProvider } from 'fastify-type-provider-zod';\nimport { MemberOrg, MemberViewer, refusals } from '../../schemas/index.js';\nimport type { Container } from '../../../app/container.js';\nimport { UnauthorizedError } from '../../plugins/auth.js';\nimport { actorOf } from './actor.js';\n\nexport async function memberOrgRoutes(app: FastifyInstance, container: Container): Promise<void> {\n  const r = app.withTypeProvider<ZodTypeProvider>();\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/org',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getMemberOrg',\n      tags: ['Organizations'],\n      summary: \"Get the portal org's public identity (branding)\",\n      description:\n        'For any signed-in person whose session has this organization active. Name and slug only.',\n      response: { 200: MemberOrg },\n    },\n    handler: async (req) => {\n      // The session's org (from `activeOrganizationId`) — surface its display\n      // identity for the portal brand.\n      const org = await container.organizations.getById(req.orgId);\n      if (!org) {\n        throw new UnauthorizedError('Your session points to an organization that no longer exists');\n      }\n      return { id: org.id, name: org.name, slug: org.slug };\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/viewer',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getMemberViewer',\n      tags: ['Organizations'],\n      summary: \"Get the caller's identity within the session's org\",\n      description:\n        'For a member of the organization: your org user id, which the member API keys on, and your role here.',\n      response: { 200: MemberViewer, ...refusals(403) },\n    },\n    handler: async (req) => {\n      const orgUser = await actorOf(container, req.orgId, req.userId);\n      return { orgUserId: orgUser.id, role: orgUser.role };\n    },\n  });\n}\n"],"mappings":";;;;;;AAOA,eAAsB,gBAAgB,KAAsB,WAAqC;CAC/F,MAAM,IAAI,IAAI,iBAAkC;CAEhD,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb,MAAM,CAAC,eAAe;GACtB,SAAS;GACT,aACE;GACF,UAAU,EAAE,KAAK,UAAU;EAC7B;EACA,SAAS,OAAO,QAAQ;GAGtB,MAAM,MAAM,MAAM,UAAU,cAAc,QAAQ,IAAI,KAAK;GAC3D,IAAI,CAAC,KACH,MAAM,IAAI,kBAAkB,8DAA8D;GAE5F,OAAO;IAAE,IAAI,IAAI;IAAI,MAAM,IAAI;IAAM,MAAM,IAAI;GAAK;EACtD;CACF,CAAC;CAED,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb,MAAM,CAAC,eAAe;GACtB,SAAS;GACT,aACE;GACF,UAAU;IAAE,KAAK;IAAc,GAAG,SAAS,GAAG;GAAE;EAClD;EACA,SAAS,OAAO,QAAQ;GACtB,MAAM,UAAU,MAAM,QAAQ,WAAW,IAAI,OAAO,IAAI,MAAM;GAC9D,OAAO;IAAE,WAAW,QAAQ;IAAI,MAAM,QAAQ;GAAK;EACrD;CACF,CAAC;AACH"}
+{"version":3,"file":"org.js","names":[],"sources":["../../../../src/http/routes/member/org.ts"],"sourcesContent":["import type { FastifyInstance } from 'fastify';\nimport type { ZodTypeProvider } from 'fastify-type-provider-zod';\nimport { MemberOrg, MemberViewer, refusals } from '../../schemas/index.js';\nimport type { Container } from '../../../app/container.js';\nimport { resolveActor } from '../../scope.js';\n\nexport async function memberOrgRoutes(app: FastifyInstance, container: Container): Promise<void> {\n  const r = app.withTypeProvider<ZodTypeProvider>();\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/org',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getMemberOrg',\n      tags: ['Organizations'],\n      summary: \"Get the portal org's public identity (branding)\",\n      description:\n        'For any signed-in person whose session has this organization active. Name and slug only.',\n      response: { 200: MemberOrg },\n    },\n    handler: async (req) => {\n      return container.organizations.portalIdentity(req.orgId);\n    },\n  });\n\n  r.route({\n    method: 'GET',\n    url: '/api/member/viewer',\n    preHandler: app.requireOrgSession,\n    schema: {\n      operationId: 'getMemberViewer',\n      tags: ['Organizations'],\n      summary: \"Get the caller's identity within the session's org\",\n      description:\n        'For a member of the organization: your org user id, which the member API keys on, your org role, the permissions you hold anywhere, and those you hold on the org.',\n      response: { 200: MemberViewer, ...refusals(403) },\n    },\n    handler: async (req) => {\n      const actor = await resolveActor(container, req);\n      return container.reporting.member.viewer(actor);\n    },\n  });\n}\n"],"mappings":";;;;;AAMA,eAAsB,gBAAgB,KAAsB,WAAqC;CAC/F,MAAM,IAAI,IAAI,iBAAkC;CAEhD,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb,MAAM,CAAC,eAAe;GACtB,SAAS;GACT,aACE;GACF,UAAU,EAAE,KAAK,UAAU;EAC7B;EACA,SAAS,OAAO,QAAQ;GACtB,OAAO,UAAU,cAAc,eAAe,IAAI,KAAK;EACzD;CACF,CAAC;CAED,EAAE,MAAM;EACN,QAAQ;EACR,KAAK;EACL,YAAY,IAAI;EAChB,QAAQ;GACN,aAAa;GACb,MAAM,CAAC,eAAe;GACtB,SAAS;GACT,aACE;GACF,UAAU;IAAE,KAAK;IAAc,GAAG,SAAS,GAAG;GAAE;EAClD;EACA,SAAS,OAAO,QAAQ;GACtB,MAAM,QAAQ,MAAM,aAAa,WAAW,GAAG;GAC/C,OAAO,UAAU,UAAU,OAAO,OAAO,KAAK;EAChD;CACF,CAAC;AACH"}