Updates getLoggedInUser to get user by token

packages/rocketchat-api/server/default/helpers/getLoggedInUser.js

 RocketChat.API.default.helperMethods.set('getLoggedInUser', function _getLoggedInUser() {
+	let token;
 	let user;
 
-	if (this.request.headers['x-user-id'] && this.request.headers['x-auth-token']) {
-		user = RocketChat.models.Users.findOneById(this.request.headers['x-user-id']);
+	if (this.request.headers['x-auth-token']) {
+		token = Accounts._hashLoginToken(this.request.headers['x-auth-token']);
+		user = RocketChat.models.Users.findOne({'services.resume.loginTokens.hashedToken': token});
 	}
 
 	return user;

packages/rocketchat-api/server/v1/helpers/getLoggedInUser.js

 RocketChat.API.v1.helperMethods.set('getLoggedInUser', function _getLoggedInUser() {
+	let token;
 	let user;
 
-	if (this.request.headers['x-user-id'] && this.request.headers['x-auth-token']) {
-		user = RocketChat.models.Users.findOneById(this.request.headers['x-user-id']);
+	if (this.request.headers['x-auth-token']) {
+		token = Accounts._hashLoginToken(this.request.headers['x-auth-token']);
+		user = RocketChat.models.Users.findOne({'services.resume.loginTokens.hashedToken': token});
 	}
 
 	return user;
 });
+
+// const auth = function _auth () {
+// 	const invalidResults = [undefined, null, false];
+// 	return {
+// 		token: 'services.resume.loginTokens.hashedToken',
+// 		user: function(headerId, headerToken) {
+
+
+// 			let token;
+// 			if (headerToken) {
+// 				token = Accounts._hashLoginToken(headerToken);
+// 			}
+
+// 			return {
+// 				userId: headerId,
+// 				token
+// 			};
+// 		}
+// 	};
+// }