Skip to content

Commit

Permalink
Merge pull request #103 from jaw187/master
Browse files Browse the repository at this point in the history 
move away from request.auth.session
  • Loading branch information
@jaw187
jaw187 committed Jan 5, 2016
2 parents 55e0430 + d233b2a commit 2ff6d43
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 35 deletions.
10 changes: 5 additions & 5 deletions README.md
View file
Expand Up @@ -43,16 +43,16 @@ takes the following required options:
(e.g. user account still exists). The function has the signature `function(request, session, callback)`
where:
- `request` - is the Hapi request object of the request which is being authenticated.
- `session` - is the session object set via `request.auth.session.set()`.
- `session` - is the session object set via `request.cookieAuth.set()`.
- `callback` - a callback function with the signature `function(err, isValid, credentials)`
where:
- `err` - an internal error.
- `isValid` - `true` if the content of the session is valid, otherwise `false`.
- `credentials` - a credentials object passed back to the application in
`request.auth.credentials`. If value is `null` or `undefined`, defaults to `session`. If
set, will override the current cookie as if `request.auth.session.set()` was called.
set, will override the current cookie as if `request.cookieAuth.set()` was called.

When the cookie scheme is enabled on a route, the `request.auth.session` objects is decorated with
When the cookie scheme is enabled on a route, the `request.cookieAuth` objects is decorated with
the following methods:
- `set(session)` - sets the current session. Must be called after a successful login to begin the
session. `session` must be a non-null object, which is set on successful subsequent
Expand Down Expand Up @@ -139,14 +139,14 @@ const login = function (request, reply) {
reply(err);
}

request.auth.session.set({ sid: sid });
request.cookieAuth.set({ sid: sid });
return reply.redirect('/');
});
};

const logout = function (request, reply) {

request.auth.session.clear();
request.cookieAuth.clear();
return reply.redirect('/');
};

Expand Down
4 changes: 2 additions & 2 deletions example/index.js
View file
Expand Up @@ -65,14 +65,14 @@ const login = function (request, reply) {
return reply(err);
}

request.auth.session.set({ sid: sid });
request.cookieAuth.set({ sid: sid });
return reply.redirect('/');
});
};

const logout = function (request, reply) {

request.auth.session.clear();
request.cookieAuth.clear();
return reply.redirect('/');
};

Expand Down
2 changes: 1 addition & 1 deletion lib/index.js
View file
Expand Up @@ -71,7 +71,7 @@ internals.implementation = function (server, options) {

server.ext('onPreAuth', (request, reply) => {

request.auth.session = {
request.cookieAuth = {
set: function (session, value) {

if (arguments.length > 1) {
Expand Down
54 changes: 27 additions & 27 deletions test/index.js
View file
Expand Up @@ -140,7 +140,7 @@ describe('scheme', () => {
auth: { mode: 'try' },
handler: function (request, reply) {

request.auth.session.set({ user: request.params.user });
request.cookieAuth.set({ user: request.params.user });
return reply(request.params.user);
}
}
Expand Down Expand Up @@ -224,7 +224,7 @@ describe('scheme', () => {
auth: { mode: 'try' },
handler: function (request, reply) {

request.auth.session.set({ user: request.params.user });
request.cookieAuth.set({ user: request.params.user });
return reply(request.params.user);
}
}
Expand Down Expand Up @@ -291,7 +291,7 @@ describe('scheme', () => {
auth: { mode: 'try' },
handler: function (request, reply) {

request.auth.session.set({ user: request.params.user });
request.cookieAuth.set({ user: request.params.user });
return reply(request.params.user);
}
}
Expand All @@ -300,7 +300,7 @@ describe('scheme', () => {
server.route({
method: 'GET', path: '/logout', handler: function (request, reply) {

request.auth.session.clear();
request.cookieAuth.clear();
return reply('logged-out');
}
});
Expand Down Expand Up @@ -355,7 +355,7 @@ describe('scheme', () => {
auth: { mode: 'try' },
handler: function (request, reply) {

request.auth.session.set({ user: request.params.user });
request.cookieAuth.set({ user: request.params.user });
return reply(request.params.user);
}
}
Expand Down Expand Up @@ -417,7 +417,7 @@ describe('scheme', () => {
auth: { mode: 'try' },
handler: function (request, reply) {

request.auth.session.set({ user: request.params.user });
request.cookieAuth.set({ user: request.params.user });
return reply(request.params.user);
}
}
Expand Down Expand Up @@ -472,7 +472,7 @@ describe('scheme', () => {
auth: { mode: 'try' },
handler: function (request, reply) {

request.auth.session.set({ user: request.params.user });
request.cookieAuth.set({ user: request.params.user });
return reply(request.params.user);
}
}
Expand Down Expand Up @@ -531,7 +531,7 @@ describe('scheme', () => {
auth: { mode: 'try' },
handler: function (request, reply) {

request.auth.session.set({ user: request.params.user });
request.cookieAuth.set({ user: request.params.user });
return reply(request.params.user);
}
}
Expand Down Expand Up @@ -592,7 +592,7 @@ describe('scheme', () => {
auth: { mode: 'try' },
handler: function (request, reply) {

request.auth.session.set({ user: request.params.user });
request.cookieAuth.set({ user: request.params.user });
return reply(request.params.user);
}
}
Expand Down Expand Up @@ -636,7 +636,7 @@ describe('scheme', () => {
auth: { mode: 'try' },
handler: function (request, reply) {

request.auth.session.set({ user: request.params.user });
request.cookieAuth.set({ user: request.params.user });
return reply(request.params.user);
}
}
Expand Down Expand Up @@ -696,7 +696,7 @@ describe('scheme', () => {
auth: { mode: 'try' },
handler: function (request, reply) {

request.auth.session.set({ user: request.params.user });
request.cookieAuth.set({ user: request.params.user });
return reply(request.params.user);
}
}
Expand Down Expand Up @@ -753,7 +753,7 @@ describe('scheme', () => {
auth: { mode: 'try' },
handler: function (request, reply) {

request.auth.session.set({ user: request.params.user });
request.cookieAuth.set({ user: request.params.user });
return reply(request.params.user);
}
}
Expand Down Expand Up @@ -817,7 +817,7 @@ describe('scheme', () => {
auth: { mode: 'try' },
handler: function (request, reply) {

request.auth.session.set({ user: request.params.user });
request.cookieAuth.set({ user: request.params.user });
return reply(request.params.user);
}
}
Expand Down Expand Up @@ -879,7 +879,7 @@ describe('scheme', () => {
handler: function (request, reply) {

try {
request.auth.session.set();
request.cookieAuth.set();
}
catch (error) {
return reply(error.message);
Expand Down Expand Up @@ -919,7 +919,7 @@ describe('scheme', () => {
auth: { mode: 'try' },
handler: function (request, reply) {

request.auth.session.set({ user: request.params.user });
request.cookieAuth.set({ user: request.params.user });
return reply(request.params.user);
}
}
Expand All @@ -928,7 +928,7 @@ describe('scheme', () => {
server.route({
method: 'GET', path: '/setKey', handler: function (request, reply) {

request.auth.session.set('key', 'value');
request.cookieAuth.set('key', 'value');
done();
}
});
Expand Down Expand Up @@ -974,7 +974,7 @@ describe('scheme', () => {
handler: function (request, reply) {

try {
request.auth.session.set('key', 'value');
request.cookieAuth.set('key', 'value');
}
catch (error) {
return reply(error.message);
Expand Down Expand Up @@ -1015,7 +1015,7 @@ describe('scheme', () => {
handler: function (request, reply) {

try {
request.auth.session.set({}, 'value');
request.cookieAuth.set({}, 'value');
}
catch (error) {
return reply(error.message);
Expand Down Expand Up @@ -1056,7 +1056,7 @@ describe('scheme', () => {
handler: function (request, reply) {

try {
request.auth.session.set(null, 'value');
request.cookieAuth.set(null, 'value');
}
catch (error) {
return reply(error.message);
Expand Down Expand Up @@ -1099,7 +1099,7 @@ describe('scheme', () => {
auth: { mode: 'try' },
handler: function (request, reply) {

request.auth.session.set({ user: request.params.user });
request.cookieAuth.set({ user: request.params.user });
return reply(request.params.user);
}
}
Expand All @@ -1108,7 +1108,7 @@ describe('scheme', () => {
server.route({
method: 'GET', path: '/clearKey', handler: function (request, reply) {

request.auth.session.clear('key');
request.cookieAuth.clear('key');
done();
}
});
Expand Down Expand Up @@ -1154,7 +1154,7 @@ describe('scheme', () => {
handler: function (request, reply) {

try {
request.auth.session.clear('key');
request.cookieAuth.clear('key');
}
catch (error) {
return reply(error.message);
Expand Down Expand Up @@ -1195,7 +1195,7 @@ describe('scheme', () => {
handler: function (request, reply) {

try {
request.auth.session.clear({});
request.cookieAuth.clear({});
}
catch (error) {
return reply(error.message);
Expand Down Expand Up @@ -1236,7 +1236,7 @@ describe('scheme', () => {
handler: function (request, reply) {

try {
request.auth.session.clear(null);
request.cookieAuth.clear(null);
}
catch (error) {
return reply(error.message);
Expand Down Expand Up @@ -1279,8 +1279,8 @@ describe('scheme', () => {
auth: { mode: 'try' },
handler: function (request, reply) {

request.auth.session.set({ user: request.params.user });
request.auth.session.ttl(60 * 1000);
request.cookieAuth.set({ user: request.params.user });
request.cookieAuth.ttl(60 * 1000);
return reply(request.params.user);
}
}
Expand All @@ -1289,7 +1289,7 @@ describe('scheme', () => {
server.route({
method: 'GET', path: '/ttl', handler: function (request, reply) {

request.auth.session.set('key', 'value');
request.cookieAuth.set('key', 'value');
done();
}
});
Expand Down

0 comments on commit 2ff6d43

Please sign in to comment.