For #3651, adjustments based on requested changes

packages/rocketchat-api/package.js

@@ -20,7 +20,12 @@ Package.onUse(function(api) {
 	api.addFiles('server/v1/helpers/getPaginationItems.js', 'server');
 	api.addFiles('server/v1/helpers/getUserFromParams.js', 'server');
 	api.addFiles('server/v1/helpers/parseJsonQuery.js', 'server');
+	api.addFiles('server/v1/helpers/getLoggedInUser.js', 'server');
 
+	//Register default helpers
+	api.addFiles('server/default/helpers/getLoggedInUser.js', 'server');
+
+	//Add default routes
 	api.addFiles('server/default/info.js', 'server');
 	api.addFiles('server/default/metrics.js', 'server');
 

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

@@ -0,0 +1,9 @@
+RocketChat.API.default.helperMethods.set('getLoggedInUser', function _getLoggedInUser() {
+	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']);
+	}
+
+	return user;
+});

packages/rocketchat-api/server/default/info.js

@@ -1,7 +1,11 @@
 RocketChat.API.default.addRoute('info', { authRequired: false }, {
 	get: function() {
-		if (this.request.headers['x-user-id'] != null && RocketChat.authz.hasRole(this.request.headers['x-user-id'], 'admin')) {
-			return RocketChat.Info;
+		let user = this.getLoggedInUser();
+
+		if (user && RocketChat.authz.hasRole(user._id, 'admin')) {
+			return {
+				info: RocketChat.Info
+			};
 		}
 
 		return RocketChat.API.v1.success({

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

@@ -0,0 +1,9 @@
+RocketChat.API.v1.helperMethods.set('getLoggedInUser', function _getLoggedInUser() {
+	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']);
+	}
+
+	return user;
+});

packages/rocketchat-api/server/v1/misc.js

@@ -1,6 +1,8 @@
 RocketChat.API.v1.addRoute('info', { authRequired: false }, {
 	get: function() {
-		if (this.request.headers['x-user-id'] != null && RocketChat.authz.hasRole(this.request.headers['x-user-id'], 'admin')) {
+		let user = this.getLoggedInUser();
+
+		if (user && RocketChat.authz.hasRole(user._id, 'admin')) {
 			return {
 				info: RocketChat.Info
 			};