@churchapps/content-providers 0.9.2 → 0.9.4

package/dist/index.d.cts

@@ -259,11 +259,17 @@ declare class OAuthHelper {
 declare function toAuthData(data: Record<string, unknown>, fallbacks?: {
     refreshToken?: string;
     scope?: string;
-}): ContentProviderAuthData;
+    planTypeId?: string;
+}): ContentProviderAuthData & {
+    planTypeId?: string;
+};
+declare function authIsExpired(auth: ContentProviderAuthData | null | undefined, nowMs?: number): boolean;
 declare class TokenHelper {
+    private static inflight;
     isAuthValid(auth: ContentProviderAuthData | null | undefined): boolean;
     isTokenExpired(auth: ContentProviderAuthData): boolean;
     refreshToken(config: ContentProviderConfig, auth: ContentProviderAuthData): Promise<ContentProviderAuthData | null>;
+    private doRefresh;
 }
 
 declare class DeviceFlowHelper {
@@ -583,4 +589,4 @@ declare function getAvailableProviders(ids?: string[]): ProviderInfo[];
  */
 declare const VERSION: string;
 
-export { APlayProvider, type AuthType, B1ChurchProvider, BaseProvider, BibleProjectProvider, CbnProvider, type ContentFile, type ContentFolder, type ContentItem, type ContentProviderAuthData, type ContentProviderConfig, type CurrentPlan, type DeviceAuthorizationResponse, DeviceFlowHelper, type DeviceFlowPollResult, type DeviceFlowState, DropboxProvider, type EndpointValue, type EndpointsConfig, type FeedActionInterface, type FeedFileInterface, type FeedSectionInterface, type FeedVenueInterface, HighVoltageKidsProvider, type IProvider, type InstructionItem, type Instructions, JesusFilmProvider, LessonsChurchProvider, LifeChurchProvider, type MediaLicenseResult, type MediaLicenseStatus, type MessageFileInterface, OAuthHelper, type Plan, type PlanPresentation, type PlanSection, type PlanTimelineItem, PlanningCenterProvider, type ProviderCapabilities, type ProviderInfo, type ProviderLogos, SignPresenterProvider, TokenHelper, VERSION, type VenueActionInterface, type VenueActionsResponseInterface, type VenueSectionActionsInterface, getAllProviders, getAvailableProviders, getProvider, getProviderConfig, isContentFile, isContentFolder, navigateToPath, registerProvider, setProviderSecret, toAuthData };
+export { APlayProvider, type AuthType, B1ChurchProvider, BaseProvider, BibleProjectProvider, CbnProvider, type ContentFile, type ContentFolder, type ContentItem, type ContentProviderAuthData, type ContentProviderConfig, type CurrentPlan, type DeviceAuthorizationResponse, DeviceFlowHelper, type DeviceFlowPollResult, type DeviceFlowState, DropboxProvider, type EndpointValue, type EndpointsConfig, type FeedActionInterface, type FeedFileInterface, type FeedSectionInterface, type FeedVenueInterface, HighVoltageKidsProvider, type IProvider, type InstructionItem, type Instructions, JesusFilmProvider, LessonsChurchProvider, LifeChurchProvider, type MediaLicenseResult, type MediaLicenseStatus, type MessageFileInterface, OAuthHelper, type Plan, type PlanPresentation, type PlanSection, type PlanTimelineItem, PlanningCenterProvider, type ProviderCapabilities, type ProviderInfo, type ProviderLogos, SignPresenterProvider, TokenHelper, VERSION, type VenueActionInterface, type VenueActionsResponseInterface, type VenueSectionActionsInterface, authIsExpired, getAllProviders, getAvailableProviders, getProvider, getProviderConfig, isContentFile, isContentFolder, navigateToPath, registerProvider, setProviderSecret, toAuthData };

package/dist/index.d.ts

@@ -259,11 +259,17 @@ declare class OAuthHelper {
 declare function toAuthData(data: Record<string, unknown>, fallbacks?: {
     refreshToken?: string;
     scope?: string;
-}): ContentProviderAuthData;
+    planTypeId?: string;
+}): ContentProviderAuthData & {
+    planTypeId?: string;
+};
+declare function authIsExpired(auth: ContentProviderAuthData | null | undefined, nowMs?: number): boolean;
 declare class TokenHelper {
+    private static inflight;
     isAuthValid(auth: ContentProviderAuthData | null | undefined): boolean;
     isTokenExpired(auth: ContentProviderAuthData): boolean;
     refreshToken(config: ContentProviderConfig, auth: ContentProviderAuthData): Promise<ContentProviderAuthData | null>;
+    private doRefresh;
 }
 
 declare class DeviceFlowHelper {
@@ -583,4 +589,4 @@ declare function getAvailableProviders(ids?: string[]): ProviderInfo[];
  */
 declare const VERSION: string;
 
-export { APlayProvider, type AuthType, B1ChurchProvider, BaseProvider, BibleProjectProvider, CbnProvider, type ContentFile, type ContentFolder, type ContentItem, type ContentProviderAuthData, type ContentProviderConfig, type CurrentPlan, type DeviceAuthorizationResponse, DeviceFlowHelper, type DeviceFlowPollResult, type DeviceFlowState, DropboxProvider, type EndpointValue, type EndpointsConfig, type FeedActionInterface, type FeedFileInterface, type FeedSectionInterface, type FeedVenueInterface, HighVoltageKidsProvider, type IProvider, type InstructionItem, type Instructions, JesusFilmProvider, LessonsChurchProvider, LifeChurchProvider, type MediaLicenseResult, type MediaLicenseStatus, type MessageFileInterface, OAuthHelper, type Plan, type PlanPresentation, type PlanSection, type PlanTimelineItem, PlanningCenterProvider, type ProviderCapabilities, type ProviderInfo, type ProviderLogos, SignPresenterProvider, TokenHelper, VERSION, type VenueActionInterface, type VenueActionsResponseInterface, type VenueSectionActionsInterface, getAllProviders, getAvailableProviders, getProvider, getProviderConfig, isContentFile, isContentFolder, navigateToPath, registerProvider, setProviderSecret, toAuthData };
+export { APlayProvider, type AuthType, B1ChurchProvider, BaseProvider, BibleProjectProvider, CbnProvider, type ContentFile, type ContentFolder, type ContentItem, type ContentProviderAuthData, type ContentProviderConfig, type CurrentPlan, type DeviceAuthorizationResponse, DeviceFlowHelper, type DeviceFlowPollResult, type DeviceFlowState, DropboxProvider, type EndpointValue, type EndpointsConfig, type FeedActionInterface, type FeedFileInterface, type FeedSectionInterface, type FeedVenueInterface, HighVoltageKidsProvider, type IProvider, type InstructionItem, type Instructions, JesusFilmProvider, LessonsChurchProvider, LifeChurchProvider, type MediaLicenseResult, type MediaLicenseStatus, type MessageFileInterface, OAuthHelper, type Plan, type PlanPresentation, type PlanSection, type PlanTimelineItem, PlanningCenterProvider, type ProviderCapabilities, type ProviderInfo, type ProviderLogos, SignPresenterProvider, TokenHelper, VERSION, type VenueActionInterface, type VenueActionsResponseInterface, type VenueSectionActionsInterface, authIsExpired, getAllProviders, getAvailableProviders, getProvider, getProviderConfig, isContentFile, isContentFolder, navigateToPath, registerProvider, setProviderSecret, toAuthData };

package/dist/index.js

@@ -20,27 +20,43 @@ function navigateToPath(instructions, path) {
 
 // src/helpers/TokenHelper.ts
 function toAuthData(data, fallbacks) {
+  const planTypeId = data.plan_type_id || fallbacks?.planTypeId;
   return {
     access_token: data.access_token,
     refresh_token: data.refresh_token || fallbacks?.refreshToken || "",
     token_type: data.token_type || "Bearer",
     created_at: Math.floor(Date.now() / 1e3),
     expires_in: data.expires_in,
-    scope: data.scope || fallbacks?.scope || ""
+    scope: data.scope || fallbacks?.scope || "",
+    ...planTypeId ? { planTypeId } : {}
   };
 }
-var TokenHelper = class {
+function authIsExpired(auth, nowMs = Date.now()) {
+  if (!auth?.created_at || !auth.expires_in) return true;
+  const lifetimeMs = auth.expires_in * 1e3;
+  const expiresAt = (auth.created_at + auth.expires_in) * 1e3;
+  const bufferMs = Math.min(5 * 60 * 1e3, Math.floor(lifetimeMs / 10));
+  return nowMs > expiresAt - bufferMs;
+}
+var _TokenHelper = class _TokenHelper {
   isAuthValid(auth) {
-    if (!auth) return false;
-    return !this.isTokenExpired(auth);
+    return !authIsExpired(auth);
   }
   isTokenExpired(auth) {
-    if (!auth.created_at || !auth.expires_in) return true;
-    const expiresAt = (auth.created_at + auth.expires_in) * 1e3;
-    return Date.now() > expiresAt - 5 * 60 * 1e3;
+    return authIsExpired(auth);
   }
   async refreshToken(config, auth) {
     if (!auth.refresh_token) return null;
+    const key = `${config.oauthBase}|${config.clientId}|${auth.refresh_token}`;
+    const existing = _TokenHelper.inflight.get(key);
+    if (existing) return existing;
+    const pending = this.doRefresh(config, auth).finally(() => {
+      _TokenHelper.inflight.delete(key);
+    });
+    _TokenHelper.inflight.set(key, pending);
+    return pending;
+  }
+  async doRefresh(config, auth) {
     try {
       const params = new URLSearchParams({
         grant_type: "refresh_token",
@@ -54,12 +70,15 @@ var TokenHelper = class {
         return null;
       }
       const data = await response.json();
-      return toAuthData(data, { refreshToken: auth.refresh_token, scope: auth.scope });
+      const planTypeId = auth.planTypeId;
+      return toAuthData(data, { refreshToken: auth.refresh_token, scope: auth.scope, planTypeId });
     } catch {
       return null;
     }
   }
 };
+_TokenHelper.inflight = /* @__PURE__ */ new Map();
+var TokenHelper = _TokenHelper;
 
 // src/helpers/OAuthHelper.ts
 function generateCodeVerifier() {
@@ -1432,9 +1451,7 @@ var B1ChurchProvider = class extends BaseProvider {
   setPairingData(data) {
     if (data && typeof data === "object" && "planTypeId" in data) {
       const planTypeId = data.planTypeId;
-      this.planTypeId = typeof planTypeId === "string" ? planTypeId : null;
-    } else {
-      this.planTypeId = null;
+      if (typeof planTypeId === "string") this.planTypeId = planTypeId;
     }
   }
   async getCurrentPlan(authData) {
@@ -17970,7 +17987,7 @@ function getAvailableProviders(ids) {
 }
 
 // src/index.ts
-var VERSION = true ? "0.9.2" : "dev";
+var VERSION = true ? "0.9.4" : "dev";
 export {
   APlayProvider,
   B1ChurchProvider,
@@ -17988,6 +18005,7 @@ export {
   SignPresenterProvider,
   TokenHelper,
   VERSION,
+  authIsExpired,
   getAllProviders,
   getAvailableProviders,
   getProvider,