placementt-core 1.400.1271 → 1.400.1273

package/.claude/settings.local.json

@@ -0,0 +1,12 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(grep -n \"completedAllDocs\\\\|insuranceRequired\\\\|raRequired\\\\|dbsRequired\\\\|requiredForms\\\\|forms\" /Users/thomasbarton/Documents/GitHub/placementt-backend/functions/src/util.ts | head -50)",
+      "Read(//Users/thomasbarton/Documents/GitHub/Placementt-Backend/functions/src/**)",
+      "Bash(grep -rn \"file_\\\\$\\\\|\\\\`file_\" /Users/thomasbarton/Documents/GitHub/Placementt-Core/src/ /Users/thomasbarton/Documents/GitHub/placementt-backend/functions/src/)",
+      "Bash(awk '/^export type StudentPlacementData/,/^};/' /Users/thomasbarton/Documents/GitHub/Placementt-Core/src/typeDefinitions.ts)",
+      "Bash(cd /Users/thomasbarton/Documents/GitHub && grep -rn \"StudentToolKey\\\\|StudentToolLaunchConfig\\\\|studentTools\\\\b\\\\|activityLogging\\\\b\\\\|\\\\.activityLogging\\\\|StudentAudienceMap\\\\|studentAudiences\\\\|StudentAudience\\\\b\\\\|audienceId\\\\|audiences\" --include=*.ts --include=*.tsx -l placementt-core/src placementt-web/src placementt-backend/functions/src placementt-app/src 2>/dev/null | sort)",
+      "Bash(grep -v \"activityLogging\\\\.ts\\\\|activityLogging\\\\.test\\\\|callables/activityLogging\\\\|from \\\\\"\\\\./activityLogging\\\\\"\\\\|from '\\\\./activityLogging'\\\\|activityLogging\\\\\"$\")"
+    ]
+  }
+}

package/.github/workflows/deploy-dev.yaml

@@ -0,0 +1,39 @@
+name: Deploy dev
+
+# Publishes the emulator (1.300.x) and dev (1.400.x) builds from any branch, so a
+# feature branch can be tried in the dev web app and backend before it is merged.
+# Prod is not touched and nothing is committed. Run it from the Actions tab,
+# choosing the branch, or with: gh workflow run deploy-dev.yaml --ref <branch>
+on:
+  workflow_dispatch:
+
+# Shares the publish queue with the main deploy, so the two never publish at once.
+concurrency:
+  group: npm-publish
+  cancel-in-progress: false
+permissions:
+  contents: read
+  id-token: write         # npm trusted publisher
+jobs:
+  publish-dev:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          registry-url: https://registry.npmjs.org
+
+      - name: Install NPM
+        run: npm install -g npm@latest
+
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Build
+        run: yarn tsc
+
+      - name: Deploy dev and emulator only
+        run: node deploy-all.js --dev-only

package/README.md

@@ -118,4 +118,4 @@ yarn test-local dev
 yarn core dev --restart
 ```
 
-Repeat step 1 + step 3 as you iterate. Once you're happy with the change, commit it here, bump the version, and publish for real (`yarn deploy` / `yarn deploy-all`) — then re-run `yarn core dev` (or `prod`) in the consuming repos without `--restart` to drop back to the real published version instead of the local link.
+Repeat step 1 + step 3 as you iterate. Once you're happy with the change, commit it here, bump the version, and publish for real (`yarn deploy` / `yarn deploy-all`; `yarn deploy-dev` publishes only the `dev` and `emu` tags from the current branch, leaves `prod` alone and commits nothing; publishing needs npm credentials, which only the GitHub trusted publisher has, so run it as the "Deploy dev" workflow from the Actions tab on your branch, or `gh workflow run deploy-dev.yaml --ref <branch>`) — then re-run `yarn core dev` (or `prod`) in the consuming repos without `--restart` to drop back to the real published version instead of the local link.

package/deploy-all.js

@@ -5,11 +5,24 @@ function run(cmd) {
   execSync(cmd, { stdio: 'inherit' });
 }
 
-console.log("📦 Starting automated deploy-all process...");
+// `yarn deploy-dev` runs this with --dev-only: the emulator and dev builds are
+// published from whatever branch is checked out, prod is not touched, and
+// nothing is committed or pushed, so a feature branch can be tried in the dev
+// web app and backend before it is merged.
+const devOnly = process.argv.includes('--dev-only');
+
+// Run through `yarn deploy-*`, npm inherits yarn's registry (registry.yarnpkg.com),
+// which has no login and refuses to publish. Always publish to npm itself.
+process.env.npm_config_registry = 'https://registry.npmjs.org/';
+
+console.log(devOnly ?
+  "📦 Publishing dev and emulator builds only (prod untouched, nothing committed)..." :
+  "📦 Starting automated deploy-all process...");
 
 // ---- Read & bump version ----
 const packageJsonPath = 'package.json';
-const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+const originalPackageJson = fs.readFileSync(packageJsonPath, 'utf8');
+const packageJson = JSON.parse(originalPackageJson);
 
 // package.json can lag the registry (a bump commit that failed to push, or a
 // manual edit), so take the highest patch from either source.
@@ -76,16 +89,18 @@ function toDevAlgoliaConfig(source) {
 
 const prodVersion = `1.1.${nextPatch}`;
 
-// -------------------------------
-// 1️⃣ PROD VERSION (first, so a failing build or publish stops before dev/emu go out)
-// -------------------------------
-updateVersion(prodVersion);
+if (!devOnly) {
+  // -------------------------------
+  // 1️⃣ PROD VERSION (first, so a failing build or publish stops before dev/emu go out)
+  // -------------------------------
+  updateVersion(prodVersion);
 
-console.log("🚀 Building (prod)...");
-run('yarn tsc');
+  console.log("🚀 Building (prod)...");
+  run('yarn tsc');
 
-console.log(`📤 Publishing ${prodVersion}`);
-publishWithTag(prodVersion, 'prod');
+  console.log(`📤 Publishing ${prodVersion}`);
+  publishWithTag(prodVersion, 'prod');
+}
 
 const devFirebaseConfig = originalFirebaseConfig.replace(
   /\(credentialsProd\)/g,
@@ -135,6 +150,9 @@ try {
   console.log("🧹 Resetting source files...");
   fs.writeFileSync(firebaseConfigPath, originalFirebaseConfig);
   fs.writeFileSync(algoliaConfigPath, originalAlgoliaConfig);
+  // A dev-only publish leaves the version as it was: the next full deploy reads
+  // the registry's tags and carries on from the patch this one used.
+  if (devOnly) fs.writeFileSync(packageJsonPath, originalPackageJson);
 }
 
 // Rebuild so lib/ matches the prod source again rather than the dev build.
@@ -144,6 +162,12 @@ run('yarn tsc');
 // pinning re-points every tag at the version it was published with.
 pinDistTags();
 
+if (devOnly) {
+  console.log(`🎉 Published emu ${publishedVersions.emu} and dev ${publishedVersions.dev}. Prod is unchanged. Nothing was committed.`);
+  console.log("   In placementt-web or placementt-backend: yarn core dev (or yarn core em).");
+  process.exit(0);
+}
+
 console.log("🎉 Deployment complete!");
 
 updateVersion(prodVersion);

package/lib/callables/index.d.ts

@@ -17,3 +17,4 @@ export * from "./outreach";
 export * from "./formImport";
 export * from "./activities";
 export * from "./engagement";
+export * from "./registration";

package/lib/callables/index.js

@@ -33,4 +33,5 @@ __exportStar(require("./outreach"), exports);
 __exportStar(require("./formImport"), exports);
 __exportStar(require("./activities"), exports);
 __exportStar(require("./engagement"), exports);
+__exportStar(require("./registration"), exports);
 //# sourceMappingURL=index.js.map

package/lib/callables/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/callables/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,6CAA2B;AAC3B,uDAAqC;AACrC,8CAA4B;AAC5B,2CAAyB;AACzB,6CAA2B;AAC3B,oDAAkC;AAClC,uCAAqB;AACrB,oDAAkC;AAClC,4CAA0B;AAC1B,oDAAkC;AAClC,wCAAsB;AACtB,0CAAwB;AACxB,4CAA0B;AAC1B,mDAAiC;AACjC,6CAA2B;AAC3B,+CAA6B;AAC7B,+CAA6B;AAC7B,+CAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/callables/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,6CAA2B;AAC3B,uDAAqC;AACrC,8CAA4B;AAC5B,2CAAyB;AACzB,6CAA2B;AAC3B,oDAAkC;AAClC,uCAAqB;AACrB,oDAAkC;AAClC,4CAA0B;AAC1B,oDAAkC;AAClC,wCAAsB;AACtB,0CAAwB;AACxB,4CAA0B;AAC1B,mDAAiC;AACjC,6CAA2B;AAC3B,+CAA6B;AAC7B,+CAA6B;AAC7B,+CAA6B;AAC7B,iDAA+B"}

package/lib/callables/registration.d.ts

@@ -0,0 +1,211 @@
+import { z } from "zod";
+export declare const registrationCallables: {
+    /**
+     * Creates a school, trust or hub account. Existing fields are untyped here on
+     * purpose: trust and hub invites send more than this and nothing about them is
+     * changing. The new, optional fields are checked.
+     */
+    "registration-registerInstitute": {
+        request: z.ZodObject<{
+            email: z.ZodString;
+            password: z.ZodString;
+            instituteName: z.ZodString;
+            package: z.ZodString;
+            /** 2 for the self-serve journey. Only honoured for institutes-one with no trust or hub invite. */
+            onboardingVersion: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodNumber>>, number | undefined, number | null | undefined>;
+            /** The sub-modules ticked at sign-up. */
+            picks: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString, "many">>>, string[] | undefined, string[] | null | undefined>;
+            /** The terms tick box, with the wording shown. */
+            termsAccepted: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodObject<{
+                wording: z.ZodString;
+                at: z.ZodString;
+            }, "strip", z.ZodTypeAny, {
+                at: string;
+                wording: string;
+            }, {
+                at: string;
+                wording: string;
+            }>>>, {
+                at: string;
+                wording: string;
+            } | undefined, {
+                at: string;
+                wording: string;
+            } | null | undefined>;
+        }, "passthrough", z.ZodTypeAny, z.objectOutputType<{
+            email: z.ZodString;
+            password: z.ZodString;
+            instituteName: z.ZodString;
+            package: z.ZodString;
+            /** 2 for the self-serve journey. Only honoured for institutes-one with no trust or hub invite. */
+            onboardingVersion: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodNumber>>, number | undefined, number | null | undefined>;
+            /** The sub-modules ticked at sign-up. */
+            picks: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString, "many">>>, string[] | undefined, string[] | null | undefined>;
+            /** The terms tick box, with the wording shown. */
+            termsAccepted: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodObject<{
+                wording: z.ZodString;
+                at: z.ZodString;
+            }, "strip", z.ZodTypeAny, {
+                at: string;
+                wording: string;
+            }, {
+                at: string;
+                wording: string;
+            }>>>, {
+                at: string;
+                wording: string;
+            } | undefined, {
+                at: string;
+                wording: string;
+            } | null | undefined>;
+        }, z.ZodTypeAny, "passthrough">, z.objectInputType<{
+            email: z.ZodString;
+            password: z.ZodString;
+            instituteName: z.ZodString;
+            package: z.ZodString;
+            /** 2 for the self-serve journey. Only honoured for institutes-one with no trust or hub invite. */
+            onboardingVersion: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodNumber>>, number | undefined, number | null | undefined>;
+            /** The sub-modules ticked at sign-up. */
+            picks: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString, "many">>>, string[] | undefined, string[] | null | undefined>;
+            /** The terms tick box, with the wording shown. */
+            termsAccepted: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodObject<{
+                wording: z.ZodString;
+                at: z.ZodString;
+            }, "strip", z.ZodTypeAny, {
+                at: string;
+                wording: string;
+            }, {
+                at: string;
+                wording: string;
+            }>>>, {
+                at: string;
+                wording: string;
+            } | undefined, {
+                at: string;
+                wording: string;
+            } | null | undefined>;
+        }, z.ZodTypeAny, "passthrough">>;
+        response: z.ZodObject<{
+            code: z.ZodNumber;
+            msg: z.ZodObject<{
+                uid: z.ZodString;
+            }, "strip", z.ZodTypeAny, {
+                uid: string;
+            }, {
+                uid: string;
+            }>;
+        }, "strip", z.ZodTypeAny, {
+            code: number;
+            msg: {
+                uid: string;
+            };
+        }, {
+            code: number;
+            msg: {
+                uid: string;
+            };
+        }>;
+    };
+    /** What the activation page shows before the code is typed. Signed out, so the email is masked. */
+    "registration-activationStatus": {
+        request: z.ZodObject<{
+            uid: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            uid: string;
+        }, {
+            uid: string;
+        }>;
+        response: z.ZodObject<{
+            /** "j***@example.sch.uk" */
+            maskedEmail: z.ZodString;
+            /** Already active: the page should offer sign-in instead. */
+            active: z.ZodBoolean;
+            /** Whether the current code has expired. False for a code with no sent time. */
+            expired: z.ZodBoolean;
+            /** When the current code was sent, ISO, if known. */
+            sentAt: z.ZodOptional<z.ZodString>;
+            /** How long a code works for, in hours. */
+            validHours: z.ZodNumber;
+        }, "strip", z.ZodTypeAny, {
+            active: boolean;
+            expired: boolean;
+            maskedEmail: string;
+            validHours: number;
+            sentAt?: string | undefined;
+        }, {
+            active: boolean;
+            expired: boolean;
+            maskedEmail: string;
+            validHours: number;
+            sentAt?: string | undefined;
+        }>;
+    };
+    /** Sends a new activation code. Rate limited to one a minute and ten in total. */
+    "registration-resendActivationCode": {
+        request: z.ZodObject<{
+            uid: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            uid: string;
+        }, {
+            uid: string;
+        }>;
+        response: z.ZodObject<{
+            sent: z.ZodBoolean;
+            maskedEmail: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            sent: boolean;
+            maskedEmail: string;
+        }, {
+            sent: boolean;
+            maskedEmail: string;
+        }>;
+    };
+    /** Search the schools we hold DfE records for, to fill the sign-up form. Public. */
+    "registration-lookupSchool": {
+        request: z.ZodObject<{
+            /** A school name, town or postcode. Two characters or more. */
+            query: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            query: string;
+        }, {
+            query: string;
+        }>;
+        response: z.ZodObject<{
+            schools: z.ZodArray<z.ZodObject<{
+                urn: z.ZodNumber;
+                name: z.ZodString;
+                town: z.ZodString;
+                postcode: z.ZodString;
+                street: z.ZodString;
+            }, "strip", z.ZodTypeAny, {
+                name: string;
+                urn: number;
+                postcode: string;
+                town: string;
+                street: string;
+            }, {
+                name: string;
+                urn: number;
+                postcode: string;
+                town: string;
+                street: string;
+            }>, "many">;
+        }, "strip", z.ZodTypeAny, {
+            schools: {
+                name: string;
+                urn: number;
+                postcode: string;
+                town: string;
+                street: string;
+            }[];
+        }, {
+            schools: {
+                name: string;
+                urn: number;
+                postcode: string;
+                town: string;
+                street: string;
+            }[];
+        }>;
+    };
+};

package/lib/callables/registration.js

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registrationCallables = void 0;
+const zod_1 = require("zod");
+const types_1 = require("./types");
+/**
+ * Contracts for the registration callables (`Placementt-Backend/functions/src/registration.ts`)
+ * added or changed for the self-serve onboarding journey. The older registration
+ * callables keep their loose params; `registration-registerInstitute` gains a
+ * contract that checks only the new fields and passes the rest through.
+ */
+/** A pick a school can make at sign-up (onboardingV2.ts SIGNUP_PICK_KEYS). Unknown keys are ignored by the backend. */
+const signupPick = zod_1.z.string().min(1).max(40);
+exports.registrationCallables = {
+    /**
+     * Creates a school, trust or hub account. Existing fields are untyped here on
+     * purpose: trust and hub invites send more than this and nothing about them is
+     * changing. The new, optional fields are checked.
+     */
+    "registration-registerInstitute": {
+        request: zod_1.z.object({
+            email: zod_1.z.string().trim().email().max(254),
+            password: zod_1.z.string().min(8).max(200),
+            instituteName: zod_1.z.string().trim().min(1).max(200),
+            package: zod_1.z.string().min(1).max(40),
+            /** 2 for the self-serve journey. Only honoured for institutes-one with no trust or hub invite. */
+            onboardingVersion: (0, types_1.optionalField)(zod_1.z.number().int().min(2).max(2)),
+            /** The sub-modules ticked at sign-up. */
+            picks: (0, types_1.optionalField)(zod_1.z.array(signupPick).max(20)),
+            /** The terms tick box, with the wording shown. */
+            termsAccepted: (0, types_1.optionalField)(zod_1.z.object({
+                wording: zod_1.z.string().min(1).max(500),
+                at: zod_1.z.string().min(1).max(40),
+            })),
+        }).passthrough(),
+        response: zod_1.z.object({ code: zod_1.z.number(), msg: zod_1.z.object({ uid: zod_1.z.string() }) }),
+    },
+    /** What the activation page shows before the code is typed. Signed out, so the email is masked. */
+    "registration-activationStatus": {
+        request: zod_1.z.object({ uid: zod_1.z.string().min(1).max(128) }),
+        response: zod_1.z.object({
+            /** "j***@example.sch.uk" */
+            maskedEmail: zod_1.z.string(),
+            /** Already active: the page should offer sign-in instead. */
+            active: zod_1.z.boolean(),
+            /** Whether the current code has expired. False for a code with no sent time. */
+            expired: zod_1.z.boolean(),
+            /** When the current code was sent, ISO, if known. */
+            sentAt: zod_1.z.string().optional(),
+            /** How long a code works for, in hours. */
+            validHours: zod_1.z.number(),
+        }),
+    },
+    /** Sends a new activation code. Rate limited to one a minute and ten in total. */
+    "registration-resendActivationCode": {
+        request: zod_1.z.object({ uid: zod_1.z.string().min(1).max(128) }),
+        response: zod_1.z.object({ sent: zod_1.z.boolean(), maskedEmail: zod_1.z.string() }),
+    },
+    /** Search the schools we hold DfE records for, to fill the sign-up form. Public. */
+    "registration-lookupSchool": {
+        request: zod_1.z.object({
+            /** A school name, town or postcode. Two characters or more. */
+            query: zod_1.z.string().trim().min(2).max(100),
+        }),
+        response: zod_1.z.object({
+            schools: zod_1.z.array(zod_1.z.object({
+                urn: zod_1.z.number(),
+                name: zod_1.z.string(),
+                town: zod_1.z.string(),
+                postcode: zod_1.z.string(),
+                street: zod_1.z.string(),
+            })),
+        }),
+    },
+};
+//# sourceMappingURL=registration.js.map

package/lib/callables/registration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"registration.js","sourceRoot":"","sources":["../../src/callables/registration.ts"],"names":[],"mappings":"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"}