Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
d4f0c29
Update access-token.js
OwenBrotherwood Apr 29, 2015
a243f58
Merge pull request #1 from OwenBrotherwood/access-token
OwenBrotherwood Apr 29, 2015
07e4888
option noConcat for tokenIdForRequest
OwenBrotherwood Apr 29, 2015
1f5dee6
Merge pull request #2 from OwenBrotherwood/access-token
OwenBrotherwood Apr 29, 2015
2ff5133
remove tab
OwenBrotherwood Apr 30, 2015
1b05049
clean up due to test code style
OwenBrotherwood Apr 30, 2015
617a8b1
option.defaultAccessToken
OwenBrotherwood Apr 30, 2015
5dfd7c7
option.defaultTokenKeys sounds better
OwenBrotherwood Apr 30, 2015
4aac63f
createTestApp with defaultTokenKeys support
OwenBrotherwood Apr 30, 2015
20d14e9
pluralism
OwenBrotherwood Apr 30, 2015
903ca27
populate req.token with header using option.noDefaultKeys
OwenBrotherwood May 1, 2015
2032e8f
correct to defaultOptionKeys
OwenBrotherwood May 1, 2015
f630280
suk correct to defaultTokenKeys
OwenBrotherwood May 1, 2015
bdb3568
defaultTokenKeys: false and no def for auth is not working
OwenBrotherwood May 5, 2015
492b9f1
correct the inspect
OwenBrotherwood May 5, 2015
c20cefd
hmmm
OwenBrotherwood May 5, 2015
f69a2d4
make own test
OwenBrotherwood May 5, 2015
0e8e34c
fork now breaks away with test/app-access-token.js
OwenBrotherwood May 5, 2015
784db50
WIP
OwenBrotherwood May 5, 2015
a9d40e9
only a few things I do not understand
OwenBrotherwood May 5, 2015
35ed152
API/TEST:Middleware:loopback.token.defaultTokenKeys
OwenBrotherwood May 6, 2015
3f8060d
oops
OwenBrotherwood May 6, 2015
31badc3
npm test: 'only' fails on Multiple var declaration
OwenBrotherwood May 6, 2015
01b23cb
lint free but can only npm test on windows machine
OwenBrotherwood May 6, 2015
a8c2558
add DEMO test
OwenBrotherwood May 6, 2015
000e637
app order and wrong filename
OwenBrotherwood May 6, 2015
8abdb5e
test for searchDefaultTokenKeys=true
OwenBrotherwood May 6, 2015
eb44d77
use of functions in TEST and implement options = {}
OwenBrotherwood May 7, 2015
4326f15
sendRequest as a function
OwenBrotherwood May 7, 2015
2bef4d8
option !== false
OwenBrotherwood May 7, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions common/models/access-token.js
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,12 @@ module.exports = function(AccessToken) {
var length;
var id;

params = params.concat(['access_token']);
headers = headers.concat(['X-Access-Token', 'authorization']);
cookies = cookies.concat(['access_token', 'authorization']);
// https://github.com/strongloop/loopback/issues/1326
if (options.searchDefaultTokenKeys !== false) {
params = params.concat(['access_token']);
headers = headers.concat(['X-Access-Token', 'authorization']);
cookies = cookies.concat(['access_token', 'authorization']);
}

for (length = params.length; i < length; i++) {
var param = params[i];
Expand Down
104 changes: 104 additions & 0 deletions test/API-loopback-token-searchDefaultTokenKeys.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
'use strict';
var debug = require('debug')('AccessToken.test');
var inspect = require('util').inspect;
/*
* API:Middleware:loopback.token(options)
*/
var S = {
REQUIRE:{
FILE: {
TEST: {
LOOPBACK: {
TOKEN: './TEST-loopback-token-searchDefaultTokenKeys',
}
}
}
}
};
var api = {
loopback: {
token: {
optionsUndefined: require(S.REQUIRE.FILE.TEST.LOOPBACK.TOKEN).api.loopback.token.optionsUndefined,
options:{
searchDefaultTokenKeys: require(S.REQUIRE.FILE.TEST.LOOPBACK.TOKEN).api.loopback.token.options.searchDefaultTokenKeys
}
}
}
};

describe('API:Middleware:loopback.token(options)', function() {
describe('options = {}', function() {
var itTxt;
var expect = 200;
var header = 'authorization';
var testOptions = {
expect: expect,
header: header,
};
// describe('A normal use case, where a well-known header is used with no other options needed');
itTxt = 'Test header=' + header + ' and expect ' + expect;
it(itTxt, function(done) {
testOptions['done'] = done;
api.loopback.token.optionsUndefined(testOptions);
});
});
describe('options.searchDefaultTokenKeys: [true|false]', function() {
var itTxt;
var expect = 200;
var searchDefaultTokenKeys = false;
var header = 'authorization';
var testOptions = {
expect: expect,
header: header,
};
var headers = ['header'];
var tokenOptions = {
searchDefaultTokenKeys: searchDefaultTokenKeys,
headers: headers,
};

// describe('The normal use case for searchDefaultTokenKeys')
itTxt = 'Test header=' + header + ' searchDefaultTokenKeys=' + searchDefaultTokenKeys + ' and expect ' + expect;
it(itTxt, function(done) {
testOptions['done'] = done;
api.loopback.token.options.searchDefaultTokenKeys(testOptions, tokenOptions);
});

// describe('Specific enabelment of searchDefaultTokenKeys')
searchDefaultTokenKeys = true;
headers = [];
itTxt = 'Test header=' + header + ' searchDefaultTokenKeys=' + searchDefaultTokenKeys + ' and expect ' + expect;
it(itTxt, function(done) {
testOptions['done'] = done;
testOptions['headers'] = headers;
api.loopback.token.options.searchDefaultTokenKeys(testOptions, tokenOptions);
});

// describe('A test case for regression')
searchDefaultTokenKeys = undefined;
headers = [];
itTxt = 'Test header=' + header + ' searchDefaultTokenKeys=' + searchDefaultTokenKeys + ' and expect ' + expect;
it(itTxt, function(done) {
testOptions['searchDefaultTokenKeys'] = undefined; //FIXME: is this a good way
testOptions['headers'] = headers;
testOptions['done'] = done;
api.loopback.token.options.searchDefaultTokenKeys(testOptions, tokenOptions);
});

/*
FIXME: TEST appGet try/catch does not support this test
// describe('A non-normal use case to check that default token headers are not used')
searchDefaultTokenKeys = false; // any defaults ...
headers = []; // ... are not concated, and the empty array for token areas ...
expect = 401; // ... gives the expected result.
itTxt = 'Test header='+ header +' searchDefaultTokenKeys='+ searchDefaultTokenKeys +' no headers and expect '+ expect;
it(itTxt, function(done) {
testOptions['done'] = done;
testOptions['searchDefaultTokenKeys'] = searchDefaultTokenKeys;
testOptions['expect'] = expect;
testOptions['headers'] = headers;
api.loopback.token.searchDefaultTokenKeys(testOptions, tokenOptions);
});
*/
});
});
113 changes: 113 additions & 0 deletions test/TEST-loopback-token-searchDefaultTokenKeys.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
'use strict';

var debug = require('debug')('AccessToken.app');
var inspect = require('util').inspect;
/*
TEST:Middleware:loopback.token.searchDefaultTokenKeys
*/
module.exports = {
api : {
loopback: {
token: {
optionsUndefined: optionsUndefined,
options: {
searchDefaultTokenKeys: searchDefaultTokenKeys,
}
}
}
}
};

var loopback = require('../');
var tokenId; //FIXME: another way than this 'global'


function optionsUndefined(testOptions) {
debug('optionsUndefined testOptions:\n' + inspect(testOptions) + '\n');
var tokenOptions = {};
var app = createTokenStartApp(testOptions, tokenOptions);
}

function searchDefaultTokenKeys(testOptions, tokenOptions) {
debug('optionsUndefined searchDefaultTokenKeys:\n' + inspect(testOptions) + '\n');
var app = createTokenStartApp(testOptions, tokenOptions);
}

function sendRequest(app, testOptions) {
debug('sendRequest testOptions.tokenId:\n' + inspect(testOptions.tokenId) + '\n');
request(app)
.get(testOptions.get)
.set(testOptions.header, testOptions.tokenId)
.expect(testOptions.expect)
.end(testOptions.done);
}

function createTokenStartApp(testOptions, tokenOptions) {
var extend = require('util')._extend;
var Token = loopback.AccessToken.extend('MyToken');
var tokenDataSource = loopback.createDataSource({connector: loopback.Memory});
var tokenCreate = {userId: '123'};
var done = testOptions.done;
testOptions['get'] = '/';

Token.attachTo(tokenDataSource);
tokenOptions['model'] = Token;
tokenOptions['currentUserLiteral'] = 'me';

Token.create(tokenCreate, function(err, token) {
if (err) return done(err);
testOptions['tokenId'] = token.id;
var app = startApp(testOptions, tokenOptions);
sendRequest(app, testOptions);
});
}

function attachAndReturnModel() {
var ACL = loopback.ACL;
var acl = {
principalType: 'ROLE',
principalId: '$everyone',
accessType: ACL.ALL,
permission: ACL.DENY,
property: '*'
};
var modelOptions = {acls: [acl]};
var TestModel = loopback.PersistedModel.extend('test', {}, modelOptions);
TestModel.attachTo(loopback.memory());
return TestModel;
}

// FIXME: try/catch does not support searchDefaultTokenKeys = false and headers = []
function appGet(req, res) {
debug('appeget req:\n' + inspect(req) + '\n' );
debug('appeget res:\n' + inspect(res) + '\n' );
/*
debug('appGet req.headers:\n' + inspect(req.headers) + '\n');
debug('appGet req.accessToken:\n' + inspect(req.accessToken) + '\n');
debug('appGet tokenId:\n' + tokenId + '\n');
*/
var send = '200';
try {
assert(req.accessToken, 'req should have accessToken');
assert(req.accessToken.id === tokenId); //FIXME: another way than this 'global'
// FIXME: ok the req HAS accessToken.id but this is not a good test

} catch (error) {
debug('app.get error:\n' + error + '\n');
send = '401';
}
debug('app.get send:\n' + send + '\n');
res.send(send);
}

function startApp(testOptions, tokenOptions) {
var get = testOptions.get;
var app = loopback();
var TestModel = attachAndReturnModel();
app.model(TestModel);
app.use(loopback.token(tokenOptions)); // The subject of all this work
app.get(get, appGet);
app.use(loopback.rest());
app.enableAuth();
return app;
}