Merge pull request kaltura#11318 from kaltura/Quasar-17.18.0-PLAT-23259

PLAT-23259: add "shouldRedirect" flag to live delivery profile
coralburg12 · Jan 2, 2022 · 679ef74 · 679ef74
2 parents 5e92bea + 51c320a
commit 679ef74
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/admin_console/forms/Delivery/DeliveryProfileLivePackager.php b/admin_console/forms/Delivery/DeliveryProfileLivePackager.php
@@ -13,6 +13,10 @@ public function getAdvancedSettings()
 			'filters'		=> array('StringTrim'),
 		));
 
-		return array('livePackagerSigningDomain');
+		$this->addElement('checkbox', 'shouldRedirect', array(
+			'label'			=> 'Should redirect:',
+		));
+
+		return array('livePackagerSigningDomain', 'shouldRedirect');
 	}
 }
diff --git a/alpha/lib/model/DeliveryProfileLive.php b/alpha/lib/model/DeliveryProfileLive.php
@@ -2,6 +2,7 @@
 
 abstract class DeliveryProfileLive extends DeliveryProfile {
 	const DEFAULT_MAINTENANCE_DC = -1;
+	const SHOULD_REDIRECT = "should_redirect";
 
 	/**
 	 * @var kLiveStreamConfiguration
@@ -398,7 +399,7 @@ private function generateLiveSecuredPackagerToken($url)
 
 	protected function getRenderer($flavors)
 	{
-		if($this->shouldRedirect) 
+		if($this->getShouldRedirect())
 		{
 			$this->DEFAULT_RENDERER_CLASS = 'kRedirectManifestRenderer';
 		}
@@ -462,5 +463,18 @@ public function getLivePackagerSigningDomain()
 	{
 		return $this->getFromCustomData("livePackagerSigningDomain");
 	}
+
+	public function setShouldRedirect($v)
+	{
+		// sets only the default value in custom data (won't affect "$this->shouldRedirect" which should be changed dynamically)
+		$this->putInCustomData(self::SHOULD_REDIRECT, $v);
+	}
+
+	public function getShouldRedirect()
+	{
+		// if the shouldRedirect changed to true dynamically during the request - it takes priority
+		return $this->shouldRedirect || $this->getFromCustomData(self::SHOULD_REDIRECT, null, false);
+	}
+
 }
 
diff --git a/alpha/lib/model/DeliveryProfileLiveAppleHttp.php b/alpha/lib/model/DeliveryProfileLiveAppleHttp.php
@@ -257,7 +257,7 @@ protected function buildHttpFlavorsArray()
 		if($this->getDynamicAttributes()->getUsePlayServer() || (!count($primaryStreamInfo) && !count($backupStreamInfo)))
 			$this->shouldRedirect = true;
 
-		if($this->shouldRedirect)
+		if($this->getShouldRedirect())
 		{
 			return parent::buildHttpFlavorsArray();
 		}

diff --git a/api_v3/lib/types/delivery/KalturaDeliveryProfileLivePackager.php b/api_v3/lib/types/delivery/KalturaDeliveryProfileLivePackager.php
@@ -10,10 +10,16 @@ class KalturaDeliveryProfileLivePackager extends KalturaDeliveryProfile {
 	 * @var string
 	 */
 	public $livePackagerSigningDomain;
+
+	/**
+	 * @var bool
+	 */
+	public $shouldRedirect;
 
 	private static $map_between_objects = array
 	(
 		"livePackagerSigningDomain",
+		"shouldRedirect"
 	);
 
 	public function getMapBetweenObjects ( )