Merge branch 'develop'

Author: william26

bower.json

@@ -1,6 +1,6 @@
 {
     "name": "oauth-js",
-    "version": "0.2.0",
+    "version": "0.2.1",
     "main": "dist/oauth.min.js",
     "description": "OAuth that just works",
     "license": "apache2",

coffee/lib/oauth.coffee

@@ -114,7 +114,7 @@ module.exports = (window, document, jQuery, navigator) ->
 						oauthio.request.mkHttp provider, tokens, request, method
 
 					make_res_endpoint = (method, url) ->
-						oauthio.request.mkHttpEndpoint data.provider, tokens, request, method, url
+						oauthio.request.mkHttpEndpoint provider, tokens, request, method, url
 
 					res = {}
 					for i of tokens
@@ -124,9 +124,7 @@ module.exports = (window, document, jQuery, navigator) ->
 					res.put = make_res("PUT")
 					res.patch = make_res("PATCH")
 					res.del = make_res("DELETE")
-					res.me = (opts) ->
-						oauthio.request.mkHttpMe data.provider, tokens, request, "GET"
-						return
+					res.me = oauthio.request.mkHttpMe provider, tokens, request, "GET"
 
 					res
 
@@ -144,7 +142,10 @@ module.exports = (window, document, jQuery, navigator) ->
 					opts = opts or {}
 					unless config.key
 						defer?.reject new Error("OAuth object must be initialized")
-						return callback(new Error("OAuth object must be initialized"))
+						if not callback?
+							return
+						else
+							return callback(new Error("OAuth object must be initialized"))
 					if arguments.length is 2 and typeof opts == 'function'
 						callback = opts
 						opts = {}
@@ -155,7 +156,7 @@ module.exports = (window, document, jQuery, navigator) ->
 							if callback
 								return callback(null, res)
 							else
-								return
+								return defer.promise()
 					unless opts.state
 						opts.state = sha1.create_hash()
 						opts.state_type = "client"

coffee/lib/oauthio_requests.coffee

@@ -1,6 +1,6 @@
 Url = require('../tools/url')()
 
-module.exports = ($, config, client_states, cache) ->
+module.exports = ($, config, client_states, cache, providers_api) ->
 	http: (opts) ->
 		doRequest = ->
 			request = options.oauthio.request or {}

dist/oauth.js

@@ -2,7 +2,7 @@
 module.exports = {
   oauthd_url: "https://oauth.io",
   oauthd_api: "https://oauth.io/api",
-  version: "web-0.2.0",
+  version: "web-0.2.1",
   options: {}
 };
 
@@ -143,7 +143,7 @@ module.exports = function(window, document, jQuery, navigator) {
             return oauthio.request.mkHttp(provider, tokens, request, method);
           };
           make_res_endpoint = function(method, url) {
-            return oauthio.request.mkHttpEndpoint(data.provider, tokens, request, method, url);
+            return oauthio.request.mkHttpEndpoint(provider, tokens, request, method, url);
           };
           res = {};
           for (i in tokens) {
@@ -154,9 +154,7 @@ module.exports = function(window, document, jQuery, navigator) {
           res.put = make_res("PUT");
           res.patch = make_res("PATCH");
           res.del = make_res("DELETE");
-          res.me = function(opts) {
-            oauthio.request.mkHttpMe(data.provider, tokens, request, "GET");
-          };
+          res.me = oauthio.request.mkHttpMe(provider, tokens, request, "GET");
           return res;
         },
         popup: function(provider, opts, callback) {
@@ -180,7 +178,11 @@ module.exports = function(window, document, jQuery, navigator) {
             if (defer != null) {
               defer.reject(new Error("OAuth object must be initialized"));
             }
-            return callback(new Error("OAuth object must be initialized"));
+            if (callback == null) {
+              return;
+            } else {
+              return callback(new Error("OAuth object must be initialized"));
+            }
           }
           if (arguments.length === 2 && typeof opts === 'function') {
             callback = opts;
@@ -195,7 +197,7 @@ module.exports = function(window, document, jQuery, navigator) {
               if (callback) {
                 return callback(null, res);
               } else {
-                return;
+                return defer.promise();
               }
             }
           }
@@ -448,7 +450,7 @@ var Url,
 
 Url = require('../tools/url')();
 
-module.exports = function($, config, client_states, cache) {
+module.exports = function($, config, client_states, cache, providers_api) {
   return {
     http: function(opts) {
       var defer, desc_opts, doRequest, i, options;