		@@ -64,6 +64,8 @@ (function() {
		credentials = {
		id: infoResult.actor.actorId,
		id: infoResult.actor.actorId.toString(),
		_id: infoResult.actor.actorId.toString(),
		clientId: infoResult.clientId,
		isValid: !!infoResult.isValid,
		isClientValid: !!infoResult.isClientValid,
		isAnonymous: false,
		scopes: scopes,
		@@ -75,33 +77,24 @@ scope: scopes,
		};
		return internals.users().get(credentials.id, {}, function(err, user) {
		return internals.users().get(credentials.id, {}, function(err, userResult) {
		if (err) {
		return cb(err);
		}
		credentials.name = user.username;
		credentials.user = user;
		if (_.isArray(user.roles)) {
		credentials.roles = user.roles;

		/*
		If user is not found, we need to return an unauthorized error
		*/
		if (!userResult) {
		return cb(null, null);
		}
		if (_.isFunction(userResult.toObject)) {
		userResult = userResult.toObject();
		}
		userResult._id = userResult._id.toString();
		credentials.name = userResult.username;
		credentials.user = userResult;
		if (_.isArray(userResult.roles)) {
		credentials.roles = userResult.roles;
		}
		return cb(null, credentials);
		});

		/*
		if (!info) {
		return cb(null, null);
		}
		info.isValid = !!(info.actor && info.actor.actorId && info.expiresIn);
		if (info.isValid) {
		user = {
		isServerToken: false,
		isActsAsActorId: false,
		username: info.actor.actorId,
		userId: info.actor.actorId,
		scopes: []
		};
		_.extend(user, info);
		user.scopes.push('user');
		return cb(null, user);
		} else {
		return cb(null, null);
		*/
		});
		@@ -108,0 +101,0 @@ };

package.json

README.md

		@@ -8,2 +8,3 @@ [![Build Status](https://travis-ci.org/codedoctor/hapi-auth-bearer-mw.svg?branch=master)](https://travis-ci.org/codedoctor/hapi-auth-bearer-mw)
		[![HAPI 6.0](http://img.shields.io/badge/hapi-6.0-blue.svg)](http://hapijs.com)
		[![HAPI 7.0](http://img.shields.io/badge/hapi-7.0-blue.svg)](http://hapijs.com)
		[![API Documentation](http://img.shields.io/badge/API-Documentation-ff69b4.svg)](http://coffeedoc.info/github/codedoctor/hapi-auth-bearer-mw)
		@@ -22,2 +23,6 @@

		## Versions
		1.3.2
		Requires the use of hapi-user-store-multi-tenant v1.1.1 or up.

		## See also
		@@ -24,0 +29,0 @@

test/mocha.opts

doc/alphabetical_index.html