server: release createSubscription db client on validation errors

Author: williamstein

src/packages/server/purchases/create-subscription.ts

@@ -16,64 +16,71 @@ export default async function createSubscription(
   opts: Options,
   client: PoolClient | null // useful to allow null for unit testing, but must be explicit
 ): Promise<number> {
-  const db = client ?? (await getPoolClient());
+  let db: PoolClient | null = client;
   // some consistency checks below.  It's very likely this should always hold,
   // since data isn't user supplied, but it's still good to be careful.
 
-  if (!(await isValidAccount(opts.account_id))) {
-    throw Error("account_id must be valid");
-  }
-  const costValue = toDecimal(opts.cost);
-  if (costValue.eq(0) || costValue.lt(0)) {
-    throw Error("cost must be positive");
-  }
-  if (opts.interval != "month" && opts.interval != "year") {
-    throw Error("interval must be month or year");
-  }
-  if (!isDate(opts.current_period_start)) {
-    throw Error("current_period_start must be a Date");
-  }
-  if (!isDate(opts.current_period_end)) {
-    throw Error("current_period_end must be a Date");
-  }
-  if (opts.current_period_start >= opts.current_period_end) {
-    throw Error("start must be before end");
-  }
-  if (
-    opts.latest_purchase_id != null &&
-    (!is_integer(opts.latest_purchase_id) || opts.latest_purchase_id < 0)
-  ) {
-    throw Error(
-      "if specified, latest_purchase_id must be a nonnegative integer"
-    );
-  }
-  const metadata = opts.metadata as Metadata;
-  const metadataType = (opts.metadata as { type?: string })?.type;
-  if (typeof metadata != "object" || !metadataType) {
-    throw Error("metadata must be a nontrivial object with type field");
-  }
-  if (metadataType != "membership") {
-    throw Error(`unsupported subscription metadata type "${metadataType}"`);
-  }
-  if (metadataType == "membership" && !(metadata as MembershipMetadata).class) {
-    throw Error("membership metadata must include class");
-  }
+  try {
+    if (!(await isValidAccount(opts.account_id))) {
+      throw Error("account_id must be valid");
+    }
+    const costValue = toDecimal(opts.cost);
+    if (costValue.eq(0) || costValue.lt(0)) {
+      throw Error("cost must be positive");
+    }
+    if (opts.interval != "month" && opts.interval != "year") {
+      throw Error("interval must be month or year");
+    }
+    if (!isDate(opts.current_period_start)) {
+      throw Error("current_period_start must be a Date");
+    }
+    if (!isDate(opts.current_period_end)) {
+      throw Error("current_period_end must be a Date");
+    }
+    if (opts.current_period_start >= opts.current_period_end) {
+      throw Error("start must be before end");
+    }
+    if (
+      opts.latest_purchase_id != null &&
+      (!is_integer(opts.latest_purchase_id) || opts.latest_purchase_id < 0)
+    ) {
+      throw Error(
+        "if specified, latest_purchase_id must be a nonnegative integer"
+      );
+    }
+    const metadata = opts.metadata as Metadata;
+    const metadataType = (opts.metadata as { type?: string })?.type;
+    if (typeof metadata != "object" || !metadataType) {
+      throw Error("metadata must be a nontrivial object with type field");
+    }
+    if (metadataType != "membership") {
+      throw Error(`unsupported subscription metadata type "${metadataType}"`);
+    }
+    if (
+      metadataType == "membership" &&
+      !(metadata as MembershipMetadata).class
+    ) {
+      throw Error("membership metadata must include class");
+    }
 
-  const { rows } = await db.query(
-    "INSERT INTO subscriptions (account_id,created,cost,interval,current_period_start,current_period_end,latest_purchase_id,status,metadata) VALUES($1,NOW(),$2,$3,$4,$5,$6,'active',$7)  RETURNING id",
-    [
-      opts.account_id,
-      moneyToDbString(costValue),
-      opts.interval,
-      opts.current_period_start,
-      opts.current_period_end,
-      opts.latest_purchase_id,
-      opts.metadata,
-    ]
-  );
-  const { id } = rows[0];
-  if (client == null) {
-    db.release();
+    db = db ?? (await getPoolClient());
+    const { rows } = await db.query(
+      "INSERT INTO subscriptions (account_id,created,cost,interval,current_period_start,current_period_end,latest_purchase_id,status,metadata) VALUES($1,NOW(),$2,$3,$4,$5,$6,'active',$7)  RETURNING id",
+      [
+        opts.account_id,
+        moneyToDbString(costValue),
+        opts.interval,
+        opts.current_period_start,
+        opts.current_period_end,
+        opts.latest_purchase_id,
+        opts.metadata,
+      ]
+    );
+    const { id } = rows[0];
+    return id;
+  } finally {
+    if (client == null && db != null) {
+      db.release();
+    }
   }
-  return id;
 }