mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-09-20 06:47:32 -07:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(Toggl Trigger Node): Update API version (#10207)

Browse source
This commit is contained in:
Jon 2024-08-21 10:43:48 +01:00 committed by GitHub
parent 09c3a8b367
commit 9bdb1d6dca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
packages/nodes-base/credentials/TogglApi.credentials.ts
View file

@ -1,4 +1,9 @@
import type { ICredentialType, INodeProperties } from 'n8n-workflow';
import type {
IAuthenticateGeneric,
ICredentialTestRequest,
ICredentialType,
INodeProperties,
} from 'n8n-workflow';
export class TogglApi implements ICredentialType {
name = 'togglApi';
@ -9,7 +14,7 @@ export class TogglApi implements ICredentialType {
properties: INodeProperties[] = [
{
displayName: 'Username',
displayName: 'Email Address',
name: 'username',
type: 'string',
default: '',
@ -22,4 +27,21 @@ export class TogglApi implements ICredentialType {
default: '',
},
];
authenticate: IAuthenticateGeneric = {
type: 'generic',
properties: {
auth: {
username: '={{$credentials.username}}',
password: '={{$credentials.password}}',
},
},
};
test: ICredentialTestRequest = {
request: {
baseURL: 'https://api.track.toggl.com/api/v9',
url: '/me',
},
};
}

15
packages/nodes-base/nodes/Toggl/GenericFunctions.ts
View file

@ -24,21 +24,10 @@ export async function togglApiRequest(
query?: IDataObject,
uri?: string,
) {
const credentials = await this.getCredentials('togglApi');
const headerWithAuthentication = Object.assign(
{},
{
Authorization: ` Basic ${Buffer.from(
`${credentials.username}:${credentials.password}`,
).toString('base64')}`,
},
);
const options: IRequestOptions = {
headers: headerWithAuthentication,
method,
qs: query,
uri: uri || `https://api.track.toggl.com/api/v8${resource}`,
uri: uri || `https://api.track.toggl.com/api/v9/me${resource}`,
body,
json: true,
};
@ -46,7 +35,7 @@ export async function togglApiRequest(
delete options.body;
}
try {
return await this.helpers.request(options);
return await this.helpers.requestWithAuthentication.call(this, 'togglApi', options);
} catch (error) {
throw new NodeApiError(this.getNode(), error as JsonObject);
}

3
packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
View file

@ -9,6 +9,7 @@ import type {
import { NodeApiError, NodeOperationError } from 'n8n-workflow';
import moment from 'moment-timezone';
import { DateTime } from 'luxon';
import { togglApiRequest } from './GenericFunctions';
export class TogglTrigger implements INodeType {
@ -62,7 +63,7 @@ export class TogglTrigger implements INodeType {
const qs: IDataObject = {};
let timeEntries = [];
qs.start_date = webhookData.lastTimeChecked;
qs.start_date = webhookData.lastTimeChecked ?? DateTime.now().toISODate();
qs.end_date = moment().format();
try {