@churchapps/content-providers 0.9.2 → 0.9.4

package/dist/index.cjs

@@ -36,6 +36,7 @@ __export(index_exports, {
   SignPresenterProvider: () => SignPresenterProvider,
   TokenHelper: () => TokenHelper,
   VERSION: () => VERSION,
+  authIsExpired: () => authIsExpired,
   getAllProviders: () => getAllProviders,
   getAvailableProviders: () => getAvailableProviders,
   getProvider: () => getProvider,
@@ -71,27 +72,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",
@@ -105,12 +122,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() {
@@ -1483,9 +1503,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) {
@@ -18021,7 +18039,7 @@ function getAvailableProviders(ids) {
 }
 
 // src/index.ts
-var VERSION = true ? "0.9.2" : "dev";
+var VERSION = true ? "0.9.4" : "dev";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   APlayProvider,
@@ -18040,6 +18058,7 @@ var VERSION = true ? "0.9.2" : "dev";
   SignPresenterProvider,
   TokenHelper,
   VERSION,
+  authIsExpired,
   getAllProviders,
   getAvailableProviders,
   getProvider,