fix: Account API fixes (#111)

account.id account.uid request, response tested and verified. { "jsonrpc": "2.0", "id": 1, "method": "account.id", "params": {} } {"jsonrpc":"2.0","result":"general","id":1} { "jsonrpc": "2.0", "id": 1, "method": "account.uid", "params": {} } {"jsonrpc":"2.0","result":"general","id":1} { "jsonrpc": "2.0", "id": 1, "method": "account.session", "params": {"token" : "RmlyZWJvbHQgTWFuYWdlIFNESyBSb2NrcyEhIQ==", "expiresIn" : 84000 } } {"jsonrpc":"2.0","result":null,"id":1} Co-authored-by: Fasil K V <[email protected]>
rdkcentral · May 23, 2023 · ad056ac · ad056ac
1 parent 47f4850
commit ad056ac
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/core/main/src/bootstrap/start_fbgateway_step.rs b/core/main/src/bootstrap/start_fbgateway_step.rs
@@ -19,14 +19,15 @@ use crate::{
     firebolt::{
         firebolt_gateway::FireboltGateway,
         handlers::{
-            accessory_rpc::AccessoryRippleProvider, acknowledge_rpc::AckRPCProvider,
-            advertising_rpc::AdvertisingRPCProvider, authentication_rpc::AuthRPCProvider,
-            capabilities_rpc::CapRPCProvider, closed_captions_rpc::ClosedcaptionsRPCProvider,
-            device_rpc::DeviceRPCProvider, discovery_rpc::DiscoveryRPCProvider,
-            keyboard_rpc::KeyboardRPCProvider, lcm_rpc::LifecycleManagementProvider,
-            lifecycle_rpc::LifecycleRippleProvider, localization_rpc::LocalizationRPCProvider,
-            metrics_rpc::MetricsRPCProvider, parameters_rpc::ParametersRPCProvider,
-            pin_rpc::PinRPCProvider, privacy_rpc::PrivacyProvider, profile_rpc::ProfileRPCProvider,
+            accessory_rpc::AccessoryRippleProvider, account_rpc::AccountRPCProvider,
+            acknowledge_rpc::AckRPCProvider, advertising_rpc::AdvertisingRPCProvider,
+            authentication_rpc::AuthRPCProvider, capabilities_rpc::CapRPCProvider,
+            closed_captions_rpc::ClosedcaptionsRPCProvider, device_rpc::DeviceRPCProvider,
+            discovery_rpc::DiscoveryRPCProvider, keyboard_rpc::KeyboardRPCProvider,
+            lcm_rpc::LifecycleManagementProvider, lifecycle_rpc::LifecycleRippleProvider,
+            localization_rpc::LocalizationRPCProvider, metrics_rpc::MetricsRPCProvider,
+            parameters_rpc::ParametersRPCProvider, pin_rpc::PinRPCProvider,
+            privacy_rpc::PrivacyProvider, profile_rpc::ProfileRPCProvider,
             second_screen_rpc::SecondScreenRPCProvider,
             secure_storage_rpc::SecureStorageRPCProvider, user_grants_rpc::UserGrantsRPCProvider,
             voice_guidance_rpc::VoiceguidanceRPCProvider, wifi_rpc::WifiRPCProvider,
@@ -65,6 +66,7 @@ impl FireboltGatewayStep {
         let _ = methods.merge(MetricsRPCProvider::provide_with_alias(state.clone()));
         let _ = methods.merge(DiscoveryRPCProvider::provide_with_alias(state.clone()));
         let _ = methods.merge(AuthRPCProvider::provide_with_alias(state.clone()));
+        let _ = methods.merge(AccountRPCProvider::provide_with_alias(state.clone()));
 
         // LCM Api(s) not required for internal launcher
         if !state.has_internal_launcher() {

diff --git a/distributor/general/src/general_permissions_map.json b/distributor/general/src/general_permissions_map.json
@@ -39,15 +39,18 @@
         "xrn:firebolt:capability:advertising:configuration",
         "xrn:firebolt:capability:advertising:identifier",
         "xrn:firebolt:capability:privacy:advertising",
-        "xrn:firebolt:capability:account:id",
         "xrn:firebolt:capability:device:distributor",
         "xrn:firebolt:capability:discovery:policy",
         "xrn:firebolt:capability:discovery:watched",
         "xrn:firebolt:capability:discovery:watch-next",
         "xrn:firebolt:capability:approve:content",
         "xrn:firebolt:capability:approve:purchase",
         "xrn:firebolt:capability:profile:flag",
-        "xrn:firebolt:capability:protocol:dial"
+        "xrn:firebolt:capability:protocol:dial",
+        "xrn:firebolt:capability:account:id",
+        "xrn:firebolt:capability:account:uid",
+        "xrn:firebolt:capability:token:account"
+
     ],
     "comcast_firebolt_reference" : [
         "xrn:firebolt:capability:input:keyboard",
@@ -58,6 +61,9 @@
         "xrn:firebolt:capability:privacy:settings"
     ],
     "test" : [
+        "xrn:firebolt:capability:account:id",
+        "xrn:firebolt:capability:account:uid",
+        "xrn:firebolt:capability:token:account",
         "xrn:firebolt:capability:input:keyboard",
         "xrn:firebolt:capability:device:info",
         "xrn:firebolt:capability:device:make",
@@ -99,6 +105,9 @@
         "xrn:firebolt:capability:metrics:media"
     ],
     "comcast.test.firecert" : [
+        "xrn:firebolt:capability:account:id",
+        "xrn:firebolt:capability:account:uid",
+        "xrn:firebolt:capability:token:account",
         "xrn:firebolt:capability:input:keyboard",
         "xrn:firebolt:capability:device:info",
         "xrn:firebolt:capability:device:make",

diff --git a/examples/manifest/device-manifest-example.json b/examples/manifest/device-manifest-example.json
@@ -51,7 +51,9 @@
       "xrn:firebolt:capability:discovery:watched",
       "xrn:firebolt:capability:accessibility:closedcaptions",
       "xrn:firebolt:capability:accessibility:voiceguidance",
+      "xrn:firebolt:capability:account:id",
       "xrn:firebolt:capability:account:uid",
+      "xrn:firebolt:capability:token:account",
       "xrn:firebolt:capability:approve:content",
       "xrn:firebolt:capability:approve:purchase",
       "xrn:firebolt:capability:device:distributor",