Remove missing meta and $loki fields

RocketChat · Jul 6, 2018 · 6de47bc · 6de47bc
1 parent 544c5e5
commit 6de47bc
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 18 deletions.
diff --git a/packages/rocketchat-integrations/server/lib/triggerHandler.js b/packages/rocketchat-integrations/server/lib/triggerHandler.js
@@ -89,11 +89,11 @@ RocketChat.integrations.triggerHandler = new class RocketChatIntegrationHandler
 			history.data = { ...data };
 
 			if (data.user) {
-				history.data.user = _.omit(data.user, ['meta', 'services']);
+				history.data.user = _.omit(data.user, ['services']);
 			}
 
 			if (data.room) {
-				history.data.room = _.omit(data.room, ['meta']);
+				history.data.room = data.room;
 			}
 		}
 

diff --git a/packages/rocketchat-lib/client/lib/cachedCollection.js b/packages/rocketchat-lib/client/lib/cachedCollection.js
@@ -213,7 +213,6 @@ class CachedCollection {
 		Meteor.call(this.methodName, (error, data) => {
 			this.log(`${ data.length } records loaded from server`);
 			data.forEach((record) => {
-				delete record.$loki;
 				RocketChat.callbacks.run(`cachedCollection-loadFromServer-${ this.name }`, record, 'changed');
 				this.collection.upsert({ _id: record._id }, _.omit(record, '_id'));
 
@@ -276,7 +275,6 @@ class CachedCollection {
 			});
 
 			for (const record of changes) {
-				delete record.$loki;
 				RocketChat.callbacks.run(`cachedCollection-sync-${ this.name }`, record, record._deletedAt? 'removed' : 'changed');
 				if (record._deletedAt) {
 					this.collection.remove({ _id: record._id });
@@ -342,7 +340,6 @@ class CachedCollection {
 				this.collection.remove(record._id);
 				RoomManager.close(record.t+record.name);
 			} else {
-				delete record.$loki;
 				this.collection.upsert({ _id: record._id }, _.omit(record, '_id'));
 			}
 

diff --git a/packages/rocketchat-lib/client/lib/openRoom.js b/packages/rocketchat-lib/client/lib/openRoom.js
@@ -42,7 +42,6 @@ function openRoom(type, name) {
 							Session.set('roomNotFound', {type, name});
 							return BlazeLayout.render('main', {center: 'roomNotFound'});
 						} else {
-							delete record.$loki;
 							RocketChat.models.Rooms.upsert({ _id: record._id }, _.omit(record, '_id'));
 							RoomManager.close(type + name);
 							return openRoom(type, name);

diff --git a/packages/rocketchat-oauth2-server-config/oauth/server/oauth2-server.js b/packages/rocketchat-oauth2-server-config/oauth/server/oauth2-server.js
@@ -1,5 +1,4 @@
 /*global OAuth2Server */
-import _ from 'underscore';
 
 const oauth2server = new OAuth2Server({
 	accessTokensCollectionName: 'rocketchat_oauth_access_tokens',
@@ -80,5 +79,5 @@ RocketChat.API.v1.addAuthMethod(function() {
 	if (user == null) {
 		return;
 	}
-	return { user: _.omit(user, '$loki') };
+	return { user };
 });
diff --git a/tests/end-to-end/api/11-permissions.js b/tests/end-to-end/api/11-permissions.js
@@ -42,11 +42,6 @@ describe('[Permissions]', function() {
 					expect(firstElement).to.have.property('_id');
 					expect(firstElement).to.have.property('roles').and.to.be.a('array');
 					expect(firstElement).to.have.property('_updatedAt');
-					expect(firstElement).to.have.property('meta');
-					expect(firstElement.meta).to.have.property('revision');
-					expect(firstElement.meta).to.have.property('created');
-					expect(firstElement.meta).to.have.property('version');
-					expect(firstElement).to.have.property('$loki');
 				})
 				.end(done);
 		});
@@ -73,11 +68,6 @@ describe('[Permissions]', function() {
 					expect(firstElement).to.have.property('_id');
 					expect(firstElement).to.have.property('roles').and.to.be.a('array');
 					expect(firstElement).to.have.property('_updatedAt');
-					expect(firstElement).to.have.property('meta');
-					expect(firstElement.meta).to.have.property('revision');
-					expect(firstElement.meta).to.have.property('created');
-					expect(firstElement.meta).to.have.property('version');
-					expect(firstElement).to.have.property('$loki');
 				})
 				.end(done);
 		});