fix: Making token:account as available instead of token:platform (#357)

* fix: Making token:account as available instead of token:platform
rdkcentral · Feb 28, 2024 · 1752167 · 1752167
1 parent ea3c333
commit 1752167
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 53 deletions.
diff --git a/core/main/src/firebolt/handlers/account_rpc.rs b/core/main/src/firebolt/handlers/account_rpc.rs
@@ -23,7 +23,6 @@ use jsonrpsee::{
 use ripple_sdk::{
     api::{
         distributor::distributor_encoder::EncoderRequest,
-        firebolt::fb_capabilities::{CapEvent, FireboltCap},
         gateway::rpc_gateway_api::CallContext,
         session::{AccountSessionRequest, AccountSessionTokenRequest},
     },
@@ -32,8 +31,7 @@ use ripple_sdk::{
 };
 
 use crate::{
-    firebolt::rpc::RippleRPCProvider,
-    state::{cap::cap_state::CapState, platform_state::PlatformState},
+    firebolt::rpc::RippleRPCProvider, state::platform_state::PlatformState,
     utils::rpc_utils::rpc_err,
 };
 
@@ -67,34 +65,7 @@ impl AccountServer for AccountImpl {
             error!("Error in session {:?}", resp);
             return Err(rpc_err("session error response TBD"));
         }
-
-        match resp {
-            Ok(payload) => match payload.payload.extract().unwrap() {
-                ExtnResponse::None(()) => {
-                    CapState::emit(
-                        &self.platform_state,
-                        CapEvent::OnAvailable,
-                        FireboltCap::Short("token:platform".to_owned()),
-                        None,
-                    )
-                    .await;
-                    Ok(())
-                }
-                _ => {
-                    CapState::emit(
-                        &self.platform_state,
-                        CapEvent::OnUnavailable,
-                        FireboltCap::Short("token:platform".to_owned()),
-                        None,
-                    )
-                    .await;
-                    Err(rpc_err("Provision Status error response TBD"))
-                }
-            },
-            Err(_e) => Err(jsonrpsee::core::Error::Custom(String::from(
-                "Provision Status error response TBD",
-            ))),
-        }
+        Ok(())
     }
 
     async fn id_rpc(&self, _ctx: CallContext) -> RpcResult<String> {

diff --git a/core/main/src/processor/main_context_processor.rs b/core/main/src/processor/main_context_processor.rs
@@ -98,11 +98,18 @@ impl MainContextProcessor {
         }
         CapState::emit(
             state,
-            event,
+            &event,
             FireboltCap::Short("token:account".to_owned()),
             None,
         )
         .await;
+        CapState::emit(
+            state,
+            &event,
+            FireboltCap::Short("token:platform".to_owned()),
+            None,
+        )
+        .await;
         token_available
     }
 

diff --git a/core/main/src/service/apps/provider_broker.rs b/core/main/src/service/apps/provider_broker.rs
@@ -197,7 +197,7 @@ impl ProviderBroker {
 
         CapState::emit(
             pst,
-            CapEvent::OnAvailable,
+            &CapEvent::OnAvailable,
             FireboltCap::Full(capability),
             None,
         )
@@ -379,7 +379,7 @@ impl ProviderBroker {
             .map(|x| FireboltCap::Full(x.clone()))
             .collect();
         for cap in caps {
-            CapState::emit(pst, CapEvent::OnUnavailable, cap, None).await
+            CapState::emit(pst, &CapEvent::OnUnavailable, cap, None).await
         }
     }
 

diff --git a/core/main/src/service/user_grants.rs b/core/main/src/service/user_grants.rs
@@ -1541,7 +1541,7 @@ impl GrantPolicyEnforcer {
                     debug!("grant step execute Err. step={:?} e={:?}", step, e);
                     CapState::emit(
                         platform_state,
-                        CapEvent::OnRevoked,
+                        &CapEvent::OnRevoked,
                         permission.cap.clone(),
                         Some(permission.role),
                     )
@@ -1556,7 +1556,7 @@ impl GrantPolicyEnforcer {
 
             CapState::emit(
                 platform_state,
-                CapEvent::OnGranted,
+                &CapEvent::OnGranted,
                 permission.cap.clone(),
                 Some(permission.role),
             )

diff --git a/core/main/src/state/cap/cap_state.rs b/core/main/src/state/cap/cap_state.rs
@@ -110,14 +110,14 @@ impl CapState {
 
     fn check_primed(
         ps: &PlatformState,
-        event: CapEvent,
-        cap: FireboltCap,
+        _event: &CapEvent,
+        cap: &FireboltCap,
         app_id: Option<String>,
     ) -> bool {
         let r = ps.cap_state.primed_listeners.read().unwrap();
         debug!("primed entries {:?}", r);
         if r.iter().any(|x| {
-            if x.event == event && x.cap == cap {
+            if matches!(&x.event, _event) && &x.cap == cap {
                 if let Some(a) = &app_id {
                     x.app_id.eq(a)
                 } else {
@@ -134,11 +134,11 @@ impl CapState {
 
     pub async fn emit(
         ps: &PlatformState,
-        event: CapEvent,
+        event: &CapEvent,
         cap: FireboltCap,
         role: Option<CapabilityRole>,
     ) {
-        match &event {
+        match event {
             CapEvent::OnAvailable => ps
                 .cap_state
                 .generic
@@ -150,7 +150,7 @@ impl CapState {
             _ => {}
         }
         // check if given event and capability needs emitting
-        if Self::check_primed(ps, event.clone(), cap.clone(), None) {
+        if Self::check_primed(ps, event, &cap, None) {
             debug!("preparing cap event emit {}", cap.as_str());
             // if its a grant or revoke it could be done per app
             // these require additional
@@ -174,7 +174,7 @@ impl CapState {
                 let cc = listener.call_ctx.clone();
                 // Step 2: Check if the given event is valid for the app
                 if is_app_check_necessary
-                    && !Self::check_primed(ps, event.clone(), cap.clone(), Some(cc.app_id.clone()))
+                    && !Self::check_primed(ps, event, &cap, Some(cc.app_id.clone()))
                 {
                     continue;
                 }

diff --git a/core/main/src/state/cap/generic_cap_state.rs b/core/main/src/state/cap/generic_cap_state.rs
@@ -46,6 +46,7 @@ impl GenericCapState {
         let caps = vec![
             FireboltCap::Short("input:keyboard".to_owned()),
             FireboltCap::Short("token:account".to_owned()),
+            FireboltCap::Short("token:platform".to_owned()),
             FireboltCap::Short("usergrant:acknowledgechallenge".to_owned()),
             FireboltCap::Short("usergrant:pinchallenge".to_owned()),
         ];
@@ -72,6 +73,7 @@ impl GenericCapState {
                 not_available.insert(cap.as_str());
             }
         }
+        debug!("Caps that are not available: {:?}", not_available);
     }
 
     pub fn check_for_processor(&self, request: Vec<String>) -> HashMap<String, bool> {

diff --git a/core/main/src/state/metrics_state.rs b/core/main/src/state/metrics_state.rs
@@ -52,7 +52,7 @@ pub struct MetricsState {
 
 impl MetricsState {
     fn send_context_update_request(platform_state: &PlatformState) {
-        let mut extn_client = platform_state.get_client().get_extn_client();
+        let extn_client = platform_state.get_client().get_extn_client();
         let metrics_context = platform_state.metrics.context.read().unwrap().clone();
 
         if let Err(e) = extn_client

diff --git a/core/sdk/src/api/firebolt/fb_openrpc.rs b/core/sdk/src/api/firebolt/fb_openrpc.rs
@@ -244,7 +244,11 @@ impl FireboltOpenRpc {
 
         let setter = self.get_setter_method_for_property(tokens[1]);
         setter.filter(|method| {
-            if let Some(suffix) = method.name.to_lowercase().strip_prefix(tokens[0]) {
+            if let Some(suffix) = method
+                .name
+                .to_lowercase()
+                .strip_prefix(tokens[0].to_lowercase().as_str())
+            {
                 !suffix.is_empty() && suffix.starts_with('.')
             } else {
                 false

diff --git a/core/sdk/src/api/observability/metrics_util.rs b/core/sdk/src/api/observability/metrics_util.rs
@@ -26,7 +26,7 @@ pub fn start_service_metrics_timer(extn_client: &ExtnClient, name: String) -> Op
 }
 
 pub async fn stop_and_send_service_metrics_timer(
-    mut client: ExtnClient,
+    client: ExtnClient,
     timer: Option<Timer>,
     status: String,
 ) {

diff --git a/core/sdk/src/extn/client/extn_client.rs b/core/sdk/src/extn/client/extn_client.rs
@@ -515,7 +515,7 @@ impl ExtnClient {
     /// Critical method used by event processors to emit event back to the requestor
     /// # Arguments
     /// `msg` - [ExtnMessage] event object
-    pub fn event(&mut self, event: impl ExtnPayloadProvider) -> Result<(), RippleError> {
+    pub fn event(&self, event: impl ExtnPayloadProvider) -> Result<(), RippleError> {
         let other_sender = self.get_extn_sender_with_contract(event.get_contract());
         self.sender.send_event(event, other_sender)
     }
@@ -549,7 +549,7 @@ impl ExtnClient {
     /// # Arguments
     /// `payload` - impl [ExtnPayloadProvider]
     pub async fn standalone_request<T: ExtnPayloadProvider>(
-        &mut self,
+        &self,
         payload: impl ExtnPayloadProvider,
         timeout_in_msecs: u64,
     ) -> Result<T, RippleError> {
@@ -586,7 +586,7 @@ impl ExtnClient {
     ///
     /// # Arguments
     /// `payload` - impl [ExtnPayloadProvider]
-    pub fn request_transient(&mut self, payload: impl ExtnPayloadProvider) -> RippleResponse {
+    pub fn request_transient(&self, payload: impl ExtnPayloadProvider) -> RippleResponse {
         let id = uuid::Uuid::new_v4().to_string();
         let other_sender = self.get_extn_sender_with_contract(payload.get_contract());
         self.sender.send_request(id, payload, other_sender, None)
@@ -1528,7 +1528,7 @@ pub mod tests {
             Some(HashMap::new()),
         );
 
-        let mut extn_client = ExtnClient::new(receiver.clone(), mock_sender.clone());
+        let extn_client = ExtnClient::new(receiver.clone(), mock_sender.clone());
 
         // TODO - this is a dummy test, need to add a real test
         if let Ok(ExtnResponse::Value(_v)) = extn_client
@@ -1550,7 +1550,7 @@ pub mod tests {
             Some(HashMap::new()),
         );
 
-        let mut extn_client = ExtnClient::new(receiver, mock_sender);
+        let extn_client = ExtnClient::new(receiver, mock_sender);
         let (s, _receiver) = unbounded();
         extn_client.clone().add_sender(
             ExtnId::get_main_target("main".into()),

diff --git a/device/thunder_ripple_sdk/src/bootstrap/setup_thunder_pool_step.rs b/device/thunder_ripple_sdk/src/bootstrap/setup_thunder_pool_step.rs
@@ -36,7 +36,7 @@ impl ThunderPoolStep {
     }
 
     pub async fn setup(
-        mut state: ThunderBootstrapStateWithConfig,
+        state: ThunderBootstrapStateWithConfig,
     ) -> Result<ThunderBootstrapStateWithClient, RippleError> {
         let pool_size = state.pool_size;
         let url = state.url.clone();

diff --git a/examples/rpc_extn/src/rpc/legacy_jsonrpsee_extn.rs b/examples/rpc_extn/src/rpc/legacy_jsonrpsee_extn.rs
@@ -51,7 +51,7 @@ pub trait Legacy {
 #[async_trait]
 impl LegacyServer for LegacyImpl {
     async fn make(&self, ctx: CallContext) -> RpcResult<String> {
-        let mut client = self.client.clone();
+        let client = self.client.clone();
         let mut new_ctx = ctx;
         new_ctx.protocol = ApiProtocol::Extn;