From 111866fa4e4dd38e9808d76db6262e68f3d06b31 Mon Sep 17 00:00:00 2001
From: chirag shah <chiragshah1@tartarus.dreamhost.com>
Date: Sun, 3 May 2009 19:15:49 +0800
Subject: [PATCH] Added support for the orkut and friendconnect opensocial
 0.8.1 people APIs. Cleaned up the oauth code. Force https.

Signed-off-by: Sam Pullara <spullara@yahoo.com>
---
 opensocial/opensocial.people.xml | 71 ++++++++++++--------------------
 1 file changed, 27 insertions(+), 44 deletions(-)

diff --git a/opensocial/opensocial.people.xml b/opensocial/opensocial.people.xml
index 691919b9..39729803 100644
--- a/opensocial/opensocial.people.xml
+++ b/opensocial/opensocial.people.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<table xmlns="http://query.yahooapis.com/v1/schema/table.xsd" https="false">
+<table xmlns="http://query.yahooapis.com/v1/schema/table.xsd" https="true">
   <meta>
+    <author>Chirag Shah</author>
+    <documentationURL>http://www.opensocial.org/Technical-Resources/opensocial-spec-v081/restful-protocol</documentationURL>
     <sampleQuery> select * from opensocial.auth</sampleQuery>
   </meta>
   <bindings>
@@ -15,59 +17,40 @@
         <key id='guid' type='xs:string' paramType='variable' required="true" />
         <key id='selector' type='xs:string' paramType='variable' required="true" />
         <key id='count' type='xs:string' paramType='variable' required="true" />
+        <key id='container' type='xs:string' paramType='variable' required="true" />
       </inputs>
       <execute><![CDATA[
         // Include the signing library
         y.include("http://oauth.googlecode.com/svn/code/javascript/oauth.js");
         y.include("http://oauth.googlecode.com/svn/code/javascript/sha1.js");
 
-        var encodedurl = 'http://sandbox.orkut.com/social/rest/people/' + guid + '/@' + selector;
-
-        // Slightly modified version of http://paul.donnelly.org/2008/10/31/2-legged-oauth-javascript-function-for-yql/
-        var accessor = { consumerSecret: cks, tokenSecret: ""};
-        var message = { action: encodedurl, method: "GET", parameters: [
-            ["oauth_version", "1.0"],
-            ["oauth_consumer_key", ck],
-            ["fields", "aboutMe"],
-            ["count", count],
-            ["xoauth_requestor_id", guid]
-        ]};
+        var base = '';
+        if(container == 'orkut') 
+            base = 'http://sandbox.orkut.com/social/rest/people/';
+        else if(container == 'friendconnect')
+            base = 'http://www.google.com/friendconnect/api/people/';
+        else
+            base =  '';
+
+        var requestUrl = base + guid + '/@' + selector + '/';
+        var accessor = {consumerSecret: cks};
+        var message = {
+            method: "GET",
+            action: requestUrl,
+            parameters: [
+                ['oauth_signature_method', 'HMAC-SHA1'],
+                ['oauth_consumer_key', ck],
+                ['oauth_version', '1.0'],
+                ['xoauth_requestor_id', guid]
+            ]
+        };
 
         OAuth.setTimestampAndNonce(message);
+        OAuth.setParameter(message, "oauth_timestamp", OAuth.timestamp());
         OAuth.SignatureMethod.sign(message, accessor);
 
-        var parameterMap = OAuth.getParameterMap(message);
-        var baseStr = OAuth.decodeForm(OAuth.SignatureMethod.getBaseString(message));           
-        var sig = "";
-
-        if (parameterMap.parameters) {
-            for (var item in parameterMap.parameters) {
-                for (var subitem in parameterMap.parameters[item]) {
-                    if (parameterMap.parameters[item][subitem] == "oauth_signature") {
-                        sig = parameterMap.parameters[item][1];                    
-                        break;                      
-                    }
-                }
-            }
-        }
-
-        var paramList = baseStr[2][0].split("&");
-        paramList.push("oauth_signature="+encodeURIComponent(sig));
-        paramList.sort(function(a,b) {
-        if (a[0] < b[0]) return -1;
-        if (a[0] > b[0]) return 1;
-        if (a[1] < b[1]) return  -1;
-        if (a[1] > b[1]) return 1;
-        return 0;
-        });
-
-        var locString = "";
-        for (var x in paramList) {
-            locString += paramList[x] + "&";                
-        }
-
-        var signedRequestUrl = baseStr[1][0] + "?" + locString.slice(0,locString.length - 1);
-        response.object = y.rest(signedRequestUrl).get().response();
+        var finalRequestUrl = OAuth.addToURL(message.action, message.parameters);
+        response.object = y.rest(finalRequestUrl).get().response();
       ]]></execute>
     </select>
   </bindings>