Merge pull request #5668 from RocketChat/zapier-settings

Change Zapier oAuthApp settings to enable it and update the redirectUri

packages/rocketchat-api/server/api.js

@@ -75,6 +75,7 @@ class API extends Restivus {
 				//Add a try/catch for each much
 				const originalAction = endpoints[method].action;
 				endpoints[method].action = function() {
+					this.logger.debug(`${this.request.method.toUpperCase()}: ${this.request.url}`);
 					let result;
 					try {
 						result = originalAction.apply(this);
@@ -92,7 +93,6 @@ class API extends Restivus {
 
 				//Allow the endpoints to make usage of the logger which respects the user's settings
 				endpoints[method].logger = this.logger;
-				endpoints[method].method = method.toUpperCase();
 			});
 		}
 

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

@@ -3,7 +3,7 @@ RocketChat.API.v1.helperMethods.set('getUserFromParams', function _getUserFromPa
 	const doesntExist = { _doesntExist: true };
 	let user;
 
-	switch (this.method) {
+	switch (this.request.method) {
 		case 'POST':
 		case 'PUT':
 			if (this.bodyParams.userId && this.bodyParams.userId.trim()) {

packages/rocketchat-oauth2-server-config/oauth/server/default-services.coffee

@@ -2,10 +2,10 @@ if not RocketChat.models.OAuthApps.findOne('zapier')
 	RocketChat.models.OAuthApps.insert
 		_id: 'zapier'
 		name: 'Zapier'
-		active: false
+		active: true
 		clientId: 'zapier'
 		clientSecret: 'RTK6TlndaCIolhQhZ7_KHIGOKj41RnlaOq_o-7JKwLr'
-		redirectUri: 'https://zapier.com/dashboard/auth/oauth/return/AppIDAPI/'
+		redirectUri: 'https://zapier.com/dashboard/auth/oauth/return/App32270API/'
 		_createdAt: new Date
 		_createdBy:
 			_id: 'system'

server/startup/migrations/v081.js

+RocketChat.Migrations.add({
+	version: 81,
+	up: function() {
+		RocketChat.models.OAuthApps.update({ _id: 'zapier' }, {
+			$set: {
+				active: true,
+				redirectUri: 'https://zapier.com/dashboard/auth/oauth/return/App32270API/'
+			}
+		});
+	}
+});