wiki-plugin-shoppe 0.0.16 → 0.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wiki-plugin-shoppe",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "description": "Multi-tenant digital goods shoppe for federated wiki, powered by Sanora",
   "keywords": [
     "wiki",

package/server/server.js

@@ -14,9 +14,6 @@ const RECOVER_STRIPE_TMPL  = fs.readFileSync(path.join(TEMPLATES_DIR, 'generic-r
 const ADDRESS_STRIPE_TMPL  = fs.readFileSync(path.join(TEMPLATES_DIR, 'generic-address-stripe.html'), 'utf8');
 const EBOOK_DOWNLOAD_TMPL  = fs.readFileSync(path.join(TEMPLATES_DIR, 'ebook-download.html'), 'utf8');
 
-function getAllyabaseOrigin() {
-  try { return new URL(getSanoraUrl()).origin; } catch { return getSanoraUrl(); }
-}
 
 function fillTemplate(tmpl, vars) {
   return Object.entries(vars).reduce((html, [k, v]) =>
@@ -48,9 +45,9 @@ function getSanoraUrl() {
   return `http://localhost:${process.env.SANORA_PORT || 7243}`;
 }
 
-function getAddieUrl() {
-  const config = loadConfig();
-  if (config.addieUrl) return config.addieUrl.replace(/\/$/, '');
+function getAddieUrl(wikiOrigin) {
+  if (wikiOrigin) return `${wikiOrigin}/plugin/allyabase/addie`;
+  try { return new URL(getSanoraUrl()).origin + '/plugin/allyabase/addie'; } catch { /* fall through */ }
   return `http://localhost:${process.env.ADDIE_PORT || 3005}`;
 }
 
@@ -63,7 +60,7 @@ function saveBuyers(buyers) {
   fs.writeFileSync(BUYERS_FILE, JSON.stringify(buyers, null, 2));
 }
 
-async function getOrCreateBuyerAddieUser(recoveryKey, productId) {
+async function getOrCreateBuyerAddieUser(recoveryKey, productId, wikiOrigin) {
   const buyerKey = recoveryKey + productId;
   const buyers = loadBuyers();
   if (buyers[buyerKey]) return buyers[buyerKey];
@@ -74,7 +71,7 @@ async function getOrCreateBuyerAddieUser(recoveryKey, productId) {
   const message = timestamp + addieKeys.pubKey;
   const signature = await sessionless.sign(message);
 
-  const resp = await fetch(`${getAddieUrl()}/user/create`, {
+  const resp = await fetch(`${getAddieUrl(wikiOrigin)}/user/create`, {
     method: 'PUT',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify({ timestamp, pubKey: addieKeys.pubKey, signature })
@@ -201,7 +198,7 @@ async function addieCreateUser() {
   const message = timestamp + addieKeys.pubKey;
   const signature = await sessionless.sign(message);
 
-  const resp = await fetch(`${getAllyabaseOrigin()}/plugin/allyabase/addie/user/create`, {
+  const resp = await fetch(`${getAddieUrl()}/user/create`, {
     method: 'PUT',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify({ timestamp, pubKey: addieKeys.pubKey, signature })
@@ -1082,6 +1079,7 @@ async function startServer(params) {
       if (!recoveryKey || !productId) return res.status(400).json({ error: 'recoveryKey and productId required' });
 
       const sanoraUrlInternal = getSanoraUrl();
+      const wikiOrigin = `${req.protocol}://${req.get('host')}`;
       const recoveryHash = recoveryKey + productId;
 
       // Check if already purchased
@@ -1096,11 +1094,11 @@ async function startServer(params) {
       const amount = product?.price || 0;
 
       // Create/retrieve buyer Addie user
-      const buyer = await getOrCreateBuyerAddieUser(recoveryKey, productId);
+      const buyer = await getOrCreateBuyerAddieUser(recoveryKey, productId, wikiOrigin);
 
       // Create Stripe intent via Addie
       const payees = tenant.addieKeys ? [{ pubKey: tenant.addieKeys.pubKey, amount }] : [];
-      const intentResp = await fetch(`${getAddieUrl()}/user/${buyer.uuid}/processor/stripe/intent`, {
+      const intentResp = await fetch(`${getAddieUrl(wikiOrigin)}/user/${buyer.uuid}/processor/stripe/intent`, {
         method: 'PUT',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ timestamp: Date.now().toString(), amount, currency: 'USD', payees })