Add flickr login and douban (Oauth 2.0) login

README.md

@@ -2453,6 +2453,67 @@ everyauth.dailycred
   .redirectPath('/');
 ```
 
+### Flickr OAuth (1.0)
+
+You will first need to [request an API key](http://www.flickr.com/services/apps/create/apply) to get the consumer key and secret.
+
+```javascript
+var everyauth = require('everyauth')
+  , connect = require('connect');
+
+everyauth
+  .flickr
+  .consumerKey('YOUR CONSUMER KEY HERE')
+  .consumerSecret('YOUR CONSUMER SECRET HERE')
+  .findOrCreateUser( function (sess, accessToken, accessSecret, user) {
+    // find or create user logic goes here
+  })
+  .redirectPath('/');
+
+var routes = function (app) {
+  // Define your routes here
+};
+
+connect(
+    connect.bodyParser()
+  , connect.cookieParser()
+  , connect.session({secret: 'whodunnit'})
+  , everyauth.middleware()
+  , connect.router(routes);
+).listen(3000);
+```
+
+### Douban OAuth (2.0)
+
+You will first need to Take a look at [douban's developer wiki](http://developers.douban.com/wiki) to apply a AppKey and AppSecret.
+
+```javascript
+var everyauth = require('everyauth')
+  , connect = require('connect');
+
+everyauth
+  .douban
+  .appId('YOUR API Key')
+  .appSecret('YOUR API Secret')
+  .findOrCreateUser( function (sess, accessToken, accessSecret, user) {
+    // find or create user logic goes here
+  })
+  .scope('email')                        // Defaults to douban_basic_common
+  .redirectPath('/');
+
+var routes = function (app) {
+  // Define your routes here
+};
+
+connect(
+    connect.bodyParser()
+  , connect.cookieParser()
+  , connect.session({secret: 'whodunnit'})
+  , everyauth.middleware()
+  , connect.router(routes);
+).listen(3000);
+```
+
 ## Configuring a Module
 
 everyauth was built with powerful configuration needs in mind.

lib/modules/douban.js

@@ -0,0 +1,60 @@
+var oauthModule = require('./oauth2')
+  , request = require('request');
+
+module.exports =
+oauthModule.submodule('douban')
+  .configurable({
+      scope: 'specify types of access: (no scope), douban_basic_common, shuo_basic_r, shuo_basic_w..'
+  })
+  .apiHost('https://api.douban.com/')
+
+  .oauthHost('https://www.douban.com')
+  .authPath('/service/auth2/auth')
+  .accessTokenPath('/service/auth2/token')
+
+  .authQueryParam('response_type', 'code')
+  .authQueryParam('scope', function () {
+    return this._scope && this.scope();
+  })
+
+  .accessTokenParam('grant_type', 'authorization_code')
+  .postAccessTokenParamsVia('data')
+
+  .entryPath('/auth/douban')
+  .callbackPath('/auth/douban/callback')
+
+  .fetchOAuthUser( function (accessToken) {
+    var p = this.Promise();
+    request.get({
+        url: this.apiHost() + '/v2/user/~me'
+      , headers: {
+            Authorization: 'Bearer ' + accessToken
+        }
+    }, function (err, res, data) {
+      if (err) return p.fail(err);
+      var oauthUser = JSON.parse(data);
+      p.fulfill(oauthUser);
+    });
+    return p;
+  })
+
+  .moduleErrback( function (err, seqValues) {
+    if (err instanceof Error) {
+      var next = seqValues.next;
+      return next(err);
+    } else if (err.extra) {
+      var ghResponse = err.extra.res
+        , serverResponse = seqValues.res;
+      serverResponse.writeHead(
+          ghResponse.statusCode
+        , ghResponse.headers);
+      serverResponse.end(err.extra.data);
+    } else if (err.statusCode) {
+      var serverResponse = seqValues.res;
+      serverResponse.writeHead(err.statusCode);
+      serverResponse.end(err.data);
+    } else {
+      console.error(err);
+      throw new Error('Unsupported error type');
+    }
+  });

lib/modules/flickr.js

@@ -0,0 +1,22 @@
+var oauthModule = require('./oauth');
+
+module.exports =
+oauthModule.submodule('flickr')
+  .apiHost('http://api.flickr.com/services/rest')
+  .oauthHost('http://www.flickr.com/services/oauth')
+  .entryPath('/auth/flickr')
+
+  .requestTokenPath('/request_token')
+  .accessTokenPath('/access_token')
+  .authorizePath('/authorize')
+
+  .callbackPath('/auth/flickr/callback')
+  .fetchOAuthUser( function (accessToken, accessTokenSecret, params) {
+    var p = this.Promise();
+    this.oauth.get(this.apiHost() + '?nojsoncallback=1&format=json&method=flickr.test.login', accessToken, accessTokenSecret, function (err, data) {
+      if (err) { return p.fail(err); }
+      var oauthUser = JSON.parse(data);
+      p.fulfill(oauthUser);
+    });
+    return p;
+  });

lib/modules/oauth2.js

@@ -197,7 +197,11 @@ everyModule.submodule('oauth2')
       } else if (resType.substring(0, 16) === 'application/json') {
         data = JSON.parse(body);
       } else {
-        throw new Error('Unsupported content-type ' + resType);
+        try {
+          data = JSON.parse(body);
+        } catch (e) {
+          throw new Error('Unsupported content-type ' + resType);
+        }
       }
       var aToken = data.access_token;
       delete data.access_token;

lib/modules/taobao.js

@@ -0,0 +1,54 @@
+var oauthModule = require('./oauth2')
+  , request = require('request');
+
+module.exports =
+oauthModule.submodule('taobao')
+  .configurable({
+      scope: 'specify types of access: item,, promotion, usergrade'
+  })
+  .apiHost('https://open.taobao.com/')
+
+  .oauthHost('https://oauth.taobao.com')
+  .authPath('/authorize')
+  .accessTokenPath('/token')
+
+  .authQueryParam('response_type', 'code')
+  .authQueryParam('scope', function () {
+    return this._scope && this.scope();
+  })
+
+  .accessTokenParam('grant_type', 'authorization_code')
+  .postAccessTokenParamsVia('data')
+
+  .entryPath('/auth/taobao')
+  .callbackPath('/auth/tb/callback')
+
+  .fetchOAuthUser(function(accessToken, accessExtra, params) {
+    var extra = accessExtra.extra
+    return {
+        id: extra.taobao_user_id
+      , token: accessToken
+      , extra: extra
+    }
+  })
+
+  .moduleErrback(function(err, seqValues) {
+    if (err instanceof Error) {
+      var next = seqValues.next;
+      return next(err);
+    } else if (err.extra) {
+      var ghResponse = err.extra.res
+        , serverResponse = seqValues.res;
+      serverResponse.writeHead(
+          ghResponse.statusCode
+        , ghResponse.headers);
+      serverResponse.end(err.extra.data);
+    } else if (err.statusCode) {
+      var serverResponse = seqValues.res;
+      serverResponse.writeHead(err.statusCode);
+      serverResponse.end(err.data);
+    } else {
+      console.error(err);
+      throw new Error('Unsupported error type');
+    }
+  });