@churchapps/content-providers 0.5.1 → 0.6.1

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

@@ -97,6 +97,7 @@ var TokenHelper = class {
         refresh_token: auth.refresh_token,
         client_id: config.clientId
       });
+      if (config.clientSecret) params.set("client_secret", config.clientSecret);
       const response = await fetch(`${config.oauthBase}/token`, { method: "POST", headers: { "Content-Type": "application/x-www-form-urlencoded" }, body: params.toString() });
       if (!response.ok) {
         console.warn(`[TokenHelper] Token refresh failed: ${response.status} ${response.statusText}`);
@@ -143,6 +144,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 +154,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 {
@@ -163,6 +167,7 @@ var OAuthHelper = class {
         client_id: config.clientId,
         code_verifier: codeVerifier
       });
+      if (config.clientSecret) params.set("client_secret", config.clientSecret);
       const tokenUrl = `${config.oauthBase}/token`;
       const response = await fetch(tokenUrl, { method: "POST", headers: { "Content-Type": "application/x-www-form-urlencoded" }, body: params.toString() });
       if (!response.ok) {
@@ -334,12 +339,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 +457,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 +527,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
@@ -602,6 +623,9 @@ var SignPresenterProvider = class extends BaseProvider {
   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);
   }
@@ -961,21 +985,8 @@ var LessonsChurchProvider = class extends BaseProvider {
   }
 };
 
-// src/providers/registry.ts
-var providerRegistry = /* @__PURE__ */ new Map();
-function getProvider(providerId) {
-  return providerRegistry.get(providerId) || null;
-}
-function getAllProviders() {
-  return Array.from(providerRegistry.values());
-}
-function registerProvider(provider) {
-  providerRegistry.set(provider.id, 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,
@@ -983,10 +994,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 {
@@ -1218,6 +1232,7 @@ function collectFilesFromNode(node) {
       id: node.id,
       name: node.label || "",
       url: node.downloadUrl,
+      fileType: instructionItemMediaType(node),
       seconds: node.seconds || 10
     });
   }
@@ -1283,6 +1298,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;
@@ -1309,10 +1327,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) {
@@ -1419,14 +1443,12 @@ var B1ChurchProvider = class extends BaseProvider {
       this.planTypeId = null;
     }
   }
-  async getCurrentPlan(_authData) {
+  async getCurrentPlan(authData) {
     if (!this.planTypeId) return null;
     const plan = await fetchCurrentPlanByType(this.planTypeId);
-    if (!plan?.providerId || !plan.providerPlanId) return null;
+    if (!plan?.providerId || !plan.providerPlanId || !plan.ministryId) return null;
     const items = plan.churchId && plan.id ? await fetchPlanItems(plan.churchId, plan.id) : [];
-    const innerProvider = getProvider(plan.providerId);
-    if (!innerProvider?.getInstructions) return null;
-    const instructions = await innerProvider.getInstructions(plan.providerPlanId, null);
+    const instructions = await fetchFromProviderProxy("getInstructions", plan.ministryId, plan.providerId, plan.providerPlanId, authData);
     if (!instructions) return null;
     const files = getOrderedFiles(instructions, items);
     const thumbnail = findFirstThumbnail(instructions.items);
@@ -1448,7 +1470,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);
@@ -1557,7 +1579,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;
@@ -1581,7 +1603,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;
@@ -1897,7 +1919,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 };
   }
@@ -16268,6 +16291,110 @@ var LifeChurchProvider = class extends BaseProvider {
   }
 };
 
+// src/providers/registry.ts
+var providerRegistry = /* @__PURE__ */ new Map();
+function getProvider(providerId) {
+  return providerRegistry.get(providerId) || null;
+}
+function getAllProviders() {
+  return Array.from(providerRegistry.values());
+}
+function registerProvider(provider) {
+  providerRegistry.set(provider.id, provider);
+}
+
+// src/providers/goCurriculum/data.json
+var data_default4 = {
+  collections: []
+};
+
+// src/providers/goCurriculum/GoCurriculumProvider.ts
+var GoCurriculumProvider = class extends BaseProvider {
+  constructor() {
+    super(...arguments);
+    this.oauthHelper = new OAuthHelper();
+    this.verifiedTokens = /* @__PURE__ */ new Set();
+    this.id = "gocurriculum";
+    this.name = "Go Curriculum";
+    this.logos = {
+      light: "https://gocurriculum.com/wp-content/uploads/go-logo-curriculum-v2.png",
+      dark: "https://gocurriculum.com/wp-content/uploads/go-logo-curriculum-v2.png"
+    };
+    this.config = {
+      id: "gocurriculum",
+      name: "Go Curriculum",
+      apiBase: "https://gocurriculum.com",
+      oauthBase: "https://gocurriculum.com/oauth",
+      clientId: "Rdrvz9jz9nTNf8rCsbpuAgVLdoWHZmcjdmmrP0Bw",
+      clientSecret: "yfAbd2NERjzwVZP38g1AALdIvPPXwhFayCguiTCS",
+      scopes: ["basic"]
+    };
+    this.data = data_default4;
+    this.requiresAuth = true;
+    this.authTypes = ["oauth_pkce"];
+    this.capabilities = { browse: true, playlist: true, instructions: true, mediaLicensing: false };
+  }
+  // ponytail: any valid login unlocks everything for the pilot — per-tier (MemberPress) filtering waits on Go's membership endpoint
+  async verifyAuth(auth) {
+    const token = auth?.access_token;
+    if (!token) return false;
+    if (this.verifiedTokens.has(token)) return true;
+    try {
+      const response = await fetch(`${this.config.oauthBase}/me`, { method: "POST", headers: { "Content-Type": "application/x-www-form-urlencoded" }, body: new URLSearchParams({ access_token: token }).toString() });
+      if (!response.ok) return false;
+      this.verifiedTokens.add(token);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  async browse(path, auth) {
+    if (!await this.verifyAuth(auth)) return [];
+    const { segments, depth } = parsePath(path);
+    if (depth === 0) return this.data.collections.map((c) => createFolder(c.id, c.name, `/${c.id}`, c.image));
+    const collection = this.data.collections.find((c) => c.id === segments[0]);
+    if (!collection) return [];
+    if (depth === 1) return collection.lessons.map((l) => createFolder(l.id, l.name, `/${collection.id}/${l.id}`, l.image || collection.image, true));
+    if (depth === 2) return this.getLessonFiles(collection, segments[1]);
+    return [];
+  }
+  getLessonFiles(collection, lessonId) {
+    const lesson = collection.lessons.find((l) => l.id === lessonId);
+    if (!lesson) return [];
+    return lesson.files.map((f) => createFile(f.id, f.name, f.url, { mediaType: detectMediaType(`${f.url} ${f.name}`, f.fileType), thumbnail: f.thumbnail || lesson.image || collection.image, seconds: f.seconds, loop: f.loop, loopVideo: f.loopVideo }));
+  }
+  async getPlaylist(path, auth, _resolution) {
+    if (!await this.verifyAuth(auth)) return null;
+    const { segments, depth } = parsePath(path);
+    if (depth !== 2) return null;
+    const collection = this.data.collections.find((c) => c.id === segments[0]);
+    if (!collection) return null;
+    const files = this.getLessonFiles(collection, segments[1]);
+    return files.length > 0 ? files : null;
+  }
+  async getInstructions(path, auth) {
+    const { segments, depth } = parsePath(path);
+    if (depth !== 2) return null;
+    const files = await this.getPlaylist(path, auth);
+    if (!files) return null;
+    const collection = this.data.collections.find((c) => c.id === segments[0]);
+    const lesson = collection?.lessons.find((l) => l.id === segments[1]);
+    return filesToInstructions(lesson?.name || "Lesson", files);
+  }
+  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/index.ts
 var unimplementedProviders = [
   {
@@ -16286,14 +16413,6 @@ var unimplementedProviders = [
       dark: "https://freeshow.app/images/favicon.png"
     }
   },
-  {
-    id: "gocurriculum",
-    name: "Go Curriculum",
-    logos: {
-      light: "https://gocurriculum.com/wp-content/uploads/go-logo-curriculum-v2.png",
-      dark: "https://gocurriculum.com/wp-content/uploads/go-logo-curriculum-v2.png"
-    }
-  },
   {
     id: "iteachchurch",
     name: "iTeachChurch",
@@ -16316,6 +16435,7 @@ function initializeProviders() {
     new APlayProvider(),
     new B1ChurchProvider(),
     new DropboxProvider(),
+    new GoCurriculumProvider(),
     new BibleProjectProvider(),
     new HighVoltageKidsProvider(),
     new JesusFilmProvider(),
@@ -16360,7 +16480,7 @@ function getAvailableProviders(ids) {
 }
 
 // src/index.ts
-var VERSION = true ? "0.5.1" : "dev";
+var VERSION = true ? "0.6.1" : "dev";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   APlayProvider,