Merge pull request borismus#10 from neocotic/adapters

Bug fixes and API improvements (3 of 4)

README.md

@@ -39,6 +39,11 @@ Here's a table that will come in handy:
     <td>https://github.com/robots.txt</td>
     <td>https://github.com/login/oauth/access_token</td>
   </tr>
+  <tr>
+    <td>bitly</td>
+    <td>http://bitly.com/robots.txt</td>
+    <td>https://api-ssl.bitly.com/oauth/access_token</td>
+  </tr>
 </table>
 
 #### Step 1: Copy library

lib/adapters/bitly.js

@@ -0,0 +1,47 @@
+OAuth2.adapter('bitly', {
+
+  authorizationCodeURL: function(config) {
+    return ('https://bitly.com/oauth/authorize?' +
+      'client_id={{CLIENT_ID}}&' +
+      'redirect_uri={{REDIRECT_URI}}')
+        .replace('{{CLIENT_ID}}', config.clientId)
+        .replace('{{REDIRECT_URI}}', this.redirectURL(config));
+  },
+
+  redirectURL: function(config) {
+    return 'http://bitly.com/robots.txt';
+  },
+
+  parseAuthorizationCode: function(url) {
+    // TODO: Error handling (URL may have ?error=foo_bar&error_code=43 etc).
+    return url.match(/[&\?]code=([^&]+)/)[1];
+  },
+
+  accessTokenURL: function() {
+    return 'https://api-ssl.bitly.com/oauth/access_token';
+  },
+
+  accessTokenMethod: function() {
+    return 'POST';
+  },
+
+  accessTokenParams: function(authorizationCode, config) {
+    return {
+      code: authorizationCode,
+      client_id: config.clientId,
+      client_secret: config.clientSecret,
+      redirect_uri: this.redirectURL(config),
+      grant_type: 'authorization_code'
+    };
+  },
+
+  parseAccessToken: function(response) {
+    return {
+      accessToken: response.match(/access_token=([^&]*)/)[1],
+      apiKey: response.match(/apiKey=([^&]*)/)[1],
+      expiresIn: Number.MAX_VALUE,
+      login: response.match(/login=([^&]*)/)[1]
+    };
+  }
+
+});

lib/adapters/facebook.js

@@ -1,7 +1,9 @@
 OAuth2.adapter('facebook', {
   authorizationCodeURL: function(config) {
-    return 'https://www.facebook.com/dialog/oauth? \
-client_id={{CLIENT_ID}}&redirect_uri={{REDIRECT_URI}}&scope={{API_SCOPE}}'
+    return ('https://www.facebook.com/dialog/oauth?' +
+      'client_id={{CLIENT_ID}}&' +
+      'redirect_uri={{REDIRECT_URI}}&' +
+      'scope={{API_SCOPE}}')
         .replace('{{CLIENT_ID}}', config.clientId)
         .replace('{{REDIRECT_URI}}', this.redirectURL(config))
         .replace('{{API_SCOPE}}', config.apiScope);

lib/adapters/github.js

@@ -3,8 +3,9 @@ OAuth2.adapter('github', {
    * @return {URL} URL to the page that returns the authorization code
    */
   authorizationCodeURL: function(config) {
-    return 'https://github.com/login/oauth/authorize?\
-client_id={{CLIENT_ID}}&redirect_uri={{REDIRECT_URI}}'
+    return ('https://github.com/login/oauth/authorize?' +
+      'client_id={{CLIENT_ID}}&' +
+      'redirect_uri={{REDIRECT_URI}}')
         .replace('{{CLIENT_ID}}', config.clientId)
         .replace('{{REDIRECT_URI}}', this.redirectURL(config));
   },

lib/adapters/google.js

@@ -1,10 +1,11 @@
 OAuth2.adapter('google', {
   authorizationCodeURL: function(config) {
-    return 'https://accounts.google.com/o/oauth2/auth?\
-client_id={{CLIENT_ID}}&\
-redirect_uri={{REDIRECT_URI}}&\
-scope={{API_SCOPE}}&\
-response_type=code'
+    return ('https://accounts.google.com/o/oauth2/auth?' +
+      'client_id={{CLIENT_ID}}&' +
+      'redirect_uri={{REDIRECT_URI}}&' +
+      'scope={{API_SCOPE}}&' +
+      'access_type=offline&' +
+      'response_type=code')
         .replace('{{CLIENT_ID}}', config.clientId)
         .replace('{{REDIRECT_URI}}', this.redirectURL(config))
         .replace('{{API_SCOPE}}', config.apiScope);

lib/adapters/sample.js

@@ -50,7 +50,7 @@ OAuth2.adapter('sample', {
     return {
       accessToken: '',
       refreshToken: '',
-      expiresIn: 0
+      expiresIn: Number.MAX_VALUE
     };
   }
 });

lib/oauth2.js

@@ -365,8 +365,8 @@ OAuth2.loadAdapter = function(adapterName, callback) {
  * @throws {String} If the specified adapter is invalid
  */
 OAuth2.adapter = function(name, impl) {
-  var implementing = 'authorizationCodeURL redirectURL \
-    accessTokenURL accessTokenMethod accessTokenParams accessToken';
+  var implementing = 'authorizationCodeURL redirectURL accessTokenURL ' +
+    'accessTokenMethod accessTokenParams accessToken';
 
   // Check for missing methods
   implementing.split(' ').forEach(function(method, index) {