@churchapps/content-providers 0.5.0 → 0.6.0

package/README.md

@@ -60,8 +60,14 @@ import { BaseProvider, registerProvider } from '@churchapps/content-providers';
 
 class MyProvider extends BaseProvider {
   // Declare id/name/logos/config/requiresAuth/authTypes/capabilities and implement browse().
-  // Optionally implement getPlaylist()/getInstructions(); the protected apiRequest() helper
-  // performs authenticated JSON fetches against config.apiBase.
+  // Every declared authType/capability must be backed by its IProvider methods (enforced by
+  // tests/contentProviders.test.ts):
+  //   oauth_pkce   -> generateCodeVerifier / buildAuthUrl / buildAuthUrlFromChallenge / exchangeCodeForTokens
+  //                   (OAuthHelper implements the standard flow; delegate to it like SignPresenterProvider)
+  //   device_flow  -> initiateDeviceFlow / pollDeviceFlowToken (see DeviceFlowHelper)
+  //   form_login   -> performLogin
+  //   playlist / instructions / mediaLicensing -> getPlaylist / getInstructions / checkMediaLicense
+  // The protected apiRequest() helper performs authenticated JSON fetches against config.apiBase.
 }
 
 registerProvider(new MyProvider());

package/dist/index.cjs

@@ -143,6 +143,9 @@ var OAuthHelper = class {
   }
   async buildAuthUrl(config, codeVerifier, redirectUri, state) {
     const codeChallenge = await generateCodeChallenge(codeVerifier);
+    return { url: this.buildAuthUrlFromChallenge(config, codeChallenge, redirectUri, state || ""), challengeMethod: "S256" };
+  }
+  buildAuthUrlFromChallenge(config, codeChallenge, redirectUri, state) {
     const params = new URLSearchParams({
       response_type: "code",
       client_id: config.clientId,
@@ -150,9 +153,9 @@ var OAuthHelper = class {
       scope: config.scopes.join(" "),
       code_challenge: codeChallenge,
       code_challenge_method: "S256",
-      state: state || ""
+      state
     });
-    return { url: `${config.oauthBase}/authorize?${params.toString()}`, challengeMethod: "S256" };
+    return `${config.oauthBase}/authorize?${params.toString()}`;
   }
   async exchangeCodeForTokens(config, _providerId, code, codeVerifier, redirectUri) {
     try {
@@ -334,12 +337,15 @@ function filesToInstructions(name, files, section) {
   const items = section ? [{ id: section.id, itemType: "section", label: section.label ?? name, children: actions }] : actions;
   return { name, items };
 }
+function instructionItemMediaType(item) {
+  return detectMediaType(`${item.downloadUrl || ""} ${item.label || ""}`, item.mediaType);
+}
 function instructionsToPlaylist(instructions) {
   const files = [];
   function extractFiles(items) {
     for (const item of items) {
       if (item.downloadUrl && (item.itemType === "file" || !item.children?.length)) {
-        files.push({ type: "file", id: item.id || item.relatedId || generateId(), title: item.label || "Untitled", mediaType: detectMediaType(item.downloadUrl), url: item.downloadUrl, downloadUrl: item.downloadUrl, seconds: item.seconds, thumbnail: item.thumbnail });
+        files.push({ type: "file", id: item.id || item.relatedId || generateId(), title: item.label || "Untitled", mediaType: instructionItemMediaType(item), url: item.downloadUrl, downloadUrl: item.downloadUrl, seconds: item.seconds, thumbnail: item.thumbnail });
       }
       if (item.children) extractFiles(item.children);
     }
@@ -449,6 +455,7 @@ function extractArray(response, ...keys) {
 var APlayProvider = class extends BaseProvider {
   constructor() {
     super(...arguments);
+    this.oauthHelper = new OAuthHelper();
     this.id = "aplay";
     this.name = "APlay";
     this.logos = { light: "https://www.joinamazing.com/_assets/v11/3ba846c5afd7e73d27bc4d87b63d423e7ae2dc73.svg", dark: "https://www.joinamazing.com/_assets/v11/3ba846c5afd7e73d27bc4d87b63d423e7ae2dc73.svg" };
@@ -518,6 +525,18 @@ var APlayProvider = class extends BaseProvider {
   async checkMediaLicense(mediaId, auth) {
     return checkMediaLicense(mediaId, auth);
   }
+  generateCodeVerifier() {
+    return this.oauthHelper.generateCodeVerifier();
+  }
+  async buildAuthUrl(codeVerifier, redirectUri, state) {
+    return this.oauthHelper.buildAuthUrl(this.config, codeVerifier, redirectUri, state || this.id);
+  }
+  buildAuthUrlFromChallenge(codeChallenge, redirectUri, state) {
+    return this.oauthHelper.buildAuthUrlFromChallenge(this.config, codeChallenge, redirectUri, state);
+  }
+  async exchangeCodeForTokens(code, codeVerifier, redirectUri) {
+    return this.oauthHelper.exchangeCodeForTokens(this.config, this.id, code, codeVerifier, redirectUri);
+  }
 };
 
 // src/providers/signPresenter/SignPresenterProvider.ts
@@ -596,13 +615,15 @@ var SignPresenterProvider = class extends BaseProvider {
     const instructions = filesToInstructions(title, files, { id: playlistId + "-section", label: title });
     return { name: title, items: [{ id: playlistId + "-header", itemType: "header", label: title, children: instructions.items }] };
   }
-  // Auth methods
   generateCodeVerifier() {
     return this.oauthHelper.generateCodeVerifier();
   }
   async buildAuthUrl(codeVerifier, redirectUri, state) {
     return this.oauthHelper.buildAuthUrl(this.config, codeVerifier, redirectUri, state || this.id);
   }
+  buildAuthUrlFromChallenge(codeChallenge, redirectUri, state) {
+    return this.oauthHelper.buildAuthUrlFromChallenge(this.config, codeChallenge, redirectUri, state);
+  }
   async exchangeCodeForTokens(code, codeVerifier, redirectUri) {
     return this.oauthHelper.exchangeCodeForTokens(this.config, this.id, code, codeVerifier, redirectUri);
   }
@@ -975,8 +996,7 @@ function registerProvider(provider) {
 }
 
 // src/providers/b1Church/B1ChurchAuth.ts
-async function buildB1AuthUrl(config, appBase, redirectUri, codeVerifier, state) {
-  const codeChallenge = await generateCodeChallenge(codeVerifier);
+function buildB1AuthUrlFromChallenge(config, appBase, redirectUri, codeChallenge, state) {
   const oauthParams = new URLSearchParams({
     response_type: "code",
     client_id: config.clientId,
@@ -984,10 +1004,13 @@ async function buildB1AuthUrl(config, appBase, redirectUri, codeVerifier, state)
     scope: config.scopes.join(" "),
     code_challenge: codeChallenge,
     code_challenge_method: "S256",
-    state: state || ""
+    state
   });
-  const url = `${appBase}/oauth?${oauthParams.toString()}`;
-  return { url, challengeMethod: "S256" };
+  return `${appBase}/oauth?${oauthParams.toString()}`;
+}
+async function buildB1AuthUrl(config, appBase, redirectUri, codeVerifier, state) {
+  const codeChallenge = await generateCodeChallenge(codeVerifier);
+  return { url: buildB1AuthUrlFromChallenge(config, appBase, redirectUri, codeChallenge, state || ""), challengeMethod: "S256" };
 }
 async function exchangeCodeForTokensWithPKCE(config, code, redirectUri, codeVerifier) {
   try {
@@ -1219,6 +1242,7 @@ function collectFilesFromNode(node) {
       id: node.id,
       name: node.label || "",
       url: node.downloadUrl,
+      fileType: instructionItemMediaType(node),
       seconds: node.seconds || 10
     });
   }
@@ -1284,6 +1308,9 @@ function findFirstThumbnail(items) {
   }
   return void 0;
 }
+function isLessonsChurchContent(plan) {
+  return !plan.providerId || plan.providerId === "lessonschurch";
+}
 function isExternalProviderItem(item) {
   if (!item.providerId || item.providerId === "b1church") return false;
   if (item.providerPath) return true;
@@ -1310,10 +1337,16 @@ var B1ChurchProvider = class extends BaseProvider {
     this.capabilities = { browse: true, playlist: true, instructions: true, mediaLicensing: false };
     this.planTypeId = null;
   }
+  generateCodeVerifier() {
+    return generateCodeVerifier();
+  }
   async buildAuthUrl(codeVerifier, redirectUri, state) {
     return buildB1AuthUrl(this.config, this.appBase, redirectUri, codeVerifier, state);
   }
-  async exchangeCodeForTokensWithPKCE(code, redirectUri, codeVerifier) {
+  buildAuthUrlFromChallenge(codeChallenge, redirectUri, state) {
+    return buildB1AuthUrlFromChallenge(this.config, this.appBase, redirectUri, codeChallenge, state);
+  }
+  async exchangeCodeForTokens(code, codeVerifier, redirectUri) {
     return exchangeCodeForTokensWithPKCE(this.config, code, redirectUri, codeVerifier);
   }
   async exchangeCodeForTokensWithSecret(code, redirectUri, clientSecret) {
@@ -1449,7 +1482,7 @@ var B1ChurchProvider = class extends BaseProvider {
     const planFolder = plans.find((p) => p.id === planId);
     if (!planFolder) return null;
     const churchId = planFolder.churchId;
-    const venueId = planFolder.contentId;
+    const venueId = isLessonsChurchContent(planFolder) ? planFolder.contentId : void 0;
     const planTitle = planFolder.name || "Plan";
     if (!churchId) {
       console.warn("[B1Church getInstructions] planFolder missing churchId:", planFolder.id);
@@ -1558,7 +1591,7 @@ var B1ChurchProvider = class extends BaseProvider {
       return null;
     }
     const churchId = planFolder.churchId;
-    const venueId = planFolder.contentId;
+    const venueId = isLessonsChurchContent(planFolder) ? planFolder.contentId : void 0;
     if (!churchId) {
       console.warn("[B1Church] getPlaylist: planFolder missing churchId:", planFolder.id);
       return null;
@@ -1582,7 +1615,7 @@ var B1ChurchProvider = class extends BaseProvider {
     const venueFeed = venueId ? await fetchVenueFeed(venueId) : null;
     const files = [];
     for (const sectionItem of planItems) {
-      for (const child of sectionItem.children || []) {
+      for (const child of sectionItem.children?.length ? sectionItem.children : [sectionItem]) {
         const childItemType = child.itemType;
         const isSectionType = childItemType === "section" || childItemType === "lessonSection" || childItemType === "providerSection";
         const canExpandLocally = isSectionType && venueFeed && child.relatedId;
@@ -1713,7 +1746,6 @@ var DropboxProvider = class extends BaseProvider {
       mediaLicensing: false
     };
   }
-  // -- Pagination helper --
   dropboxPost(endpoint, body, auth) {
     if (!auth) {
       console.error("[Dropbox] No auth token provided");
@@ -1747,7 +1779,6 @@ var DropboxProvider = class extends BaseProvider {
     }
     return allEntries;
   }
-  // -- File link helpers --
   async getSharedLink(filePath, auth) {
     if (!auth) return null;
     try {
@@ -1803,7 +1834,6 @@ var DropboxProvider = class extends BaseProvider {
     );
     return results.filter((r) => r.viewUrl || r.downloadUrl).map((r) => fileEntryToContentFile(r.entry, r.viewUrl || r.downloadUrl, r.downloadUrl));
   }
-  // -- Leaf detection --
   async checkIsLeaf(folderPath, auth) {
     const response = await this.dropboxPost(
       "/2/files/list_folder",
@@ -1813,7 +1843,6 @@ var DropboxProvider = class extends BaseProvider {
     if (!response) return false;
     return !response.entries.some((e) => e[".tag"] === "folder");
   }
-  // -- IProvider methods --
   async browse(path, auth) {
     const dropboxPath = path && path !== "/" ? path.startsWith("/") ? path : "/" + path : "";
     const allEntries = await this.listAllEntries(dropboxPath, auth);
@@ -1825,7 +1854,6 @@ var DropboxProvider = class extends BaseProvider {
     const fileItems = await this.resolveFileLinks(mediaFiles, auth);
     return [...folderItems, ...fileItems];
   }
-  /** Resolve a folder path to playable files (list + media filter + link resolution). */
   async resolveMediaFiles(path, auth) {
     if (!path || path === "/") return null;
     const dropboxPath = path.startsWith("/") ? path : "/" + path;
@@ -1847,7 +1875,6 @@ var DropboxProvider = class extends BaseProvider {
     const folderName = segments[segments.length - 1] || "Dropbox";
     return filesToInstructions(folderName, resolved.files, { id: "dropbox-section", label: folderName });
   }
-  // -- Auth methods --
   generateCodeVerifier() {
     return this.oauthHelper.generateCodeVerifier();
   }
@@ -1904,7 +1931,8 @@ var PlanningCenterProvider = class extends BaseProvider {
     this.logos = { light: "https://www.planningcenter.com/icons/icon-512x512.png", dark: "https://www.planningcenter.com/icons/icon-512x512.png" };
     this.config = { id: "planningcenter", name: "Planning Center", apiBase: "https://api.planningcenteronline.com", oauthBase: "https://api.planningcenteronline.com/oauth", clientId: "", scopes: ["services"] };
     this.requiresAuth = true;
-    this.authTypes = ["oauth_pkce"];
+    // No client-side auth flow: clientId is unset and no PKCE methods exist. Auth tokens must be supplied externally (server-side).
+    this.authTypes = [];
     // Plan items come back without media URLs, so playlist/instructions are not actually supported yet.
     this.capabilities = { browse: true, playlist: false, instructions: false, mediaLicensing: false };
   }
@@ -16367,7 +16395,7 @@ function getAvailableProviders(ids) {
 }
 
 // src/index.ts
-var VERSION = true ? "0.5.0" : "dev";
+var VERSION = true ? "0.6.0" : "dev";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   APlayProvider,