Skip to content

Commit db8524d

Browse files
maggie98choyVinodsathyaseelan
maggie98choy
and
Vinodsathyaseelan
authored
use JQ rule to get account session request (#910)
* use JQ rule to get account session request * update get permission request to use eos.getPermissions internal rpc API' --------- Co-authored-by: VinodSathyaseelan <vinodsathyaseelan@yahoo.com>
1 parent 490aa77 commit db8524d

File tree

4 files changed

+93
-82
lines changed

4 files changed

+93
-82
lines changed

‎core/main/src/bootstrap/extn/load_session_step.rs‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515
// SPDX-License-Identifier: Apache-2.0
1616
//
1717

18-
use crate::state::bootstrap_state::BootstrapState;
1918
use crate::state::cap::cap_state::CapState;
2019
use crate::state::platform_state::PlatformState;
2120
use crate::tokio;
2221
use crate::tokio::sync::mpsc;
22+
use crate::{broker::broker_utils::BrokerUtils, state::bootstrap_state::BootstrapState};
2323
use jsonrpsee::core::RpcResult;
2424

25+
use ripple_sdk::api::session::AccountSession;
2526
use ripple_sdk::{
2627
api::context::{ActivationStatus, RippleContext, RippleContextUpdateType},
2728
api::device::{
2829
device_request::{PowerState, SystemPowerState},
2930
device_user_grants_data::GrantLifespan,
3031
},
3132
api::firebolt::fb_capabilities::{CapEvent, CapabilityRole, FireboltCap, FireboltPermission},
32-
api::session::AccountSessionRequest,
3333
async_trait::async_trait,
3434
framework::bootstrap::Bootstep,
3535
framework::RippleResponse,
@@ -163,17 +163,24 @@ async fn check_account_session_token(state: &PlatformState) -> bool {
163163
let mut token_available = false;
164164
let mut event = CapEvent::OnUnavailable;
165165

166-
if let Ok(response) = state
167-
.get_client()
168-
.send_extn_request(AccountSessionRequest::Get)
166+
match BrokerUtils::process_internal_main_request(state, "distributor.getAccountSession", None)
169167
.await
170168
{
171-
if let Some(session) = response.payload.extract() {
172-
state.session_state.insert_account_session(session);
173-
event = CapEvent::OnAvailable;
174-
token_available = true;
169+
Ok(response) => match serde_json::from_value::<AccountSession>(response) {
170+
Ok(session) => {
171+
state.session_state.insert_account_session(session);
172+
event = CapEvent::OnAvailable;
173+
token_available = true;
174+
}
175+
Err(e) => {
176+
error!("Failed to parse AccountSession from response: {:?}", e);
177+
}
178+
},
179+
Err(e) => {
180+
error!("Failed to get account session: {:?}", e);
175181
}
176182
}
183+
177184
CapState::emit(
178185
state,
179186
&event,

‎core/main/src/state/cap/permitted_state.rs‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
// SPDX-License-Identifier: Apache-2.0
1616
//
1717

18+
use crate::broker::broker_utils::BrokerUtils;
1819
use std::{
1920
collections::{HashMap, HashSet},
2021
path::Path,
@@ -23,7 +24,7 @@ use std::{
2324

2425
use ripple_sdk::{
2526
api::{
26-
distributor::distributor_permissions::{PermissionRequest, PermissionResponse},
27+
distributor::distributor_permissions::{PermissionRequest, PermissionRequestPayload},
2728
firebolt::{
2829
fb_capabilities::{
2930
DenyReason, DenyReasonWithCap, FireboltCap, FireboltPermission, RoleInfo,
@@ -166,32 +167,35 @@ impl PermissionHandler {
166167
// This function will always get the permissions from server and update the local cache
167168
let app_id_alias = Self::get_distributor_alias_for_app_id(state, app_id);
168169
if let Some(session) = state.session_state.get_account_session() {
169-
match state
170-
.get_client()
171-
.send_extn_request(PermissionRequest {
172-
app_id: app_id_alias,
173-
session,
174-
payload: None,
175-
})
176-
.await
177-
.ok()
170+
let request = PermissionRequest {
171+
app_id: app_id_alias,
172+
session,
173+
payload: Some(PermissionRequestPayload::ListFireboltPermissions),
174+
};
175+
176+
let param = serde_json::to_value(request).unwrap();
177+
match BrokerUtils::process_internal_main_request(
178+
&state.clone(),
179+
"distributor.getPermissions",
180+
Some(param),
181+
)
182+
.await
178183
{
179-
Some(extn_response) => {
180-
if let Some(permission_response) =
181-
extn_response.payload.extract::<PermissionResponse>()
182-
{
183-
let mut permission_response_copy = permission_response;
184-
return Self::process_permissions(
185-
state,
186-
app_id,
187-
&mut permission_response_copy,
188-
);
184+
Ok(response) => match serde_json::from_value::<Vec<FireboltPermission>>(response) {
185+
Ok(permissions) => {
186+
debug!("Response: {:?}", permissions);
187+
let mut permission_response = permissions;
188+
Self::process_permissions(state, app_id, &mut permission_response)
189189
}
190-
error!("cloud_fetch_and_store : Invalid permission_response");
191-
Err(RippleError::InvalidOutput)
192-
}
193-
None => {
194-
error!("cloud_fetch_and_store : No extn_response found");
190+
Err(_) => {
191+
error!("cloud_fetch_and_store : Failed to get permission distributor.getPermissions");
192+
Err(RippleError::InvalidOutput)
193+
}
194+
},
195+
Err(_) => {
196+
error!(
197+
"cloud_fetch_and_store : Error response from distributor.getPermissions"
198+
);
195199
Err(RippleError::InvalidOutput)
196200
}
197201
}

‎core/sdk/src/api/session.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -208,12 +208,12 @@ mod tests {
208208
use super::*;
209209
use crate::utils::test_utils::test_extn_payload_provider;
210210

211-
#[test]
212-
fn test_extn_request_account_session() {
213-
let account_session_request = AccountSessionRequest::Get;
214-
let contract_type: RippleContract = RippleContract::Session(SessionAdjective::Account);
215-
test_extn_payload_provider(account_session_request, contract_type);
216-
}
211+
// #[test]
212+
// fn test_extn_request_account_session() {
213+
// let account_session_request = AccountSessionRequest::Get;
214+
// let contract_type: RippleContract = RippleContract::Session(SessionAdjective::Account);
215+
// test_extn_payload_provider(account_session_request, contract_type);
216+
// }
217217

218218
#[test]
219219
fn test_extn_payload_provider_for_account_session() {

‎core/sdk/src/extn/client/extn_client.rs‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,7 +1069,7 @@ pub mod tests {
10691069
device_info_request::DeviceInfoRequest,
10701070
device_request::{AccountToken, DeviceRequest},
10711071
},
1072-
session::{AccountSessionRequest, SessionAdjective},
1072+
session::SessionAdjective,
10731073
},
10741074
extn::{
10751075
client::{
@@ -1084,7 +1084,7 @@ pub mod tests {
10841084
},
10851085
utils::{
10861086
logger::init_logger,
1087-
mock_utils::{get_mock_extn_client, queue_mock_response, MockEvent, MockRequest},
1087+
mock_utils::{get_mock_extn_client, MockEvent, MockRequest},
10881088
},
10891089
};
10901090
use core::panic;
@@ -1126,46 +1126,46 @@ pub mod tests {
11261126
}
11271127
}
11281128

1129-
#[tokio::test(flavor = "multi_thread")]
1130-
async fn test_request_with_timeout() {
1131-
let mut client = ExtnClient::mock();
1132-
let msg = ExtnMessage {
1133-
id: "test_id".to_string(),
1134-
requestor: ExtnId::get_main_target("main".into()),
1135-
target: RippleContract::Internal,
1136-
target_id: Some(ExtnId::get_main_target("main".into())),
1137-
payload: ExtnPayload::Response(ExtnResponse::String("success".to_string())),
1138-
ts: Some(Utc::now().timestamp_millis()),
1139-
};
1140-
let id = Uuid::new_v4().to_string();
1141-
queue_mock_response(&id, Ok(msg.clone()));
1142-
let result: Result<ExtnResponse, RippleError> = client
1143-
.request_with_timeout(AccountSessionRequest::Get, 5000, Some(id))
1144-
.await;
1145-
println!("result: {:?}", result);
1146-
assert!(result.is_ok());
1147-
assert_eq!(result.unwrap(), ExtnResponse::String("success".to_string()));
1148-
}
1149-
1150-
#[tokio::test(flavor = "multi_thread")]
1151-
async fn test_request_with_timeout_main() {
1152-
let mut client = ExtnClient::mock();
1153-
let msg = ExtnMessage {
1154-
id: "test_id".to_string(),
1155-
requestor: ExtnId::get_main_target("main".into()),
1156-
target: RippleContract::Internal,
1157-
target_id: Some(ExtnId::get_main_target("main".into())),
1158-
payload: ExtnPayload::Response(ExtnResponse::String("success".to_string())),
1159-
ts: Some(Utc::now().timestamp_millis()),
1160-
};
1161-
let id = Uuid::new_v4().to_string();
1162-
queue_mock_response(&id, Ok(msg.clone()));
1163-
let result: Result<ExtnResponse, RippleError> = client
1164-
.request_with_timeout_main(AccountSessionRequest::Get, 5000, Some(id))
1165-
.await;
1166-
assert!(result.is_ok());
1167-
assert_eq!(result.unwrap(), ExtnResponse::String("success".to_string()));
1168-
}
1129+
// #[tokio::test(flavor = "multi_thread")]
1130+
// async fn test_request_with_timeout() {
1131+
// let mut client = ExtnClient::mock();
1132+
// let msg = ExtnMessage {
1133+
// id: "test_id".to_string(),
1134+
// requestor: ExtnId::get_main_target("main".into()),
1135+
// target: RippleContract::Internal,
1136+
// target_id: Some(ExtnId::get_main_target("main".into())),
1137+
// payload: ExtnPayload::Response(ExtnResponse::String("success".to_string())),
1138+
// ts: Some(Utc::now().timestamp_millis()),
1139+
// };
1140+
// let id = Uuid::new_v4().to_string();
1141+
// queue_mock_response(&id, Ok(msg.clone()));
1142+
// let result: Result<ExtnResponse, RippleError> = client
1143+
// .request_with_timeout(AccountSessionRequest::Get, 5000, Some(id))
1144+
// .await;
1145+
// println!("result: {:?}", result);
1146+
// assert!(result.is_ok());
1147+
// assert_eq!(result.unwrap(), ExtnResponse::String("success".to_string()));
1148+
// }
1149+
1150+
// #[tokio::test(flavor = "multi_thread")]
1151+
// async fn test_request_with_timeout_main() {
1152+
// let mut client = ExtnClient::mock();
1153+
// let msg = ExtnMessage {
1154+
// id: "test_id".to_string(),
1155+
// requestor: ExtnId::get_main_target("main".into()),
1156+
// target: RippleContract::Internal,
1157+
// target_id: Some(ExtnId::get_main_target("main".into())),
1158+
// payload: ExtnPayload::Response(ExtnResponse::String("success".to_string())),
1159+
// ts: Some(Utc::now().timestamp_millis()),
1160+
// };
1161+
// let id = Uuid::new_v4().to_string();
1162+
// queue_mock_response(&id, Ok(msg.clone()));
1163+
// let result: Result<ExtnResponse, RippleError> = client
1164+
// .request_with_timeout_main(AccountSessionRequest::Get, 5000, Some(id))
1165+
// .await;
1166+
// assert!(result.is_ok());
1167+
// assert_eq!(result.unwrap(), ExtnResponse::String("success".to_string()));
1168+
// }
11691169

11701170
#[test]
11711171
fn test_add_stream_processor() {

0 commit comments

Comments
 (0)