cauthy-auth 0.24.0 → 0.24.2

package/dist/cli.js

@@ -5,6 +5,13 @@
 var import_node_fs = require("fs");
 var import_node_path2 = require("path");
 
+// src/url.ts
+function withoutTrailingSlashes(s) {
+  let end = s.length;
+  while (end > 0 && s.charCodeAt(end - 1) === 47) end--;
+  return s.slice(0, end);
+}
+
 // src/connect.ts
 function sessionSecret() {
   const bytes = crypto.getRandomValues(new Uint8Array(32));
@@ -14,7 +21,7 @@ function sessionSecret() {
 }
 async function connectSystem(o) {
   const env2 = (n) => typeof process !== "undefined" ? process.env?.[n] : void 0;
-  const issuer = (o.issuer ?? env2("CAUTHY_ISSUER") ?? "").replace(/\/+$/, "");
+  const issuer = withoutTrailingSlashes(o.issuer ?? env2("CAUTHY_ISSUER") ?? "");
   const tenant = o.tenant ?? env2("CAUTHY_TENANT") ?? "";
   const token = o.token ?? env2("CAUTHY_TOKEN") ?? "";
   for (const [name, v] of Object.entries({ CAUTHY_ISSUER: issuer, CAUTHY_TENANT: tenant, CAUTHY_TOKEN: token })) {
@@ -396,7 +403,7 @@ export type Permission = PermissionOf<typeof policy>
 }
 async function pullPolicy(o = {}) {
   const env2 = (n) => typeof process !== "undefined" ? process.env?.[n] : void 0;
-  const issuer = (o.issuer ?? env2("CAUTHY_ISSUER") ?? "").replace(/\/+$/, "");
+  const issuer = withoutTrailingSlashes(o.issuer ?? env2("CAUTHY_ISSUER") ?? "");
   const system = o.system ?? env2("CAUTHY_SYSTEM") ?? "";
   const tenant = o.tenant ?? env2("CAUTHY_TENANT") ?? "";
   const token = o.token ?? env2("CAUTHY_TOKEN") ?? "";
@@ -412,7 +419,7 @@ async function pullPolicy(o = {}) {
 }
 async function pushPolicy(o) {
   const env2 = (n) => typeof process !== "undefined" ? process.env?.[n] : void 0;
-  const issuer = (o.issuer ?? env2("CAUTHY_ISSUER") ?? "").replace(/\/+$/, "");
+  const issuer = withoutTrailingSlashes(o.issuer ?? env2("CAUTHY_ISSUER") ?? "");
   const system = o.system ?? env2("CAUTHY_SYSTEM") ?? "";
   const tenant = o.tenant ?? env2("CAUTHY_TENANT") ?? "";
   const token = o.token ?? env2("CAUTHY_TOKEN") ?? "";
@@ -435,8 +442,20 @@ var import_jose = require("jose");
 
 // src/theme.ts
 var MAX_RADIUS = 40;
+function withoutComments(css) {
+  let out2 = "";
+  let i = 0;
+  for (; ; ) {
+    const open = css.indexOf("/*", i);
+    if (open < 0) return out2 + css.slice(i);
+    out2 += css.slice(i, open);
+    const close = css.indexOf("*/", open + 2);
+    if (close < 0) return out2;
+    i = close + 2;
+  }
+}
 function declarations(css) {
-  const text = css.replace(/\/\*[\s\S]*?\*\//g, "");
+  const text = withoutComments(css);
   const out2 = [];
   const within = [];
   let chunk = "";
@@ -531,7 +550,11 @@ function tokenValue(value) {
   if (/^\(|[ ,(]\(/.test(v)) return null;
   return v;
 }
-var THEME_SCOPE = /^(?:\s*(?::root|html|body|\[data-(?:theme|mode|color-scheme)(?:=["']?[\w-]+["']?)?\])\s*,?)+$/i;
+var THEME_SELECTOR = /^(?::root|html|body|\[data-(?:theme|mode|color-scheme)(?:=["']?[\w-]+["']?)?\])$/i;
+var isThemeScope = (selectors) => {
+  const parts = selectors.split(/[\s,]+/).filter(Boolean);
+  return parts.length > 0 && parts.every((one) => THEME_SELECTOR.test(one));
+};
 function tokensFromStackmyth(css, options = {}) {
   const mode = options.mode ?? "light";
   const all = (Array.isArray(css) ? css : [css]).flatMap(declarations);
@@ -539,7 +562,7 @@ function tokensFromStackmyth(css, options = {}) {
   const vars = /* @__PURE__ */ new Map();
   for (const d of all) {
     if (!applies(d, { mode, theme: named })) continue;
-    if (!d.within.every((w) => w.startsWith("@") || THEME_SCOPE.test(w))) continue;
+    if (!d.within.every((w) => w.startsWith("@") || isThemeScope(w))) continue;
     vars.set(d.name, d.value);
   }
   const inline = (value, depth = 0) => {
@@ -818,7 +841,7 @@ function fromWire(wire) {
 }
 async function pushTheme(o) {
   const env2 = (n) => typeof process !== "undefined" ? process.env?.[n] : void 0;
-  const issuer = (o.issuer ?? env2("CAUTHY_ISSUER") ?? "").replace(/\/+$/, "");
+  const issuer = withoutTrailingSlashes(o.issuer ?? env2("CAUTHY_ISSUER") ?? "");
   const clientId = o.clientId ?? env2("CAUTHY_CLIENT_ID") ?? "";
   const tenant = o.tenant ?? env2("CAUTHY_TENANT") ?? "";
   const token = o.token ?? env2("CAUTHY_TOKEN") ?? "";
@@ -886,7 +909,7 @@ async function loadKey(k) {
   return jwk ? (0, import_jose.importJWK)(jwk, "RS256") : (0, import_jose.importPKCS8)(k.privateKey, "RS256", { extractable: true });
 }
 function createSystem(given = {}) {
-  const issuer = (given.issuer ?? env("CAUTHY_ISSUER") ?? "").replace(/\/+$/, "");
+  const issuer = withoutTrailingSlashes(given.issuer ?? env("CAUTHY_ISSUER") ?? "");
   const clientId = given.clientId ?? env("CAUTHY_CLIENT_ID") ?? "";
   const clientSecret = given.clientSecret ?? env("CAUTHY_CLIENT_SECRET") ?? "";
   const envKey = env("CAUTHY_SYSTEM_KEY");

package/dist/client.js

@@ -109,6 +109,13 @@ function ceremonyError(e) {
   return { code: "passkey_failed", message: "The passkey could not be used. Try again, or sign in another way." };
 }
 
+// src/url.ts
+function withoutTrailingSlashes(s) {
+  let end = s.length;
+  while (end > 0 && s.charCodeAt(end - 1) === 47) end--;
+  return s.slice(0, end);
+}
+
 // src/theme.ts
 function fromWire(wire) {
   const names = {
@@ -185,7 +192,7 @@ function firstProblem(...checks) {
 // src/store.ts
 var AHEAD_MS = 6e4;
 function createSessionStore(options = {}) {
-  const base = (options.basePath ?? "/api/auth").replace(/\/+$/, "");
+  const base = withoutTrailingSlashes(options.basePath ?? "/api/auth");
   const doFetch = (...args) => (options.fetch ?? fetch)(...args);
   const first = options.initialSession;
   let state = { session: first ?? null, status: first === void 0 ? "loading" : first === null ? "unauthenticated" : "authenticated" };
@@ -311,7 +318,7 @@ function loadGoogleIdentity() {
 var PASSKEY_SECONDS = 300;
 var UNAVAILABLE = { code: "unavailable", message: "Sign-in is unavailable right now. Try again in a moment." };
 function createAuthClient(options = {}) {
-  const base = (options.basePath ?? "/api/auth").replace(/\/+$/, "");
+  const base = withoutTrailingSlashes(options.basePath ?? "/api/auth");
   const doFetch = (...args) => (options.fetch ?? fetch)(...args);
   const locale = () => {
     const said = typeof options.locale === "function" ? options.locale() : options.locale;