diff --git a/route/api.socialhub.php b/route/api.socialhub.php index 7c6c99c..021a66e 100644 --- a/route/api.socialhub.php +++ b/route/api.socialhub.php @@ -8,11 +8,13 @@ loadHelper("hybridauth.lnk"); loadHelper("hybridauth.dbt"); -loadHelper("socialhub.utl"); + +set_session_token(); +$_token = get_session_token(); $provider = get_requested_value("provider"); $action = get_requested_value("action"); -$redirect_url = get_requested_value("redirect_url"); +$redirect_uri = get_requested_value("redirect_uri"); $user_id = get_requested_value("user_id"); $connection_id = get_requested_value("connection_id"); @@ -25,12 +27,14 @@ if(!empty($api_session_id)) { "storage_type" => "session" )); if(!$fr) { - $api_session_id = ""; // renew api session id + // renew api session id + $api_session_id = ""; + set_session("api_session_id", $api_session_id); } else { $session_data = json_decode($fr); $provider = get_property_value("provider", $session_data); $action = get_property_value("action", $session_data); - $redirect_url = get_property_value("redirect_url", $session_data); + $redirect_uri = get_property_value("redirect_uri", $session_data); $user_id = get_property_value("user_id", $session_data); $connection_id = get_property_value("connection_id", $session_data); $message = get_property_value("message", $session_data); @@ -86,7 +90,7 @@ $session_data = array( "api_session_id" => $api_session_id, "provider" => $provider, "action" => $action, - "redirect_url" => $redirect_url, + "redirect_uri" => $redirect_uri, "user_id" => $user_id, "connection_id" => $connection_id, "message" => $message @@ -123,7 +127,7 @@ if(!$session_flag) { redirect_uri(get_route_link("api.socialhub", array( "provider" => $provider, "action" => $action, - "redirect_url" => $redirect_url, + "redirect_uri" => $redirect_uri, "user_id" => $user_id, "connection_id" => $connection_id ), false)); @@ -182,10 +186,38 @@ switch($action) { break; case "delete": // listen delete ping break; + case "object": // get object by id + $object_id = get_requested_value("object_id"); + $context = array( + "success" => true, + "message" => "Found", + "response" => socialhub_get_object($provider, $hauth_adapter, $object_id) + ); + break; default: set_error("Unknown action"); show_errors(); } -header("Content-Type: application/json"); -echo json_encode($context); +if(empty($redirect_uri)) { + header("Content-Type: application/json"); + echo json_encode($context); +} else { + $_display_name = get_hashed_text($hauth_profile->displayName, "base64"); + $_idt_hash = get_hashed_text($hauth_profile->identifier, "sha1"); + $_idt_name = $_idt_hash . "@" . $provider; + $_idt = get_hashed_text($_idt_name, "sha1"); + + // renew api session id + $api_session_id = ""; + set_session("api_session_id", $api_session_id); + + // go to redirect uri + redirect_with_params($redirect_uri, array( + "connection_id" => $connect_id, + "provider" => $provider, + "display_name" => $_display_name, + "idt" => $_idt, + "_token" => $_token + )); +}