@eifi1/ui-kit 0.38.1 → 0.39.0

package/dist/bin/eifi1-pay-page.mjs

@@ -5,14 +5,23 @@ import process from "process";
 import { fileURLToPath } from "url";
 
 // pay-page/cli.ts
-import { copyFileSync, existsSync, mkdirSync, writeFileSync } from "fs";
+import { copyFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { dirname, join } from "path";
 import { parseArgs } from "util";
 
 // src/billing/pay-page.ts
 var PAY_CONFIG_FILE = "pay-config.json";
+var APP_TAG = /^[a-z][a-z0-9_-]{0,63}$/;
+function appAt(name, site, returnPath) {
+  return { name, returnUrl: `${site}${returnPath}`, termsUrl: `${site}/terms`, privacyUrl: `${site}/privacy` };
+}
+var PAY_PAGE_APPS = Object.freeze({
+  keksdose: Object.freeze(appAt("Keksdose", "https://keksdose.app", "/settings/subscription")),
+  kastlan: Object.freeze(appAt("kastlan", "https://kastlan.app", "/admin/billing")),
+  kurvenschmiede: Object.freeze(appAt("Kurvenschmiede", "https://kurvenschmiede.app", "/settings/subscription"))
+});
 var TOKEN_PREFIX = { sandbox: "test_", live: "live_" };
-function isPageUrl(value) {
+function isPayPageUrl(value) {
   if (typeof value !== "string") return false;
   let url;
   try {
@@ -23,6 +32,19 @@ function isPageUrl(value) {
   if (url.protocol === "https:") return true;
   return url.protocol === "http:" && ["localhost", "127.0.0.1", "[::1]"].includes(url.hostname);
 }
+function hasApp(apps, tag) {
+  return typeof tag === "string" && APP_TAG.test(tag) && typeof apps === "object" && apps !== null && Object.prototype.hasOwnProperty.call(apps, tag);
+}
+function appProblems(tag, app) {
+  if (typeof app !== "object" || app === null) return [`apps.${tag} is not an object`];
+  const a = app;
+  const problems = [];
+  if (typeof a.name !== "string" || a.name.trim() === "") problems.push(`apps.${tag}.name is missing`);
+  for (const key of ["returnUrl", "termsUrl", "privacyUrl"]) {
+    if (!isPayPageUrl(a[key])) problems.push(`apps.${tag}.${key} must be an https:// URL (http:// for localhost only)`);
+  }
+  return problems;
+}
 function payPageConfigProblems(config) {
   if (typeof config !== "object" || config === null) return ["the configuration is not an object"];
   const c = config;
@@ -43,10 +65,20 @@ function payPageConfigProblems(config) {
       );
     }
   }
-  for (const key of ["returnUrl", "termsUrl", "privacyUrl"]) {
-    if (!isPageUrl(c[key])) problems.push(`${key} must be an https:// URL (http:// for localhost only)`);
+  const { apps, app } = c;
+  if (typeof apps !== "object" || apps === null || Array.isArray(apps) || Object.keys(apps).length === 0) {
+    problems.push("apps must map each app's tag to its name and URLs");
+  } else {
+    for (const [tag, entry] of Object.entries(apps)) {
+      if (!APP_TAG.test(tag)) problems.push(`apps: ${JSON.stringify(tag)} is not an app tag (a-z, 0-9, _ and -)`);
+      else problems.push(...appProblems(tag, entry));
+    }
+  }
+  if (typeof app !== "string" || app === "") problems.push("app is missing: the host's own app tag");
+  else if (!hasApp(apps, app)) {
+    const known = typeof apps === "object" && apps !== null ? Object.keys(apps).join(", ") : "";
+    problems.push(`app ${JSON.stringify(app)} is not in apps${known ? ` (${known})` : ""}`);
   }
-  if (typeof c.appName !== "string" || c.appName.trim() === "") problems.push("appName is missing");
   return problems;
 }
 
@@ -69,16 +101,60 @@ var given = (value) => {
   const trimmed = (value ?? "").trim();
   return trimmed === "" ? null : trimmed;
 };
+function moved(url, site) {
+  let parsed;
+  try {
+    parsed = new URL(url);
+  } catch {
+    return url;
+  }
+  return `${site.replace(/\/+$/, "")}${parsed.pathname}${parsed.search}${parsed.hash}`;
+}
+function mergedApps(over) {
+  const apps = {};
+  for (const [tag, app] of Object.entries(PAY_PAGE_APPS)) apps[tag] = { ...app };
+  for (const [tag, app] of Object.entries(over ?? {})) {
+    const base = Object.prototype.hasOwnProperty.call(apps, tag) ? apps[tag] : {};
+    Object.defineProperty(apps, tag, { value: { ...base, ...app }, enumerable: true, writable: true, configurable: true });
+  }
+  return apps;
+}
 function payPageConfig(options) {
+  const app = (options.app ?? "").trim();
+  const apps = mergedApps(options.apps);
+  const problems = [];
+  const site = given(options.appUrl);
+  if (site !== null) {
+    if (!isPayPageUrl(site)) problems.push("--app-url must be an https:// URL (http:// for localhost only)");
+    else if (Object.prototype.hasOwnProperty.call(apps, app)) {
+      const own = apps[app];
+      apps[app] = {
+        ...own,
+        returnUrl: moved(own.returnUrl, site),
+        termsUrl: moved(own.termsUrl, site),
+        privacyUrl: moved(own.privacyUrl, site)
+      };
+    }
+  }
   const config = {
     token: given(options.token),
     environment: given(options.environment),
-    returnUrl: (options.returnUrl ?? "").trim(),
-    appName: (options.appName ?? "").trim(),
-    termsUrl: (options.termsUrl ?? "").trim(),
-    privacyUrl: (options.privacyUrl ?? "").trim()
+    app,
+    apps
   };
-  return { config, problems: payPageConfigProblems(config) };
+  return { config, problems: [...problems, ...payPageConfigProblems(config)] };
+}
+function readAppsFile(path) {
+  let parsed;
+  try {
+    parsed = JSON.parse(readFileSync(path, "utf8"));
+  } catch (err) {
+    throw new PayPageError([`--apps ${path} can't be read as JSON: ${err.message}`]);
+  }
+  if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+    throw new PayPageError([`--apps ${path} must hold a JSON object of apps by tag`]);
+  }
+  return parsed;
 }
 function writePayPage(options, bundleDir) {
   const { config, problems } = payPageConfig(options);
@@ -99,10 +175,15 @@ function writePayPage(options, bundleDir) {
   return config;
 }
 var USAGE = `Usage: eifi1-pay-page --out <dir> [--token <test_\u2026|live_\u2026> --environment <sandbox|live>]
-       --return-url <https://\u2026> --app-name <name> --terms-url <https://\u2026> --privacy-url <https://\u2026>
+       --app <tag> [--app-url <https://\u2026>] [--apps <file>]
 
-Copies @eifi1/ui-kit's pay page into <dir> and writes its ${PAY_CONFIG_FILE}.
+Copies @eifi1/ui-kit's pay page into <dir> and writes its ${PAY_CONFIG_FILE}: the
+token, the host's app (--app: ${Object.keys(PAY_PAGE_APPS).join(", ")}) and the kit's
+map of apps, which the page reads each transaction's app from. --app-url moves the
+host's app to another site; --apps merges a JSON map of apps by tag over the kit's.
 Without a token (billing off) the page says there is nothing to pay.`;
+var OLD_FLAGS = ["return-url", "app-name", "terms-url", "privacy-url"];
+var OLD_FLAGS_REFUSED = "eifi1-pay-page: --return-url, --app-name, --terms-url and --privacy-url are gone (ui-kit 0.39): every pay page serves every app, from the kit's map. Pass --app <tag> instead, with --app-url <https://\u2026> for another site (your PAY_APP_URL) and --apps <file> to merge your own map.";
 function runPayPageCli(argv, io) {
   let values;
   try {
@@ -114,10 +195,11 @@ function runPayPageCli(argv, io) {
         out: { type: "string" },
         token: { type: "string" },
         environment: { type: "string" },
-        "return-url": { type: "string" },
-        "app-name": { type: "string" },
-        "terms-url": { type: "string" },
-        "privacy-url": { type: "string" },
+        app: { type: "string" },
+        "app-url": { type: "string" },
+        apps: { type: "string" },
+        // Parsed only to be refused with a line that names the new flags.
+        ...Object.fromEntries(OLD_FLAGS.map((flag) => [flag, { type: "string" }])),
         help: { type: "boolean", short: "h" }
       }
     }));
@@ -131,22 +213,28 @@ ${USAGE}`);
     io.log(USAGE);
     return 0;
   }
+  if (OLD_FLAGS.some((flag) => values[flag] !== void 0)) {
+    io.error(`${OLD_FLAGS_REFUSED}
+
+${USAGE}`);
+    return 2;
+  }
   const text = (key) => typeof values[key] === "string" ? values[key] : "";
   try {
+    const appsFile = given(text("apps"));
     const config = writePayPage(
       {
         out: text("out"),
         token: text("token"),
         environment: text("environment"),
-        returnUrl: text("return-url"),
-        appName: text("app-name"),
-        termsUrl: text("terms-url"),
-        privacyUrl: text("privacy-url")
+        app: text("app"),
+        appUrl: text("app-url"),
+        apps: appsFile === null ? void 0 : readAppsFile(appsFile)
       },
       io.bundleDir
     );
     io.log(
-      `eifi1-pay-page: wrote the pay page to ${text("out").trim()} ` + (config.token ? `(${config.environment})` : "(no token: billing off, the page says there is nothing to pay)")
+      `eifi1-pay-page: wrote ${config.app}'s pay page (serving ${Object.keys(config.apps).join(", ")}) to ${text("out").trim()} ` + (config.token ? `(${config.environment})` : "(no token: billing off, the page says there is nothing to pay)")
     );
     return 0;
   } catch (err) {

package/dist/eslint/index.js

@@ -47,7 +47,7 @@ const roleUtilities = {
     };
   }
 };
-const VERSION = true ? "0.38.1" : "0.0.0-source";
+const VERSION = true ? "0.39.0" : "0.0.0-source";
 const recommended = {
   name: "@eifi1/ui-kit/recommended",
   // Not the tests, as check:tokens skips the kit's: a test names the old class to assert it

package/dist/i18n/german.js

@@ -1628,6 +1628,14 @@ Die vollst\xE4ndige Postanschrift wird betroffenen Personen und Aufsichtsbeh\xF6
       payNothing: "Hier ist nichts zu bezahlen. Um einen Tarif zu w\xE4hlen, kehren Sie zur App zur\xFCck.",
       payFailed: "Der Bezahlvorgang konnte nicht ge\xF6ffnet werden. Bitte kehren Sie zur\xFCck und versuchen Sie es gleich noch einmal.",
       payBack: "Der Bezahlvorgang wurde geschlossen. Sie k\xF6nnen zur\xFCckkehren oder diese Seite neu laden, um ihn wieder zu \xF6ffnen.",
+      payDone: "Zahlung abgeschlossen. Sie k\xF6nnen diese Seite schlie\xDFen.",
+      // 0.39 (§15.2.10): PlanSwitchConfirm.
+      switchTitle: "Tarif \xE4ndern",
+      switchFromTo: (from, to) => `Von ${from} zu ${to}`,
+      switchChargedNow: "Jetzt belastet",
+      switchCredited: "Gutschrift auf die n\xE4chsten Belastungen",
+      switchNextCharge: (date) => `N\xE4chste Belastung am ${date}`,
+      switchConfirm: "Tarif \xE4ndern",
       waitingChanges: (count) => count === 1 ? `${n(count)} \xC4nderung wartet auf einen Tarif` : `${n(count)} \xC4nderungen warten auf einen Tarif`,
       // "Verwerfen", as `wizard.cancelConfirmLabel`.
       discardWaiting: "Wartende \xC4nderungen verwerfen",
@@ -1635,8 +1643,11 @@ Die vollst\xE4ndige Postanschrift wird betroffenen Personen und Aufsichtsbeh\xF6
       disabled: "Abonnements sind hier nicht verf\xFCgbar.",
       // §14.2: server-kit 0.7's refusals. "Zahlung und Rechnungen", as `manage`.
       providerUnavailable: "Der Zahlungsanbieter ist gerade nicht erreichbar. Bitte versuchen Sie es gleich noch einmal.",
-      alreadySubscribed: "Sie haben bereits ein Abonnement. Ihren Tarif \xE4ndern Sie unter \u201EZahlung und Rechnungen\u201C.",
-      planNotSold: "Dieser Tarif ist f\xFCr diesen Abrechnungszeitraum oder diese W\xE4hrung nicht erh\xE4ltlich. Bitte w\xE4hlen Sie einen anderen."
+      alreadySubscribed: "Sie haben bereits ein Abonnement. \xC4ndern Sie Ihren Tarif oben.",
+      planNotSold: "Dieser Tarif ist f\xFCr diesen Abrechnungszeitraum oder diese W\xE4hrung nicht erh\xE4ltlich. Bitte w\xE4hlen Sie einen anderen.",
+      // 0.39 (§15.2.10): the plan switch's refusals.
+      notSubscribed: "Es l\xE4uft kein Abonnement, das sich \xE4ndern lie\xDFe. W\xE4hlen Sie einen Tarif, um eines abzuschlie\xDFen.",
+      planUnchanged: "Das ist bereits Ihr Tarif. W\xE4hlen Sie einen anderen Tarif oder Abrechnungszeitraum."
     },
     // 0.33.0 — docs/billing-harmonization.md §14.12: the operator's plan parts, "Tarif" as
     // in `billing`; keksdose's reviewed admin wording where it had one.