Merge pull request #258 from jwplayer/fix/url-signing-service

fix: url signing service
jwplayer · Mar 29, 2023 · e8df9bc · e8df9bc
2 parents 205d4a6 + 06624a7
commit e8df9bc
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/hooks/useContentProtection.ts b/src/hooks/useContentProtection.ts
@@ -24,21 +24,20 @@ const useContentProtection = <T>(
   }));
   const host = signingConfig?.host;
   const drmPolicyId = contentProtection?.drm?.defaultPolicyId ?? signingConfig?.drmPolicyId;
-  const drmEnabled = !!drmPolicyId;
-  const signingEnabled = !!host || !!urlSigning;
+  const signingEnabled = !!urlSigning || !!host || (!!drmPolicyId && !host);
 
   const { data: token, isLoading } = useQuery(
     ['token', type, id, params],
     () => {
-      // if provider is JWP
-      if (jwp && configId && !!id && signingEnabled) {
-        return getJWPMediaToken(configId, id);
-      }
       // if provider is not JWP
-      if (!!id && !!host && drmEnabled && signingEnabled) {
+      if (!!id && !!host) {
         const { host, drmPolicyId } = signingConfig;
         return getMediaToken(host, id, jwt, params, drmPolicyId);
       }
+      // if provider is JWP
+      if (jwp && configId && !!id && signingEnabled) {
+        return getJWPMediaToken(configId, id);
+      }
     },
     { enabled: signingEnabled && enabled && !!id, keepPreviousData: false, staleTime: 15 * 60 * 1000 },
   );