refactor to use basic-auth

lib/request.js

@@ -5,11 +5,12 @@
 
 var accepts = require('accepts');
 var typeis = require('type-is');
-var http = require('http')
-  , utils = require('./utils')
-  , fresh = require('fresh')
-  , parseRange = require('range-parser')
-  , parse = utils.parseUrl
+var basicAuth = require('basic-auth');
+var http = require('http');
+var fresh = require('fresh');
+var parseRange = require('range-parser');
+var utils = require('./utils');
+var parse = utils.parseUrl;
 
 /**
  * Request prototype.
@@ -318,20 +319,13 @@ req.__defineGetter__('ips', function(){
  */
 
 req.__defineGetter__('auth', function(){
-  // missing
-  var auth = this.get('Authorization');
-  if (!auth) return;
-
-  // malformed
-  var parts = auth.split(' ');
-  if ('basic' != parts[0].toLowerCase()) return;
-  if (!parts[1]) return;
-  auth = parts[1];
-
-  // credentials
-  auth = new Buffer(auth, 'base64').toString().match(/^([^:]*):(.*)$/);
-  if (!auth) return;
-  return { username: auth[1], password: auth[2] };
+  var auth = basicAuth(this);
+  if (auth) {
+    // aliases for backwards compatibilty
+    auth.username = auth.name;
+    auth.password = auth.pass;
+  }
+  return auth;
 });
 
 /**

package.json

@@ -22,6 +22,7 @@
     }
   ],
   "dependencies": {
+    "basic-auth": "0.0.1",
     "accepts": "1.0.0",
     "type-is": "1.0.0",
     "range-parser": "1.0.0",

test/req.auth.js

@@ -68,7 +68,10 @@ describe('req', function(){
         var app = express();
 
         app.get('/', function(req, res){
-          res.send(req.auth || 'none');
+          res.send({
+            username: req.auth.username,
+            password: req.auth.password,
+          });
         });
 
         request(app)
@@ -82,7 +85,10 @@ describe('req', function(){
       var app = express();
 
       app.get('/', function(req, res){
-        res.send(req.auth || 'none');
+        res.send({
+          username: req.auth.username,
+          password: req.auth.password,
+        });
       });
 
       request(app)