codeforlife 2.6.13 → 2.6.15

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [2.6.15](https://github.com/ocadotechnology/codeforlife-package-javascript/compare/v2.6.14...v2.6.15) (2025-04-24)
+
+
+### Bug Fixes
+
+* Upgrade to Node 22 ([#84](https://github.com/ocadotechnology/codeforlife-package-javascript/issues/84)) ([78de472](https://github.com/ocadotechnology/codeforlife-package-javascript/commit/78de472ae5632df0410536f6593f9cde9beded82))
+
+## [2.6.14](https://github.com/ocadotechnology/codeforlife-package-javascript/compare/v2.6.13...v2.6.14) (2025-03-25)
+
+
+### Bug Fixes
+
+* schemas for user and teacher derivatives ([b068235](https://github.com/ocadotechnology/codeforlife-package-javascript/commit/b0682358a07d2452d526d3bdad9c991302a2203d))
+
 ## [2.6.13](https://github.com/ocadotechnology/codeforlife-package-javascript/compare/v2.6.12...v2.6.13) (2025-03-25)
 
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "codeforlife",
   "description": "Common frontend code",
   "private": false,
-  "version": "2.6.13",
+  "version": "2.6.15",
   "type": "module",
   "scripts": {
     "cli": "VITE_CONFIG=./vite.config.ts ../scripts/frontend/cli $@"
@@ -45,7 +45,7 @@
     "@testing-library/user-event": "^14.5.2",
     "@types/express": "^5.0.0",
     "@types/js-cookie": "^3.0.3",
-    "@types/node": "^20.14.2",
+    "@types/node": "^22.14.1",
     "@types/qs": "^6.9.7",
     "@types/react": "^18.2.47",
     "@types/react-dom": "^18.2.18",

package/src/api/models.ts

@@ -91,6 +91,7 @@ export type NonAdminSchoolTeacher<Fields = Teacher> = SchoolTeacher<Fields> & {
 
 export type NonSchoolTeacher<Fields = Teacher> = Fields & {
   school?: undefined
+  is_admin: false
 }
 
 // -----------------------------------------------------------------------------

package/src/api/schemas.ts

@@ -3,12 +3,23 @@ import * as yup from "yup"
 import { UK_COUNTIES, COUNTRY_ISO_CODES } from "../utils/general"
 import type {
   User,
+  TeacherUser,
+  SchoolTeacherUser,
+  AdminSchoolTeacherUser,
+  NonAdminSchoolTeacherUser,
+  NonSchoolTeacherUser,
   Teacher,
   Student,
   Class,
   School,
   AuthFactor,
   OtpBypassToken,
+  StudentUser,
+  IndependentUser,
+  SchoolTeacher,
+  AdminSchoolTeacher,
+  NonAdminSchoolTeacher,
+  NonSchoolTeacher,
 } from "./models"
 import {
   unicodeAlphanumericString,
@@ -29,6 +40,10 @@ const id = {
   otpBypassToken: numericId(),
 }
 
+// -----------------------------------------------------------------------------
+// User Schemas
+// -----------------------------------------------------------------------------
+
 const _userTeacher: Omit<Schemas<Teacher>, "user"> = {
   id: id.teacher.required(),
   school: id.school,
@@ -65,11 +80,122 @@ export const user: Schemas<User> = {
   student: yup.object(_userStudent).optional(),
 }
 
+export const teacherUser: Schemas<TeacherUser> = {
+  ...user,
+  password: user.password
+    .min(10, "must be at least 10 characters long")
+    .matches(/[A-Z]/, "must contain at least one uppercase letter")
+    .matches(/[a-z]/, "must contain at least one lowercase letter")
+    .matches(/[0-9]/, "must contain at least one digit")
+    .matches(
+      /[!@#$%^&*()_+\-=[\]{};':"\\|,.<>/?]/,
+      "must contain at least one special character",
+    ),
+  email: user.email.required(),
+  last_name: user.last_name.required(),
+  teacher: user.teacher.required(),
+  student: yup.string().oneOf([undefined]),
+}
+
+const _userSchoolTeacher: Omit<Schemas<SchoolTeacher>, "user"> = {
+  ..._userTeacher,
+  school: _userTeacher.school.required(),
+}
+
+export const schoolTeacherUser: Schemas<SchoolTeacherUser> = {
+  ...teacherUser,
+  teacher: yup.object(_userSchoolTeacher),
+}
+
+const _userAdminSchoolTeacher: Omit<Schemas<AdminSchoolTeacher>, "user"> = {
+  ..._userSchoolTeacher,
+  is_admin: _userSchoolTeacher.is_admin.isTrue(),
+}
+
+export const adminSchoolTeacherUser: Schemas<AdminSchoolTeacherUser> = {
+  ...schoolTeacherUser,
+  teacher: yup.object(_userAdminSchoolTeacher),
+}
+
+const _userNonAdminSchoolTeacher: Omit<
+  Schemas<NonAdminSchoolTeacher>,
+  "user"
+> = {
+  ..._userSchoolTeacher,
+  is_admin: _userSchoolTeacher.is_admin.isFalse(),
+}
+
+export const nonAdminSchoolTeacherUser: Schemas<NonAdminSchoolTeacherUser> = {
+  ...schoolTeacherUser,
+  teacher: yup.object(_userNonAdminSchoolTeacher),
+}
+
+const _userNonSchoolTeacher: Omit<Schemas<NonSchoolTeacher>, "user"> = {
+  ..._userTeacher,
+  school: yup.string().oneOf([undefined]),
+  is_admin: _userTeacher.is_admin.isFalse(),
+}
+
+export const nonSchoolTeacherUser: Schemas<NonSchoolTeacherUser> = {
+  ...teacherUser,
+  teacher: yup.object(_userNonSchoolTeacher),
+}
+
+export const studentUser: Schemas<StudentUser> = {
+  ...user,
+  password: user.password.min(6, "must be at least 6 characters long"),
+  email: user.email.oneOf([undefined]),
+  last_name: user.last_name.oneOf([undefined]),
+  teacher: yup.string().oneOf([undefined]),
+  student: user.student.required(),
+}
+
+export const indyUser: Schemas<IndependentUser> = {
+  ...user,
+  password: user.password
+    .min(8, "must be at least 8 characters long")
+    .matches(/[A-Z]/, "must contain at least one uppercase letter")
+    .matches(/[a-z]/, "must contain at least one lowercase letter")
+    .matches(/[0-9]/, "must contain at least one digit"),
+  email: user.email.required(),
+  last_name: user.last_name.required(),
+  teacher: yup.string().oneOf([undefined]),
+  student: yup.string().oneOf([undefined]),
+}
+
+// -----------------------------------------------------------------------------
+// Teacher Schemas
+// -----------------------------------------------------------------------------
+
 export const teacher: Schemas<Teacher> = {
   ..._userTeacher,
   user: id.user.required(),
 }
 
+export const schoolTeacher: Schemas<SchoolTeacher> = {
+  ..._userSchoolTeacher,
+  user: id.user.required(),
+}
+
+export const adminSchoolTeacher: Schemas<AdminSchoolTeacher> = {
+  ..._userAdminSchoolTeacher,
+  user: id.user.required(),
+}
+
+export const nonAdminSchoolTeacher: Schemas<NonAdminSchoolTeacher> = {
+  ..._userNonAdminSchoolTeacher,
+  user: id.user.required(),
+}
+
+export const nonSchoolTeacher: Schemas<NonSchoolTeacher> = {
+  ..._userNonSchoolTeacher,
+  user: id.user.required(),
+}
+
+// -----------------------------------------------------------------------------
+// Other Schemas
+// -----------------------------------------------------------------------------
+
 export const student: Schemas<Student> = {
   ..._userStudent,
   user: id.user.required(),