Cloudflare account specific subdomain now fetched and offered for use with video embeds.

Author: B-Interactive

README.md

@@ -28,6 +28,7 @@ Changes from Official
 * If updating from version older than 1.0.6, you'll need to enter your Cloudflare API Token and Cloudflare Account ID in the configuration page.
 * Added admin setting for signed URL/token duration (default is otherwise 1 hour).
 * Added admin toggle for whether or not to use signed URLs/tokens.
+* Can select Cloudflare media domain, including new account specific sub-domain.
 
 
 To-Do
@@ -70,6 +71,9 @@ When this is checked [x], videos are accessed using a temporary time-limited tok
 ### Signed URL Expiration ###
 When **Use Signed URLs** is checked [x], this setting controls how long any particular token / signed ULR is valid for **in minutes**. The Cloudflare default, is 60 minutes. Generally, you'd want to make sure this is larger than your longest video.
 
+### Preferred Media Domain ###
+This option allows you to select from a small list of different Cloudflare media domains. This domain is used when delivering content to your users. The 3rd option is a unique subdomain specific to your Cloudflare account. This option will only be presented if you have at least one video already uploaded to your Cloudflare Stream account.
+
 
 Securing Video Access
 ------------

src/inc/class-cloudflare-stream-api.php

@@ -250,16 +250,21 @@ public function update_video_details( $uid, $args = array(), $return_headers = f
 	public function get_video_embed( $uid, $args = array(), $return_headers = false ) {
 		$media_domain = get_option( Cloudflare_Stream_Settings::OPTION_MEDIA_DOMAIN );
 		$signed_urls  = get_option( Cloudflare_Stream_Settings::OPTION_SIGNED_URLS );
-		if ( $signed_urls ) {
-			$uid = $this->get_signed_video_token($uid)->result->token;
-		}
+		$uid = ( $signed_urls ) ? $this->get_signed_video_token($uid)->result->token : $uid;
+
+		$standard_uri =          ' src="https://iframe.' . $media_domain . '/' . $uid . '?';
+		$account_subdomain_uri = ' src="https://' . $media_domain . '/' . $uid . '/iframe?';
+
+		$src_uri = ( $media_domain == "cloudflarestream.com" || $media_domain == "videodelivery.net" ) ? $standard_uri : $account_subdomain_uri;
+
 		$video_embed = '<div style="position: relative; padding-top: 56.25%"><iframe'
-			. ' src="https://iframe.' . $media_domain . '/' . $uid . '?'
-			. 'muted='    . $args['muted'] . '&'
-			. 'preload='  . $args['preload'] . '&'
-			. 'loop='     . $args['loop'] . '&'
-			. 'autoplay=' . $args['autoplay'] . '&'
-			. 'controls=' . $args['controls'] . '" '
+			. $src_uri
+			. 'muted='          . $args['muted']    . '&'
+			. 'preload='        . $args['preload']  . '&'
+			. 'loop='           . $args['loop']     . '&'
+			. 'autoplay='       . $args['autoplay'] . '&'
+			. 'controls='       . $args['controls'] . '&'
+			. 'poster=https://' . $media_domain . '/' . $uid . '/thumbnails/thumbnail.jpg" '
 			. 'style="border: none; position: absolute; top: 0; height: 100%; width: 100%" '
 			. 'allow="accelerometer; gyroscope; autoplay; encrypted-media; picture-in-picture;" '
 			. 'allowfullscreen="true" '
@@ -332,14 +337,30 @@ public function delete_video( $uid, $args = array(), $return_headers = false ) {
 		return json_decode( $response_text );
 	}
 
+	/**
+	 * Retrieve unique Cloudflare account subdomain.
+	 *
+	 * @param array $args Additional API arguments.
+	 * @param bool  $return_headers Return the response headers intead of the response body.
+	 * @since 1.0.9
+	 */
+	public function get_account_subdomain( $args = array(), $return_headers = false ) {
+        $response_text = json_decode( $this->request( 'stream/', $args, $return_headers ) );
+		if ( count($response_text->result) > 0 ) {
+			$text_array = explode( "/", $response_text->result[0]->thumbnail );
+			return $text_array[2];
+		}
+		return false;
+	}
+
 	/**
 	 * Retrieve Cloudflare Account ID using the Zones API.
 	 *
 	 * @param bool $save If true, saves retrieved Account ID to database, but only if the option does not already exist.
 	 * @since 1.0.9
 	 */
 	public function get_account_id( $save = false ) {
-        $response_text = json_decode( $this->zone_request( '', array(), false ) );
+        $response_text = json_decode( $this->request( '', array(), false ) );
 		if ( $response_text->success ) {
 			$api_id = $response_text->result->account->id;
 			if ( strlen( $api_id ) == 32 ) {

src/inc/class-cloudflare-stream-settings.php

@@ -177,8 +177,15 @@ public function api_signed_urls_duration_cb() {
 	public function media_domain_cb() {
 		$media_domain = get_option( self::OPTION_MEDIA_DOMAIN );
 		echo '<label for="cloudflare_stream_media_domain_0"><input type="radio" class="radio-option" name="cloudflare_stream_media_domain" id="cloudflare_stream_media_domain_0" value="cloudflarestream.com" ' . checked( "cloudflarestream.com", $media_domain, false ) . ' >cloudflarestream.com (default)</label>'
-		   . '<label for="cloudflare_stream_media_domain_"><input type="radio" class="radio-option" name="cloudflare_stream_media_domain" id="cloudflare_stream_media_domain_1" value="videodelivery.net" ' . checked( "videodelivery.net", $media_domain, false ) . ' >videodelivery.net</label>'
-		   . '<small class="form-text text-muted">' . esc_html__( 'Set which Cloudflare domain is used by your users, to access video content. Changing this may require an update to your sites Content Security Policy.', 'cloudflare-stream-wordpress' ) . '</small>';
+		   . '<label for="cloudflare_stream_media_domain_"><input type="radio" class="radio-option" name="cloudflare_stream_media_domain" id="cloudflare_stream_media_domain_1" value="videodelivery.net" ' . checked( "videodelivery.net", $media_domain, false ) . ' >videodelivery.net</label>';
+
+		// The account subdomain option is only presented if it was able to be retrieved from the API.
+		$account_subdomain = self::get_account_subdomain();
+		if ( $account_subdomain ) {
+			echo '<label for="cloudflare_stream_media_domain_"><input type="radio" class="radio-option" name="cloudflare_stream_media_domain" id="cloudflare_stream_media_domain_2" value="' . $account_subdomain . '" ' . checked( $account_subdomain, $media_domain, false ) . ' >' . $account_subdomain . ' (<a href="https://community.cloudflare.com/t/upcoming-domain-change-to-ensure-delivery-of-your-video-content/405842" target="_blank">more information</a>)</label>';
+		}
+
+		echo '<small class="form-text text-muted">' . esc_html__( 'Set which Cloudflare domain is used by your users, to access video content. Changing this may require an update to your sites Content Security Policy.', 'cloudflare-stream-wordpress' ) . '</small>';
 	}
 
 	/**
@@ -263,6 +270,16 @@ public function onboarding_admin_notices() {
 		}
 	}
 
+	/**
+	 * Try to fetch and save the Cloudflare Account ID using Zone ID.
+	 *
+	 * @since 1.0.9
+	 */
+	public function get_account_subdomain() {
+		$api = Cloudflare_Stream_API::instance();
+		return $api->get_account_subdomain();
+	}
+
 	/**
 	 * Try to fetch and save the Cloudflare Account ID using Zone ID.
 	 *