diff options
| author | Magnus Feuer <mfeuer@jaguarlandrover.com> | 2015-03-04 19:04:19 -0800 |
|---|---|---|
| committer | Magnus Feuer <mfeuer@jaguarlandrover.com> | 2015-03-04 19:04:19 -0800 |
| commit | a6fd10329c96233b12ddb2d0206716d30379af22 (patch) | |
| tree | e0ad6865827e4fcdfce4d3c63f2d7f4540ab7e01 | |
| parent | a7f8793c5fcd343be8c1ea345b2894d7c711dafa (diff) | |
| download | rvi_core-a6fd10329c96233b12ddb2d0206716d30379af22.tar.gz | |
Removed obsolete calling service
| -rw-r--r-- | components/authorize/src/authorize_rpc.erl | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/components/authorize/src/authorize_rpc.erl b/components/authorize/src/authorize_rpc.erl index d528765..3d214ea 100644 --- a/components/authorize/src/authorize_rpc.erl +++ b/components/authorize/src/authorize_rpc.erl @@ -49,7 +49,7 @@ init_rvi_component() -> %% Retrieve certificate. %% Certificate will be passed to exo_json:encode() in order %% to be translated to JSON. -get_certificate_body(_CallingService, _ServiceName) -> +get_certificate_body(_ServiceName) -> {struct, [ %% Topic tree patterns that this node is authorized to @@ -104,15 +104,14 @@ get_certificate_body(_CallingService, _ServiceName) -> ] }. -authorize_local_message(ServiceName, CallingService) -> +authorize_local_message(ServiceName) -> ?debug("authorize_rpc:authorize_local_msg(): service_name: ~p ~n", [ServiceName]), - ?debug("authorize_rpc:authorize_local_msg(): calling_service: ~p ~n", [CallingService]), {ok, [ { status, rvi_common:json_rpc_status(ok)}, { signature, "fixme_add_signature" }, -%% { certificate, get_certificate_body(CallingService, ServiceName) } - { certificate, "certificate" } + { certificate, get_certificate_body(ServiceName) } +%% { certificate, "certificate" } ]}. authorize_remote_message(ServiceName, Signature, Certificate) -> @@ -130,8 +129,7 @@ authorize_remote_message(ServiceName, Signature, Certificate) -> %% CAlled by local exo http server handle_rpc("authorize_local_message", Args) -> {ok, ServiceName} = rvi_common:get_json_element(["service_name"], Args), - {ok, CallingService} = rvi_common:get_json_element(["calling_service"], Args), - authorize_local_message(ServiceName, CallingService); + authorize_local_message(ServiceName); handle_rpc("authorize_remote_message", Args) -> {ok, ServiceName} = rvi_common:get_json_element(["service_name"], Args), @@ -150,11 +148,9 @@ handle_rpc(Other, _Args) -> %% handle_call({rvi_call, authorize_local_message, Args}, _From, State) -> {_, ServiceName} = lists:keyfind(service_name, 1, Args), - {_, CallingService} = lists:keyfind(calling_service, 1, Args), ?info("authorize_rpc:authorize_local_message(gen_server): args: ~p", [ Args]), ?info("authorize_rpc:authorize_local_message(gen_server): service name: ~p", [ ServiceName]), - ?info("authorize_rpc:authorize_local_message(gen_server): calling service: ~p", [ CallingService]), - {reply, authorize_local_message(ServiceName, CallingService), State}; + {reply, authorize_local_message(ServiceName), State}; handle_call({rvi_call, authorize_remote_message, Args}, _From, State) -> {_, ServiceName} = lists:keyfind(service_name, 1, Args), |