fix: Ripple was expecting agePolicy to be an array which is not spec … (#926)

* fix: Ripple was expecting agePolicy to be an array which is not spec compliant. (#924)

Changed the agePolicy to an Option<String> instead of Option<Vec<String>

* remove unused param

Co-authored-by: Vinod Sathyaseelan <Vinod_sathyaseelan@comcast.com>

Author: maggie98choy

.github/workflows/Build.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ "main" ]
   pull_request:
-    branches: [ "main", "3.1.rc" ]
+    branches: [ "main", "3.2.rc" ]
 
 env:
   CARGO_TERM_COLOR: always

core/main/src/firebolt/handlers/discovery_rpc.rs

@@ -43,7 +43,7 @@ use ripple_sdk::{
         firebolt::{
             fb_capabilities::FireboltCap,
             fb_discovery::{
-                AgePolicy, LaunchRequest, DISCOVERY_EVENT_ON_NAVIGATE_TO, ENTITY_INFO_CAPABILITY,
+                LaunchRequest, DISCOVERY_EVENT_ON_NAVIGATE_TO, ENTITY_INFO_CAPABILITY,
                 ENTITY_INFO_EVENT, EVENT_DISCOVERY_POLICY_CHANGED, PURCHASED_CONTENT_CAPABILITY,
                 PURCHASED_CONTENT_EVENT,
             },
@@ -265,14 +265,7 @@ impl DiscoveryServer for DiscoveryImpl {
             .get_features()
             .intent_validation;
         validate_navigation_intent(intent_validation_config, request.intent.clone()).await?;
-        let policy_ids = self
-            .state
-            .policy_state
-            .policy_identifiers_alias
-            .read()
-            .unwrap()
-            .clone();
-        let req_updated_source = update_intent(ctx.app_id.clone(), policy_ids, request.clone());
+        let req_updated_source = update_intent(ctx.app_id.clone(), request.clone());
         info!(
             "Discovery.launch: req_updated_source: {:?}",
             &req_updated_source
@@ -528,72 +521,48 @@ impl DiscoveryServer for DiscoveryImpl {
         Ok(true)
     }
 }
-fn update_intent(
-    source: String,
-    policy_ids: Vec<AgePolicy>,
-    request: LaunchRequest,
-) -> LaunchRequest {
-    let age_policy = policy_ids
-        .into_iter()
-        .map(|p| p.as_string().to_string())
-        .collect::<Vec<String>>();
-    let new_age_policy: Option<Vec<String>> = if age_policy.is_empty() {
-        None
-    } else {
-        Some(age_policy)
-    };
-
+fn update_intent(source: String, request: LaunchRequest) -> LaunchRequest {
     match request.intent.clone() {
         Some(NavigationIntent::NavigationIntentStrict(navigation_intent)) => {
             let updated_navigation_intent = match navigation_intent {
                 NavigationIntentStrict::Home(mut home_intent) => {
                     home_intent.context.source = source;
-                    home_intent.context.age_policy = new_age_policy;
                     NavigationIntentStrict::Home(home_intent)
                 }
                 NavigationIntentStrict::Launch(mut launch_intent) => {
                     launch_intent.context.source = source;
-                    launch_intent.context.age_policy = new_age_policy;
                     NavigationIntentStrict::Launch(launch_intent)
                 }
                 NavigationIntentStrict::Entity(mut entity_intent) => {
                     entity_intent.context.source = source;
-                    entity_intent.context.age_policy = new_age_policy;
                     NavigationIntentStrict::Entity(entity_intent)
                 }
                 NavigationIntentStrict::Playback(mut playback_intent) => {
                     playback_intent.context.source = source;
-                    playback_intent.context.age_policy = new_age_policy;
                     NavigationIntentStrict::Playback(playback_intent)
                 }
                 NavigationIntentStrict::Search(mut search_intent) => {
                     search_intent.context.source = source;
-                    search_intent.context.age_policy = new_age_policy;
                     NavigationIntentStrict::Search(search_intent)
                 }
                 NavigationIntentStrict::Section(mut section_intent) => {
                     section_intent.context.source = source;
-                    section_intent.context.age_policy = new_age_policy;
                     NavigationIntentStrict::Section(section_intent)
                 }
                 NavigationIntentStrict::Tune(mut tune_intent) => {
                     tune_intent.context.source = source;
-                    tune_intent.context.age_policy = new_age_policy;
                     NavigationIntentStrict::Tune(tune_intent)
                 }
                 NavigationIntentStrict::ProviderRequest(mut provider_request_intent) => {
                     provider_request_intent.context.source = source;
-                    provider_request_intent.context.age_policy = new_age_policy;
                     NavigationIntentStrict::ProviderRequest(provider_request_intent)
                 }
                 NavigationIntentStrict::PlayEntity(mut p) => {
                     p.context.source = source;
-                    p.context.age_policy = new_age_policy;
                     NavigationIntentStrict::PlayEntity(p)
                 }
                 NavigationIntentStrict::PlayQuery(mut p) => {
                     p.context.source = source;
-                    p.context.age_policy = new_age_policy;
                     NavigationIntentStrict::PlayQuery(p)
                 }
             };
@@ -607,7 +576,6 @@ fn update_intent(
         }
         Some(NavigationIntent::NavigationIntentLoose(mut loose_intent)) => {
             loose_intent.context.source = source;
-            loose_intent.context.age_policy = new_age_policy;
             LaunchRequest {
                 app_id: request.app_id,
                 intent: Some(NavigationIntent::NavigationIntentLoose(loose_intent)),

core/sdk/src/api/firebolt/fb_discovery.rs

@@ -37,11 +37,11 @@ pub struct DiscoveryContext {
     pub source: String,
     #[serde(skip_serializing_if = "Option::is_none")]
     #[serde(rename = "agePolicy")]
-    pub age_policy: Option<Vec<String>>,
+    pub age_policy: Option<String>,
 }
 
 impl DiscoveryContext {
-    pub fn new(source: &str, age_policy: Option<Vec<String>>) -> DiscoveryContext {
+    pub fn new(source: &str, age_policy: Option<String>) -> DiscoveryContext {
         DiscoveryContext {
             source: source.to_string(),
             age_policy,