bring back json ops (#2815)

1 files changed, 24 insertions, 38 deletions

diff --git a/cli/ops/permissions.rs b/cli/ops/permissions.rs
index 6249581fb..5d14f39be 100644
--- a/cli/ops/permissions.rs
+++ b/cli/ops/permissions.rs
@@ -1,50 +1,35 @@
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-use super::dispatch_flatbuffers::serialize_response;
-use super::utils::*;
-use crate::msg;
+use super::dispatch_json::{Deserialize, JsonOp, Value};
 use crate::state::ThreadSafeState;
 use deno::*;
-use flatbuffers::FlatBufferBuilder;
 
 pub fn op_permissions(
   state: &ThreadSafeState,
-  base: &msg::Base<'_>,
-  data: Option<PinnedBuf>,
-) -> CliOpResult {
-  assert!(data.is_none());
-  let cmd_id = base.cmd_id();
-  let builder = &mut FlatBufferBuilder::new();
-  let inner = msg::PermissionsRes::create(
-    builder,
-    &msg::PermissionsResArgs {
-      run: state.permissions.allows_run(),
-      read: state.permissions.allows_read(),
-      write: state.permissions.allows_write(),
-      net: state.permissions.allows_net(),
-      env: state.permissions.allows_env(),
-      hrtime: state.permissions.allows_hrtime(),
-    },
-  );
-  let response_buf = serialize_response(
-    cmd_id,
-    builder,
-    msg::BaseArgs {
-      inner: Some(inner.as_union_value()),
-      inner_type: msg::Any::PermissionsRes,
-      ..Default::default()
-    },
-  );
-  ok_buf(response_buf)
+  _args: Value,
+  _zero_copy: Option<PinnedBuf>,
+) -> Result<JsonOp, ErrBox> {
+  Ok(JsonOp::Sync(json!({
+    "run": state.permissions.allows_run(),
+    "read": state.permissions.allows_read(),
+    "write": state.permissions.allows_write(),
+    "net": state.permissions.allows_net(),
+    "env": state.permissions.allows_env(),
+    "hrtime": state.permissions.allows_hrtime(),
+  })))
+}
+
+#[derive(Deserialize)]
+struct RevokePermissionArgs {
+  permission: String,
 }
 
 pub fn op_revoke_permission(
   state: &ThreadSafeState,
-  base: &msg::Base<'_>,
-  data: Option<PinnedBuf>,
-) -> CliOpResult {
-  assert!(data.is_none());
-  let inner = base.inner_as_permission_revoke().unwrap();
-  let permission = inner.permission().unwrap();
+  args: Value,
+  _zero_copy: Option<PinnedBuf>,
+) -> Result<JsonOp, ErrBox> {
+  let args: RevokePermissionArgs = serde_json::from_value(args)?;
+  let permission = args.permission.as_ref();
   match permission {
     "run" => state.permissions.revoke_run(),
     "read" => state.permissions.revoke_read(),
@@ -54,5 +39,6 @@ pub fn op_revoke_permission(
     "hrtime" => state.permissions.revoke_hrtime(),
     _ => Ok(()),
   }?;
-  ok_buf(empty_buf())
+
+  Ok(JsonOp::Sync(json!({})))
 }