@infuro/cms-core 1.0.29 → 1.0.30

package/dist/index.d.cts

@@ -990,6 +990,7 @@ interface SocialMediaApiConfig {
 }
 declare function createSocialMediaHandlers(config: SocialMediaApiConfig): {
     getLinkedInStatus(req: Request): Promise<Response>;
+    fetchLinkedInOrganizations(req: Request): Promise<Response>;
     syncLinkedInProfile(req: Request): Promise<Response>;
     publishBlogToLinkedIn(req: Request, blogId: number): Promise<Response>;
     getFacebookStatus(req: Request): Promise<Response>;

package/dist/index.d.ts

@@ -990,6 +990,7 @@ interface SocialMediaApiConfig {
 }
 declare function createSocialMediaHandlers(config: SocialMediaApiConfig): {
     getLinkedInStatus(req: Request): Promise<Response>;
+    fetchLinkedInOrganizations(req: Request): Promise<Response>;
     syncLinkedInProfile(req: Request): Promise<Response>;
     publishBlogToLinkedIn(req: Request, blogId: number): Promise<Response>;
     getFacebookStatus(req: Request): Promise<Response>;

package/dist/index.js

@@ -4214,6 +4214,24 @@ async function queueJobScheduleNow(cms, scheduleId) {
   });
 }
 
+// src/plugins/jobs/schedule-next-run.ts
+import { parseExpression } from "cron-parser";
+function computeNextRunAt(schedule, from = /* @__PURE__ */ new Date()) {
+  if (!schedule.enabled) return null;
+  try {
+    const cron = buildCronFromSchedule(schedule);
+    const tz = schedule.timezone?.trim() || "UTC";
+    const interval = parseExpression(cron, {
+      currentDate: from,
+      tz
+    });
+    return interval.next().toDate();
+  } catch (err) {
+    console.warn("[job-schedules] could not compute next run:", err);
+    return null;
+  }
+}
+
 // src/plugins/jobs/job-runner.ts
 var executeJobRef = null;
 function registerJobRunnerWorker(cms, deps) {
@@ -4268,6 +4286,7 @@ function registerJobRunnerWorker(cms, deps) {
       schedule.lastRunAt = finishedAt;
       schedule.lastRunStatus = "success";
       schedule.lastRunError = null;
+      schedule.nextRunAt = computeNextRunAt(schedule, finishedAt);
       await scheduleRepo.save(schedule);
     } catch (e) {
       const message = e instanceof Error ? e.message : String(e);
@@ -4328,7 +4347,7 @@ function serializeSchedule(s) {
     lastRunAt: s.lastRunAt?.toISOString() ?? null,
     lastRunStatus: s.lastRunStatus,
     lastRunError: s.lastRunError,
-    nextRunAt: s.nextRunAt?.toISOString() ?? null,
+    nextRunAt: (computeNextRunAt(s) ?? s.nextRunAt)?.toISOString() ?? null,
     createdAt: s.createdAt.toISOString(),
     updatedAt: s.updatedAt.toISOString()
   };
@@ -4375,6 +4394,9 @@ function createJobScheduleHandlers(apiConfig) {
     await syncJobScheduleToPgBoss(cms, schedule, async (queueName) => {
       await ensureScheduleQueueWorker(cms, queueName);
     });
+    const repo = dataSource.getRepository(ScheduleEntity);
+    schedule.nextRunAt = computeNextRunAt(schedule);
+    await repo.save(schedule);
   }
   return {
     async list(req) {
@@ -7035,6 +7057,13 @@ import path from "path";
 
 // src/plugins/social-media/linkedin-client.ts
 var RESTLI = "2.0.0";
+function linkedInHeaders(accessToken, json = false) {
+  return {
+    Authorization: `Bearer ${accessToken}`,
+    "X-Restli-Protocol-Version": RESTLI,
+    ...json ? { "Content-Type": "application/json" } : {}
+  };
+}
 async function linkedInGetUserinfo(accessToken) {
   const r = await fetch("https://api.linkedin.com/v2/userinfo", {
     headers: { Authorization: `Bearer ${accessToken}` }
@@ -7049,20 +7078,116 @@ async function linkedInGetUserinfo(accessToken) {
     throw new Error("LinkedIn userinfo: invalid JSON");
   }
 }
+async function linkedInFetchOrganizationAcls(accessToken) {
+  const r = await fetch("https://api.linkedin.com/v2/organizationAcls?q=roleAssignee", {
+    headers: linkedInHeaders(accessToken)
+  });
+  const text = await r.text();
+  if (!r.ok) {
+    throw new Error(`LinkedIn organizationAcls failed (${r.status}): ${text.slice(0, 800)}`);
+  }
+  let data;
+  try {
+    data = JSON.parse(text);
+  } catch {
+    throw new Error("LinkedIn organizationAcls: invalid JSON");
+  }
+  return Array.isArray(data.elements) ? data.elements : [];
+}
+function organizationDisplayName(org) {
+  if (org.localizedName?.trim()) return org.localizedName.trim();
+  const localized = org.name?.localized;
+  if (localized) {
+    for (const v of Object.values(localized)) {
+      if (v?.trim()) return v.trim();
+    }
+  }
+  if (org.vanityName?.trim()) return org.vanityName.trim();
+  if (org.id != null) return `Organization ${org.id}`;
+  return "Organization";
+}
+function organizationWebsite(org) {
+  if (org.localizedWebsite?.trim()) return org.localizedWebsite.trim();
+  const localized = org.website?.localized;
+  if (localized) {
+    for (const v of Object.values(localized)) {
+      if (v?.trim()) return v.trim();
+    }
+  }
+  return void 0;
+}
+function linkedInOrganizationUrn(orgIdOrUrn) {
+  const s = String(orgIdOrUrn ?? "").trim();
+  if (s.startsWith("urn:li:organization:")) return s;
+  return `urn:li:organization:${s}`;
+}
+function linkedInOrganizationIdFromUrn(organizationUrn) {
+  const m = String(organizationUrn).trim().match(/urn:li:organization:(\d+)/);
+  if (!m?.[1]) throw new Error(`Invalid LinkedIn organization URN: ${organizationUrn}`);
+  return m[1];
+}
+async function linkedInGetOrganization(accessToken, orgIdOrUrn) {
+  const orgId = String(orgIdOrUrn).startsWith("urn:") ? linkedInOrganizationIdFromUrn(String(orgIdOrUrn)) : String(orgIdOrUrn).trim();
+  const r = await fetch(`https://api.linkedin.com/v2/organizations/${encodeURIComponent(orgId)}`, {
+    headers: linkedInHeaders(accessToken)
+  });
+  const text = await r.text();
+  if (!r.ok) {
+    throw new Error(`LinkedIn organization ${orgId} failed (${r.status}): ${text.slice(0, 800)}`);
+  }
+  try {
+    return JSON.parse(text);
+  } catch {
+    throw new Error(`LinkedIn organization ${orgId}: invalid JSON`);
+  }
+}
+async function linkedInListManagedOrganizations(accessToken) {
+  const acls = await linkedInFetchOrganizationAcls(accessToken);
+  const approved = acls.filter((a) => a.state === "APPROVED" && a.organization?.trim());
+  const byUrn = /* @__PURE__ */ new Map();
+  for (const acl of approved) {
+    const urn = linkedInOrganizationUrn(acl.organization);
+    if (!byUrn.has(urn)) byUrn.set(urn, acl);
+  }
+  const out = [];
+  for (const [urn, acl] of byUrn) {
+    try {
+      const org = await linkedInGetOrganization(accessToken, urn);
+      out.push({
+        urn,
+        id: org.id ?? Number(linkedInOrganizationIdFromUrn(urn)),
+        name: organizationDisplayName(org),
+        vanityName: org.vanityName,
+        website: organizationWebsite(org),
+        role: acl.role
+      });
+    } catch {
+      out.push({
+        urn,
+        id: Number(linkedInOrganizationIdFromUrn(urn)),
+        name: linkedInOrganizationIdFromUrn(urn),
+        role: acl.role
+      });
+    }
+  }
+  out.sort((a, b) => a.name.localeCompare(b.name));
+  return out;
+}
 function personUrn(personSub) {
   const s = String(personSub || "").trim();
   if (s.startsWith("urn:li:person:")) return s;
   return `urn:li:person:${s}`;
 }
-async function linkedInRegisterImageUpload(accessToken, personSub) {
-  const owner = personUrn(personSub);
+function authorUrnFromParams(authorUrn, personSub) {
+  const direct = String(authorUrn ?? "").trim();
+  if (direct.startsWith("urn:li:")) return direct;
+  return personUrn(String(personSub ?? "").trim());
+}
+async function linkedInRegisterImageUpload(accessToken, author) {
+  const owner = authorUrnFromParams(author);
   const r = await fetch("https://api.linkedin.com/v2/assets?action=registerUpload", {
     method: "POST",
-    headers: {
-      Authorization: `Bearer ${accessToken}`,
-      "X-Restli-Protocol-Version": RESTLI,
-      "Content-Type": "application/json"
-    },
+    headers: linkedInHeaders(accessToken, true),
     body: JSON.stringify({
       registerUploadRequest: {
         recipes: ["urn:li:digitalmediaRecipe:feedshare-image"],
@@ -7110,7 +7235,7 @@ async function linkedInUploadBinary(accessToken, uploadUrl, body, contentType) {
   }
 }
 async function linkedInCreateImageShare(params) {
-  const author = personUrn(params.personSub);
+  const author = authorUrnFromParams(params.authorUrn);
   const commentary = params.commentary.slice(0, 2900);
   const title = params.title.slice(0, 200);
   const description = (params.description ?? title).slice(0, 200);
@@ -7156,7 +7281,7 @@ async function linkedInCreateImageShare(params) {
   return { status: r.status, id: data.id };
 }
 async function linkedInCreateTextShare(params) {
-  const author = personUrn(params.personSub);
+  const author = authorUrnFromParams(params.authorUrn);
   const commentary = params.commentary.slice(0, 2900);
   const r = await fetch("https://api.linkedin.com/v2/ugcPosts", {
     method: "POST",
@@ -7490,18 +7615,44 @@ function createSocialMediaHandlers(config) {
         const enabled = map.enabled !== "false";
         const token = (map.linkedin_access_token ?? "").trim();
         const sub = (map.linkedin_person_sub ?? "").trim();
+        const orgUrn = (map.linkedin_organization_urn ?? "").trim();
         return json({
           ok: true,
-          linkedInReady: enabled && Boolean(token) && Boolean(sub),
+          linkedInReady: enabled && Boolean(token) && Boolean(orgUrn),
           enabled,
           hasToken: Boolean(token),
-          hasPersonSub: Boolean(sub)
+          hasPersonSub: Boolean(sub),
+          hasOrganization: Boolean(orgUrn),
+          organizationName: map.linkedin_organization_name?.trim() || null
         });
       } catch (e) {
         const msg = e instanceof Error ? e.message : "Failed to load status";
         return json({ error: msg }, { status: 500 });
       }
     },
+    async fetchLinkedInOrganizations(req) {
+      const a = await requireAuth(req);
+      if (a) return a;
+      const pe = await requireEntityPermission(req, "settings", "read");
+      if (pe) return pe;
+      let body = {};
+      try {
+        body = await req.json();
+      } catch {
+      }
+      try {
+        const map = await loadGroupMap(dataSource, entityMap, encryptionKey);
+        const token = String(body?.accessToken ?? map.linkedin_access_token ?? "").trim();
+        if (!token) {
+          return json({ error: "LinkedIn access token is required." }, { status: 400 });
+        }
+        const organizations = await linkedInListManagedOrganizations(token);
+        return json({ ok: true, organizations });
+      } catch (e) {
+        const msg = e instanceof Error ? e.message : "LinkedIn organizations request failed";
+        return json({ error: msg }, { status: 502 });
+      }
+    },
     async syncLinkedInProfile(req) {
       const a = await requireAuth(req);
       if (a) return a;
@@ -7550,10 +7701,12 @@ function createSocialMediaHandlers(config) {
           return json({ error: "Social media plugin is disabled." }, { status: 400 });
         }
         const token = (map.linkedin_access_token ?? "").trim();
-        const personSub = (map.linkedin_person_sub ?? "").trim();
-        if (!token || !personSub) {
+        const authorUrn = (map.linkedin_organization_urn ?? "").trim();
+        if (!token || !authorUrn) {
           return json(
-            { error: "Configure LinkedIn access token and sync profile (Plugins \u2192 Social media)." },
+            {
+              error: "Configure LinkedIn access token and target organization (Plugins \u2192 Social media \u2192 LinkedIn)."
+            },
             { status: 400 }
           );
         }
@@ -7594,7 +7747,7 @@ ${excerpt}`).trim().slice(0, 2900);
             contentType: imagePayload.contentType
           });
           try {
-            const { uploadUrl, asset } = await linkedInRegisterImageUpload(token, personSub);
+            const { uploadUrl, asset } = await linkedInRegisterImageUpload(token, authorUrn);
             logLinkedInPublish(publishLog, "image_registered", {
               blogId,
               asset: truncateForLog(asset, 120),
@@ -7610,7 +7763,7 @@ ${excerpt}`).trim().slice(0, 2900);
             logLinkedInPublish(publishLog, "image_uploaded", { blogId, bytes: imagePayload.buffer.length });
             const out2 = await linkedInCreateImageShare({
               accessToken: token,
-              personSub,
+              authorUrn,
               asset,
               commentary,
               title,
@@ -7648,7 +7801,7 @@ ${excerpt}`).trim().slice(0, 2900);
             });
             const out2 = await linkedInCreateTextShare({
               accessToken: token,
-              personSub,
+              authorUrn,
               commentary
             });
             logLinkedInPublish(publishLog, "success", {
@@ -7687,7 +7840,7 @@ ${excerpt}`).trim().slice(0, 2900);
         });
         const out = await linkedInCreateTextShare({
           accessToken: token,
-          personSub,
+          authorUrn,
           commentary
         });
         logLinkedInPublish(publishLog, "success", {
@@ -14479,6 +14632,9 @@ function createCmsApiHandler(config) {
         if (tail === "sync-profile" && m === "POST") {
           return socialMediaHandlers.syncLinkedInProfile(req);
         }
+        if (tail === "fetch-organizations" && m === "POST") {
+          return socialMediaHandlers.fetchLinkedInOrganizations(req);
+        }
         if (tail === "publish-blog" && m === "POST") {
           let body;
           try {