Merge branch 'develop' into master

Author: spam-n-eggs

packages/nodes-base/credentials/SentryIoServerApi.credentials.ts

@@ -6,7 +6,9 @@ import {
 export class SentryIoServerApi implements ICredentialType {
 	name = 'sentryIoServerApi';
 	displayName = 'Sentry.io API';
+
 	documentationUrl = 'sentryIo';
+
 	properties = [
 		{
 			displayName: 'Token',

packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts

@@ -8,6 +8,8 @@ import {
 } from 'n8n-workflow';
 
 import { OptionsWithUri } from 'request';
+import {IProjectDto} from "../Clockify/ProjectInterfaces";
+import {clockifyApiRequest} from "../Clockify/GenericFunctions";
 
 export interface IProduct {
 	fields: {
@@ -186,4 +188,4 @@ export function activeCampaignDefaultGetAllProperties(resource: string, operatio
 			description: 'When set to true a simplify version of the response will be used else the raw data.',
 		},
 	];
-}
+}

packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts

@@ -15,7 +15,7 @@ import {
 } from './GenericFunctions';
 
 import { EntryTypeEnum } from './EntryTypeEnum';
-import { ICurrentUserDto } from './UserDtos';
+import { IUserDto } from './UserDtos';
 import { IWorkspaceDto } from './WorkpaceInterfaces';
 
 
@@ -93,7 +93,7 @@ export class ClockifyTrigger implements INodeType {
 
 		if (!webhookData.userId) {
 			// Cache the user-id that we do not have to request it every time
-			const userInfo: ICurrentUserDto = await clockifyApiRequest.call(this, 'GET', 'user');
+			const userInfo: IUserDto = await clockifyApiRequest.call(this, 'GET', 'user');
 			webhookData.userId = userInfo.id;
 		}
 
@@ -118,8 +118,7 @@ export class ClockifyTrigger implements INodeType {
 
 		if (Array.isArray(result) && result.length !== 0) {
 			result = [this.helpers.returnJsonArray(result)];
-			return result;
 		}
-		return null;
+		return result;
 	}
 }