@plusscommunities/pluss-maintenance-aws-forms 2.1.46 → 2.1.47

package/createJob.js

@@ -18,6 +18,12 @@ const { values } = require("./values.config");
 
 const properties = new PropertyRepository();
 
+// Property linking also needs the Aurora wiring gs injects only in
+// environments with the database stack; without it, requests keep the
+// pre-property behaviour (free-text room required).
+const propertyLinkingEnabled =
+	values.linkToProperty === true && !!process.env.POSTGRES_SECRET_ARN;
+
 module.exports.createJob = (event, context, callback) => {
 	// Avoids waiting on the pooled DB connection to close before returning.
 	context.callbackWaitsForEmptyEventLoop = false;
@@ -33,7 +39,7 @@ module.exports.createJob = (event, context, callback) => {
 				);
 			}
 			// With linking on, location is resolved later; without it, room is required now.
-			const hasLocation = values.linkToProperty || !_.isUndefined(data.room);
+			const hasLocation = propertyLinkingEnabled || !_.isUndefined(data.room);
 			if (
 				!data.userID ||
 				_.isUndefined(data.userName) ||
@@ -71,7 +77,7 @@ module.exports.createJob = (event, context, callback) => {
 
 			// Resolved server-side, never taken from the request, so a resident cannot spoof a property.
 			let resolvedProperty = null;
-			if (values.linkToProperty) {
+			if (propertyLinkingEnabled) {
 				// An explicit propertyId is honoured for any actor holding the tracking
 				// permission (staff can also submit as themselves); it is client input,
 				// so resolution fails closed.
@@ -126,7 +132,7 @@ module.exports.createJob = (event, context, callback) => {
 			const room = propertyName || data.room;
 
 			// No property link and no room means no location.
-			if (values.linkToProperty && !room) {
+			if (propertyLinkingEnabled && !room) {
 				log("createJob", "InsufficientInput", data.userID);
 				return callback(
 					null,

package/editJob.js

@@ -17,6 +17,12 @@ const { values } = require("./values.config");
 
 const properties = new PropertyRepository();
 
+// Property linking also needs the Aurora wiring gs injects only in
+// environments with the database stack; without it, edits keep the
+// pre-property behaviour (free-text room only).
+const propertyLinkingEnabled =
+	values.linkToProperty === true && !!process.env.POSTGRES_SECRET_ARN;
+
 module.exports.editJob = (event, context, callback) => {
 	// Avoids waiting on the pooled DB connection to close before returning.
 	context.callbackWaitsForEmptyEventLoop = false;
@@ -45,7 +51,12 @@ module.exports.editJob = (event, context, callback) => {
 						}),
 					);
 				}
-				if (values.linkToProperty) {
+				if (!propertyLinkingEnabled) {
+					// Without a resolver a client-supplied link cannot be verified, so
+					// never persist one; stored links on existing jobs are untouched.
+					delete data.job.propertyId;
+					delete data.job.propertyName;
+				} else {
 					// A set propertyId is client input; verify it against the job's own
 					// site (the site the edit was authorised for), failing closed.
 					if (data.job.propertyId != null) {

package/feature.config.js

@@ -18,7 +18,11 @@ exports.entity = {
 exports.serverless = {
 	name: values.serviceKey,
 	useVpc: true, // Enable VPC routing for static outbound IP (requires vpcConfig in config/index.js)
-	usePostgres: true, // Wires the Aurora app secret for property resolution (requires useVpc)
+	// Aurora app secret is only used for property resolution, so only the
+	// property-linking variant asks for it — clone variants (forms/enquiry/
+	// feedback) stay off Aurora entirely. gs also skips this wiring in
+	// environments without the database stack (config/index.js postgresEnabled).
+	usePostgres: values.linkToProperty === true, // requires useVpc
 	apis: [
 		{
 			name: "getJobType",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-aws-forms",
-  "version": "2.1.46",
+  "version": "2.1.47",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "scripts": {
     "gc": "node ../../tools/gc ./",