Skip to content

Commit

Permalink
chore: tidy up and add tests
Browse files Browse the repository at this point in the history
  • Loading branch information
pemrouz committed Jun 24, 2016
1 parent 26052ea commit 1b28b9b
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 30 deletions.
15 changes: 6 additions & 9 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ var _cookieParser = require('cookie-parser');

var _cookieParser2 = _interopRequireDefault(_cookieParser);

var _identity = require('utilise/identity');

var _identity2 = _interopRequireDefault(_identity);

var _client = require('utilise/client');

var _client2 = _interopRequireDefault(_client);
Expand All @@ -38,19 +34,20 @@ function sessions(ripple) {
var name = _ref.name;

log('creating');
if (!secret || !name) return _identity2.default;
if (!secret || !name) return ripple;
ripple.io.use(auth(secret, name));
return ripple;
}

var log = require('utilise/log')('[ri/sessions]');

function auth(secret, name) {
var log = require('utilise/log')('[ri/sessions]'),
auth = function auth(secret, name) {
return function (socket, next) {
var req = {};
(0, _key2.default)('headers.cookie', socket.request.headers.cookie)(req);
console.log("req", req);
(0, _cookieParser2.default)(secret)(req, null, _noop2.default);
console.log("req", req);
socket.sessionID = req.signedCookies[name] || req.cookies[name];
next();
};
}
};
22 changes: 9 additions & 13 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,20 @@
// -------------------------------------------
export default function sessions(ripple, { secret, name } = {}){
log('creating')
if (!secret || !name) return identity
if (!secret || !name) return ripple
ripple.io.use(auth(secret, name))
return ripple
}

import cookie from 'cookie-parser'
import identity from 'utilise/identity'
import client from 'utilise/client'
import noop from 'utilise/noop'
import key from 'utilise/key'
var log = require('utilise/log')('[ri/sessions]')

function auth(secret, name) {
return function(socket, next){
var req = {}
key('headers.cookie', socket.request.headers.cookie)(req)
cookie(secret)(req, null, noop)
socket.sessionID = req.signedCookies[name] || req.cookies[name]
next()
}
}
const log = require('utilise/log')('[ri/sessions]')
, auth = (secret, name) => (socket, next) => {
const req = {}
key('headers.cookie', socket.request.headers.cookie)(req)
cookie(secret)(req, null, noop)
socket.sessionID = req.signedCookies[name] || req.cookies[name]
next()
}
27 changes: 19 additions & 8 deletions test.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,24 @@
!(require('utilise/client')) && !function(){

var expect = require('chai').expect
var sessions = require('./').default
, expect = require('chai').expect

describe('Sessions', function(){

it('should populate sessionID', function(){

it('should skip if no cookie details provided', function(){
var ripple = {}
expect(ripple)
.to.be.eql(sessions(ripple))
.to.be.eql(sessions(ripple, {}))
.to.be.eql(sessions(ripple, { secret: 'secret' }))
.to.be.eql(sessions(ripple, { name: 'name' }))
})

})
it('should populate sessionID', function(){
var ripple = { io: { use: function(fn){ fn(socket, next) }}}
, next = function(){ nextCalled = true }
, socket = { request: { headers: { cookie: 'cookie' }}}
, nextCalled

}()
expect(sessions(ripple, { secret: 'secret', name: 'name' })).to.eql(ripple)
expect('sessionID' in socket).to.be.ok
expect(nextCalled).to.be.ok
})
})

0 comments on commit 1b28b9b

Please sign in to comment.