@@ -93,6 +93,8 @@ <p> <b>Request Token URL</b> <br /> OAuth Step 1.<br /> + oauth_callback (optional): <input id="oauth_callback" name="oauth_callback" size="32" /> + <br /> <a href="#" onclick="getRequestTok(); return false;">See URL</a><br /> <span id="texty"></span> @@ -119,6 +121,7 @@ somewhere. <br /> oauth_token: <input id="atoken" name="atoken" size="32" /> oauth_token_secret: <input id="astoken" name="astoken" size="32" /> + oauth_verifier: <input id="oauth_verifier" name="oauth_verifier" size="32" /> <br /> <a href="#" onclick="getAccess(); return false">See URL</a><br /> example/index.html @@ -31,7 +31,7 @@ function fillBlanks(div, url) { function getRequestTok() { init(); - var url = fe.getRequestTokenUrl(); + var url = fe.getRequestTokenUrl(document.getElementById('oauth_callback').value); fillBlanks('texty', url); return url; } @@ -48,7 +48,7 @@ function getAccess() { init(); fe.oauthToken = document.getElementById('atoken').value; fe.oauthTokenSecret = document.getElementById('astoken').value; - var url = fe.getAccessUrl(); + var url = fe.getAccessUrl(document.getElementById('oauth_verifier').value); fillBlanks('accessurl', url); return url; } example/init.js @@ -134,30 +134,52 @@ FireEagle.prototype.parseTokens = function parseTokens(tokenString, setValues) { /** * Return the fully constructed OAuth Request Token URL. * + * @param oauth_callback [OPTIONAL] String - Callback url to bind the + * request token to. This will be used when the authorization + * step has been completed. * @return String The Request Token URL. * @see http://fireeagle.yahoo.net/developer/documentation/usingoauth */ -FireEagle.prototype.getRequestTokenUrl = function() { +FireEagle.prototype.getRequestTokenUrl = function(oauth_callback) { + // default oauth_callback to 'oob' + if (oauth_callback === undefined || oauth_callback == "") { + oauth_callback = "oob"; + } + return OAuth.getUrl("GET", this.requestTokenURL, this.consumerKey, this.consumerSecret, - this.signatureMethod); + this.signatureMethod, + undefined, + undefined, + { "oauth_callback": oauth_callback } ); }; /** * Return the params for the OAuth Request Token URL. * + * @param oauth_callback [OPTIONAL] String - Callback url to bind the + * request token to. This will be used when the authorization + * step has been completed. * @return Object An associative object containing the params and * values for a Request Token URL. * @see http://fireeagle.yahoo.net/developer/documentation/usingoauth */ -FireEagle.prototype.getRequestTokenParams = function() { +FireEagle.prototype.getRequestTokenParams = function(oauth_callback) { + // default oauth_callback to 'oob' + if (oauth_callback === undefined || oauth_callback == "") { + oauth_callback = "oob"; + } + return OAuth.getParams("GET", this.requestTokenURL, this.consumerKey, this.consumerSecret, - this.signatureMethod); + this.signatureMethod, + undefined, + undefined, + { "oauth_callback": oauth_callback } ); }; /** @@ -186,23 +208,28 @@ FireEagle.prototype.getAuthorizeParams = function() { /** * Return an OAuth Access Token URL. * + * @param oauth_verifier String - oauth_verifier provided by Fire + * Eagle, either in the callback url or displayed to the user. * @return String The Access Token URL. Store the return values per * user for subsequent API calls. * @see http://fireeagle.yahoo.net/developer/documentation/usingoauth */ -FireEagle.prototype.getAccessUrl = function() { +FireEagle.prototype.getAccessUrl = function(oauth_verifier) { return OAuth.getUrl("GET", this.accessTokenURL, this.consumerKey, this.consumerSecret, this.signatureMethod, this.oauthToken, - this.oauthTokenSecret); + this.oauthTokenSecret, + { "oauth_verifier": oauth_verifier } ); }; /** * Return the params for an OAuth Access Token URL. * + * @param oauth_verifier String - oauth_verifier provided by Fire + * Eagle, either in the callback url or displayed to the user. * @return Object An associative object containing the param and * value for an Access Token URL. Store the return values per user * for subsequent API calls. @@ -215,7 +242,8 @@ FireEagle.prototype.getAccessParams = function() { this.consumerSecret, this.signatureMethod, this.oauthToken, - this.oauthTokenSecret); + this.oauthTokenSecret, + { "oauth_verifier": oauth_verifier } ); }; /** lib/fe.js 4f09c6fc58cec43a6ada847c1c948edb55470bea Seth Fitzsimmons seth@mojodna.net http://github.com/fireeagle/fireeagle-javascript-lib/commit/053c6c45b4f0fa23b078e6c305f6bc79d29f8b52 053c6c45b4f0fa23b078e6c305f6bc79d29f8b52 2009-05-28T16:35:52-07:00 2009-05-28T16:21:10-07:00 support for OAuth 1.0a b782f49bc707632fce02c213ed1ba5b20f3c4d58 Seth Fitzsimmons seth@mojodna.net