@studious-lms/server 1.7.0 → 1.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (212) hide show
  1. package/dist/middleware/security.d.ts.map +1 -1
  2. package/dist/middleware/security.js +3 -3
  3. package/dist/middleware/security.js.map +1 -1
  4. package/dist/models/access.d.ts +21 -66
  5. package/dist/models/access.d.ts.map +1 -1
  6. package/dist/models/access.js +10 -26
  7. package/dist/models/access.js.map +1 -1
  8. package/dist/models/agenda.d.ts +4 -2
  9. package/dist/models/agenda.d.ts.map +1 -1
  10. package/dist/models/announcement.d.ts +4 -3
  11. package/dist/models/announcement.d.ts.map +1 -1
  12. package/dist/models/announcement.js +2 -3
  13. package/dist/models/announcement.js.map +1 -1
  14. package/dist/models/assignment.d.ts +40 -33
  15. package/dist/models/assignment.d.ts.map +1 -1
  16. package/dist/models/auth.d.ts +2 -4
  17. package/dist/models/auth.d.ts.map +1 -1
  18. package/dist/models/auth.js +2 -3
  19. package/dist/models/auth.js.map +1 -1
  20. package/dist/models/class.d.ts +34 -6
  21. package/dist/models/class.d.ts.map +1 -1
  22. package/dist/models/class.js +15 -2
  23. package/dist/models/class.js.map +1 -1
  24. package/dist/models/cloudStorage.d.ts +153 -0
  25. package/dist/models/cloudStorage.d.ts.map +1 -0
  26. package/dist/models/cloudStorage.js +295 -0
  27. package/dist/models/cloudStorage.js.map +1 -0
  28. package/dist/models/comment.d.ts +0 -24
  29. package/dist/models/comment.d.ts.map +1 -1
  30. package/dist/models/comment.js +2 -6
  31. package/dist/models/comment.js.map +1 -1
  32. package/dist/models/conversation.d.ts +22 -22
  33. package/dist/models/department.d.ts +154 -0
  34. package/dist/models/department.d.ts.map +1 -0
  35. package/dist/models/department.js +135 -0
  36. package/dist/models/department.js.map +1 -0
  37. package/dist/models/event.d.ts +10 -4
  38. package/dist/models/event.d.ts.map +1 -1
  39. package/dist/models/event.js +2 -5
  40. package/dist/models/event.js.map +1 -1
  41. package/dist/models/file.d.ts +52 -36
  42. package/dist/models/file.d.ts.map +1 -1
  43. package/dist/models/file.js +4 -42
  44. package/dist/models/file.js.map +1 -1
  45. package/dist/models/folder.d.ts +47 -0
  46. package/dist/models/folder.d.ts.map +1 -1
  47. package/dist/models/labChat.d.ts +11 -9
  48. package/dist/models/labChat.d.ts.map +1 -1
  49. package/dist/models/message.d.ts +46 -12
  50. package/dist/models/message.d.ts.map +1 -1
  51. package/dist/models/message.js +19 -10
  52. package/dist/models/message.js.map +1 -1
  53. package/dist/models/newtonChat.d.ts +2 -1
  54. package/dist/models/newtonChat.d.ts.map +1 -1
  55. package/dist/models/school.d.ts +45 -12
  56. package/dist/models/school.d.ts.map +1 -1
  57. package/dist/models/school.js +19 -2
  58. package/dist/models/school.js.map +1 -1
  59. package/dist/models/section.d.ts +2 -1
  60. package/dist/models/section.d.ts.map +1 -1
  61. package/dist/models/tag.d.ts +117 -0
  62. package/dist/models/tag.d.ts.map +1 -0
  63. package/dist/models/tag.js +113 -0
  64. package/dist/models/tag.js.map +1 -0
  65. package/dist/models/worksheet.d.ts +3 -0
  66. package/dist/models/worksheet.d.ts.map +1 -1
  67. package/dist/pipelines/aiLabChatContract.d.ts +8 -8
  68. package/dist/routers/_app.d.ts +6704 -5222
  69. package/dist/routers/_app.d.ts.map +1 -1
  70. package/dist/routers/_app.js +8 -2
  71. package/dist/routers/_app.js.map +1 -1
  72. package/dist/routers/agenda.d.ts +4 -2
  73. package/dist/routers/agenda.d.ts.map +1 -1
  74. package/dist/routers/announcement.d.ts.map +1 -1
  75. package/dist/routers/announcement.js +3 -5
  76. package/dist/routers/announcement.js.map +1 -1
  77. package/dist/routers/assignment.d.ts +49 -40
  78. package/dist/routers/assignment.d.ts.map +1 -1
  79. package/dist/routers/assignment.js +2 -3
  80. package/dist/routers/assignment.js.map +1 -1
  81. package/dist/routers/class.d.ts +92 -19
  82. package/dist/routers/class.d.ts.map +1 -1
  83. package/dist/routers/class.js +5 -2
  84. package/dist/routers/class.js.map +1 -1
  85. package/dist/routers/conversation.d.ts +5 -5
  86. package/dist/routers/department.d.ts +293 -0
  87. package/dist/routers/department.d.ts.map +1 -0
  88. package/dist/routers/department.js +93 -0
  89. package/dist/routers/department.js.map +1 -0
  90. package/dist/routers/event.d.ts +4 -3
  91. package/dist/routers/event.d.ts.map +1 -1
  92. package/dist/routers/file.d.ts +10 -8
  93. package/dist/routers/file.d.ts.map +1 -1
  94. package/dist/routers/file.js +26 -17
  95. package/dist/routers/file.js.map +1 -1
  96. package/dist/routers/folder.d.ts +163 -186
  97. package/dist/routers/folder.d.ts.map +1 -1
  98. package/dist/routers/folder.js +102 -88
  99. package/dist/routers/folder.js.map +1 -1
  100. package/dist/routers/labChat.d.ts +13 -4
  101. package/dist/routers/labChat.d.ts.map +1 -1
  102. package/dist/routers/message.d.ts +20 -2
  103. package/dist/routers/message.d.ts.map +1 -1
  104. package/dist/routers/newtonChat.d.ts +10 -1
  105. package/dist/routers/newtonChat.d.ts.map +1 -1
  106. package/dist/routers/permissions.d.ts +120 -0
  107. package/dist/routers/permissions.d.ts.map +1 -0
  108. package/dist/routers/permissions.js +50 -0
  109. package/dist/routers/permissions.js.map +1 -0
  110. package/dist/routers/school.d.ts +160 -17
  111. package/dist/routers/school.d.ts.map +1 -1
  112. package/dist/routers/school.js +46 -3
  113. package/dist/routers/school.js.map +1 -1
  114. package/dist/routers/tag.d.ts +119 -0
  115. package/dist/routers/tag.d.ts.map +1 -0
  116. package/dist/routers/tag.js +52 -0
  117. package/dist/routers/tag.js.map +1 -0
  118. package/dist/routers/worksheet.d.ts +1 -0
  119. package/dist/routers/worksheet.d.ts.map +1 -1
  120. package/dist/seedDatabase.d.ts +0 -1
  121. package/dist/seedDatabase.d.ts.map +1 -1
  122. package/dist/services/agenda.d.ts +4 -2
  123. package/dist/services/agenda.d.ts.map +1 -1
  124. package/dist/services/assignment.d.ts +49 -40
  125. package/dist/services/assignment.d.ts.map +1 -1
  126. package/dist/services/class.d.ts +92 -19
  127. package/dist/services/class.d.ts.map +1 -1
  128. package/dist/services/class.js +92 -5
  129. package/dist/services/class.js.map +1 -1
  130. package/dist/services/conversation.d.ts +5 -5
  131. package/dist/services/department.d.ts +200 -0
  132. package/dist/services/department.d.ts.map +1 -0
  133. package/dist/services/department.js +368 -0
  134. package/dist/services/department.js.map +1 -0
  135. package/dist/services/event.d.ts +4 -3
  136. package/dist/services/event.d.ts.map +1 -1
  137. package/dist/services/file.d.ts +105 -3
  138. package/dist/services/file.d.ts.map +1 -1
  139. package/dist/services/file.js +167 -41
  140. package/dist/services/file.js.map +1 -1
  141. package/dist/services/folder.d.ts +220 -149
  142. package/dist/services/folder.d.ts.map +1 -1
  143. package/dist/services/folder.js +326 -196
  144. package/dist/services/folder.js.map +1 -1
  145. package/dist/services/labChat.d.ts +13 -4
  146. package/dist/services/labChat.d.ts.map +1 -1
  147. package/dist/services/labChat.js +4 -3
  148. package/dist/services/labChat.js.map +1 -1
  149. package/dist/services/message.d.ts +20 -2
  150. package/dist/services/message.d.ts.map +1 -1
  151. package/dist/services/message.js +7 -23
  152. package/dist/services/message.js.map +1 -1
  153. package/dist/services/newtonChat.d.ts +9 -0
  154. package/dist/services/newtonChat.d.ts.map +1 -1
  155. package/dist/services/newtonChat.js +4 -3
  156. package/dist/services/newtonChat.js.map +1 -1
  157. package/dist/services/permissions.d.ts +188 -0
  158. package/dist/services/permissions.d.ts.map +1 -0
  159. package/dist/services/permissions.js +661 -0
  160. package/dist/services/permissions.js.map +1 -0
  161. package/dist/services/school.d.ts +142 -15
  162. package/dist/services/school.d.ts.map +1 -1
  163. package/dist/services/school.js +308 -54
  164. package/dist/services/school.js.map +1 -1
  165. package/dist/services/tag.d.ts +71 -0
  166. package/dist/services/tag.d.ts.map +1 -0
  167. package/dist/services/tag.js +178 -0
  168. package/dist/services/tag.js.map +1 -0
  169. package/dist/services/worksheet.d.ts +1 -0
  170. package/dist/services/worksheet.d.ts.map +1 -1
  171. package/dist/utils/aiUser.d.ts.map +1 -1
  172. package/dist/utils/aiUser.js +2 -3
  173. package/dist/utils/aiUser.js.map +1 -1
  174. package/package.json +1 -1
  175. package/prisma/migrations/20260509220000_institution_overhaul/migration.sql +184 -0
  176. package/prisma/migrations/20260510170000_add_folder_permissions/migration.sql +93 -0
  177. package/prisma/schema.prisma +193 -35
  178. package/src/middleware/security.ts +1 -1
  179. package/src/models/access.ts +8 -24
  180. package/src/models/announcement.ts +0 -1
  181. package/src/models/auth.ts +0 -1
  182. package/src/models/class.ts +13 -0
  183. package/src/models/cloudStorage.ts +327 -0
  184. package/src/models/comment.ts +0 -4
  185. package/src/models/department.ts +159 -0
  186. package/src/models/event.ts +0 -3
  187. package/src/models/file.ts +2 -40
  188. package/src/models/message.ts +19 -5
  189. package/src/models/school.ts +26 -0
  190. package/src/models/tag.ts +140 -0
  191. package/src/routers/_app.ts +6 -0
  192. package/src/routers/announcement.ts +1 -3
  193. package/src/routers/assignment.ts +0 -1
  194. package/src/routers/class.ts +3 -0
  195. package/src/routers/department.ts +174 -0
  196. package/src/routers/file.ts +29 -26
  197. package/src/routers/folder.ts +127 -118
  198. package/src/routers/permissions.ts +71 -0
  199. package/src/routers/school.ts +83 -0
  200. package/src/routers/tag.ts +78 -0
  201. package/src/services/class.ts +109 -4
  202. package/src/services/department.ts +478 -0
  203. package/src/services/file.ts +172 -43
  204. package/src/services/folder.ts +399 -237
  205. package/src/services/labChat.ts +2 -1
  206. package/src/services/message.ts +5 -21
  207. package/src/services/newtonChat.ts +2 -1
  208. package/src/services/permissions.ts +778 -0
  209. package/src/services/school.ts +369 -57
  210. package/src/services/tag.ts +229 -0
  211. package/src/utils/aiUser.ts +0 -1
  212. package/tests/unit/services/permissions.test.ts +463 -0
@@ -1,6 +1,23 @@
1
1
  /**
2
- * File service – signed URLs, move, rename, delete. Handles permission checks
3
- * for assignment, submission, announcement, folder, and user-owned files.
2
+ * File service – signed URLs, move, rename, delete.
3
+ *
4
+ * Two access concepts coexist here, and they should not be conflated:
5
+ *
6
+ * 1. **Contextual access** — assignment, submission, announcement, and chat
7
+ * attachments. A teacher viewing a student's submission has access by
8
+ * virtue of teaching the class, not because anyone explicitly "shared"
9
+ * the file with them. These checks live inline in `getFileSignedUrl`
10
+ * below and predate the explicit-share system.
11
+ *
12
+ * 2. **Explicit-share access** — folder-scoped files in cloud storage.
13
+ * Permission flows through the central resolver in `permissions.ts`,
14
+ * which consults explicit `Permission` rows in addition to the
15
+ * scope-derived defaults. The cloud-storage helpers (`*Scoped` /
16
+ * `*Generic`) below all use this path.
17
+ *
18
+ * If you're tempted to refactor the contextual checks into the resolver,
19
+ * don't — they intentionally key off the file's domain context, not its
20
+ * filesystem location.
4
21
  */
5
22
  import { TRPCError } from "@trpc/server";
6
23
  import { getSignedUrl, deleteFile } from "../lib/googleCloudStorage.js";
@@ -15,17 +32,37 @@ import {
15
32
  deleteFileById,
16
33
  } from "../models/file.js";
17
34
  import { findConversationMembership } from "../models/message.js";
35
+ import { prisma } from "../lib/prisma.js";
36
+ import { resolveFolderScope } from "../models/cloudStorage.js";
37
+ import { requireFolderAccess } from "./folder.js";
38
+ import { requireFileAccess } from "./permissions.js";
18
39
 
19
40
  function isSchoolAdminForClass(classData: any, userId: string) {
20
41
  return Boolean(
21
42
  classData?.school?.memberships?.some(
22
43
  (membership: { userId: string }) => membership.userId === userId
23
- ) ||
24
- classData?.school?.users?.some((admin: { id: string }) => admin.id === userId)
44
+ )
25
45
  );
26
46
  }
27
47
 
28
- /** Generate a signed URL for file download. Validates user has access. */
48
+ /**
49
+ * Generate a signed URL for file download.
50
+ *
51
+ * Access resolution, in order — first match wins:
52
+ * 1. Owner of the file.
53
+ * 2. Member of the conversation the file is attached to (chat upload).
54
+ * 3. Contextual access via the file's class context: assignment / announcement
55
+ * / submission / annotations attached to a class the user teaches, learns
56
+ * in, or is a school admin for.
57
+ * 4. The central permissions resolver, which covers folder-scoped files —
58
+ * explicit Permission grants (USER / TAG / CLASS / DEPARTMENT / SCHOOL
59
+ * principals) plus scope defaults (school members read SCHOOL_STORAGE,
60
+ * class members read class folders, owners read personal folders).
61
+ *
62
+ * The resolver is invoked unconditionally as the last step, so files shared
63
+ * via the new Permission system reach this code path even when they have no
64
+ * matching domain context.
65
+ */
29
66
  export async function getFileSignedUrl(userId: string, fileId: string) {
30
67
  const file = await findFileById(fileId);
31
68
  if (!file) {
@@ -37,58 +74,58 @@ export async function getFileSignedUrl(userId: string, fileId: string) {
37
74
 
38
75
  let hasAccess = false;
39
76
 
40
- if (file.assignment?.class) {
41
- const isTeacher = file.assignment.class.teachers.some(
42
- (t) => t.id === userId
43
- );
44
- const isStudent = file.assignment.class.students.some(
45
- (s) => s.id === userId
46
- );
47
- const isSchoolAdmin = isSchoolAdminForClass(file.assignment.class, userId);
48
- logger.info(
49
- `Assignment file access check - userId: ${userId}, isTeacher: ${isTeacher}, isStudent: ${isStudent}, isSchoolAdmin: ${isSchoolAdmin}`
50
- );
51
- hasAccess = isTeacher || isStudent || isSchoolAdmin;
77
+ if (file.userId === userId) {
78
+ hasAccess = true;
52
79
  }
53
80
 
54
- if ((file as any).announcement?.class) {
55
- const ann = (file as any).announcement;
56
- const isTeacher = ann.class.teachers.some((t: any) => t.id === userId);
57
- const isStudent = ann.class.students.some((s: any) => s.id === userId);
58
- const isSchoolAdmin = isSchoolAdminForClass(ann.class, userId);
59
- hasAccess = hasAccess || isTeacher || isStudent || isSchoolAdmin;
81
+ if (!hasAccess && file.conversationId) {
82
+ const membership = await findConversationMembership(file.conversationId, userId);
83
+ hasAccess = Boolean(membership);
60
84
  }
61
85
 
62
- if (file.submission?.assignment?.classId) {
86
+ if (!hasAccess && file.assignment?.class) {
87
+ const cls = file.assignment.class;
63
88
  hasAccess =
64
- hasAccess ||
65
- file.submission.studentId === userId ||
66
- file.submission.assignment.class.teachers.some((t) => t.id === userId) ||
67
- isSchoolAdminForClass(file.submission.assignment.class, userId);
89
+ cls.teachers.some((t) => t.id === userId) ||
90
+ cls.students.some((s) => s.id === userId) ||
91
+ isSchoolAdminForClass(cls, userId);
68
92
  }
69
93
 
70
- if (file.annotations?.assignment?.classId) {
94
+ if (!hasAccess && (file as any).announcement?.class) {
95
+ const cls = (file as any).announcement.class;
71
96
  hasAccess =
72
- hasAccess ||
73
- file.annotations.studentId === userId ||
74
- file.annotations.assignment.class.teachers.some((t) => t.id === userId) ||
75
- isSchoolAdminForClass(file.annotations.assignment.class, userId);
97
+ cls.teachers.some((t: { id: string }) => t.id === userId) ||
98
+ cls.students.some((s: { id: string }) => s.id === userId) ||
99
+ isSchoolAdminForClass(cls, userId);
76
100
  }
77
101
 
78
- if (file.userId === userId) {
79
- hasAccess = true;
102
+ if (!hasAccess && file.submission?.assignment?.classId) {
103
+ const cls = file.submission.assignment.class;
104
+ hasAccess =
105
+ file.submission.studentId === userId ||
106
+ cls.teachers.some((t) => t.id === userId) ||
107
+ isSchoolAdminForClass(cls, userId);
80
108
  }
81
109
 
82
- if (file.conversationId) {
83
- const membership = await findConversationMembership(file.conversationId, userId);
84
- hasAccess = hasAccess || Boolean(membership);
110
+ if (!hasAccess && file.annotations?.assignment?.classId) {
111
+ const cls = file.annotations.assignment.class;
112
+ hasAccess =
113
+ file.annotations.studentId === userId ||
114
+ cls.teachers.some((t) => t.id === userId) ||
115
+ isSchoolAdminForClass(cls, userId);
85
116
  }
86
117
 
87
- if (file.folder?.class) {
88
- const isTeacher = file.folder.class.teachers.some((t) => t.id === userId);
89
- const isStudent = file.folder.class.students.some((s) => s.id === userId);
90
- const isSchoolAdmin = isSchoolAdminForClass(file.folder.class, userId);
91
- hasAccess = hasAccess || isTeacher || isStudent || isSchoolAdmin;
118
+ // Final fallback: the explicit-share + scope-default resolver. Covers
119
+ // folder-scoped files shared via Permission grants (incl. SCHOOL/CLASS/TAG
120
+ // principals) and any institution member reading SCHOOL_STORAGE files.
121
+ // Safe to call for unfiled files — the resolver returns owner-only there.
122
+ if (!hasAccess) {
123
+ try {
124
+ await requireFileAccess(userId, fileId, "READ");
125
+ hasAccess = true;
126
+ } catch {
127
+ // resolver denied — fall through to FORBIDDEN below.
128
+ }
92
129
  }
93
130
 
94
131
  if (!hasAccess) {
@@ -185,3 +222,95 @@ export async function deleteFileRecord(fileId: string, classId: string) {
185
222
  await deleteFileById(fileId);
186
223
  return { success: true };
187
224
  }
225
+
226
+ /**
227
+ * Scope-aware move: works for class, school, and personal storage. Source
228
+ * and target must live in the same scope (no cross-scope moves).
229
+ */
230
+ export async function moveFileScoped(
231
+ userId: string,
232
+ input: { fileId: string; targetFolderId: string }
233
+ ) {
234
+ const file = await findFileWithFolder(input.fileId);
235
+ if (!file?.folderId) {
236
+ throw new TRPCError({ code: "NOT_FOUND", message: "File not found" });
237
+ }
238
+ const [sourceScope, targetScope] = await Promise.all([
239
+ resolveFolderScope(file.folderId),
240
+ resolveFolderScope(input.targetFolderId),
241
+ ]);
242
+ if (!sourceScope || !targetScope) {
243
+ throw new TRPCError({ code: "NOT_FOUND", message: "Folder not found" });
244
+ }
245
+ if (JSON.stringify(sourceScope) !== JSON.stringify(targetScope)) {
246
+ throw new TRPCError({
247
+ code: "BAD_REQUEST",
248
+ message: "Cannot move files between scopes",
249
+ });
250
+ }
251
+ await requireFolderAccess(userId, file.folderId, "WRITE");
252
+ await requireFolderAccess(userId, input.targetFolderId, "WRITE");
253
+ return updateFileFolder(input.fileId, input.targetFolderId);
254
+ }
255
+
256
+ /** Scope-aware rename. */
257
+ export async function renameFileScoped(
258
+ userId: string,
259
+ input: { fileId: string; newName: string }
260
+ ) {
261
+ const trimmed = input.newName.trim();
262
+ if (!trimmed) {
263
+ throw new TRPCError({
264
+ code: "BAD_REQUEST",
265
+ message: "File name cannot be empty",
266
+ });
267
+ }
268
+ const file = await findFileWithFolder(input.fileId);
269
+ if (!file) {
270
+ throw new TRPCError({ code: "NOT_FOUND", message: "File not found" });
271
+ }
272
+ if (file.folderId) {
273
+ await requireFolderAccess(userId, file.folderId, "WRITE");
274
+ } else if (file.userId !== userId) {
275
+ throw new TRPCError({
276
+ code: "FORBIDDEN",
277
+ message: "You don't own this file",
278
+ });
279
+ }
280
+ return updateFileName(input.fileId, trimmed);
281
+ }
282
+
283
+ /**
284
+ * Generic delete that works across class / school / personal storage by
285
+ * deriving permissions from the parent folder's CloudScope (or owning user
286
+ * for unfiled files).
287
+ */
288
+ export async function deleteFileGeneric(userId: string, fileId: string) {
289
+ const file = await findFileWithFolderAndThumbnail(fileId);
290
+ if (!file) {
291
+ throw new TRPCError({ code: "NOT_FOUND", message: "File not found" });
292
+ }
293
+ if (file.folderId) {
294
+ await requireFolderAccess(userId, file.folderId, "WRITE");
295
+ } else if (file.userId !== userId) {
296
+ throw new TRPCError({
297
+ code: "FORBIDDEN",
298
+ message: "You don't own this file",
299
+ });
300
+ }
301
+ try {
302
+ if (file.uploadStatus === "COMPLETED") {
303
+ await deleteFile(file.path);
304
+ if (file.thumbnail) {
305
+ await deleteFile(file.thumbnail.path);
306
+ }
307
+ }
308
+ } catch (error) {
309
+ logger.warn(
310
+ `Failed to delete file ${file.path}:`,
311
+ error as Record<string, unknown>
312
+ );
313
+ }
314
+ await deleteFileById(fileId);
315
+ return { success: true };
316
+ }