Skip to content

Commit

Permalink
🐛 Fixes issue #651 and #652 (#668)
Browse files Browse the repository at this point in the history
* 🐛 Fixes issue #651 and #652

* ⚡ Added description to username field
  • Loading branch information
RicardoE105 authored Jun 20, 2020
1 parent 3d45b67 commit 54a670c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 28 deletions.
3 changes: 0 additions & 3 deletions packages/nodes-base/credentials/SlackOAuth2Api.credentials.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,12 @@ import {
//https://api.slack.com/authentication/oauth-v2
const userScopes = [
'chat:write',
'conversations:history',
'conversations:read',
'files:read',
'files:write',
'stars:read',
'stars:write',
];


export class SlackOAuth2Api implements ICredentialType {
name = 'slackOAuth2Api';
extends = [
Expand Down
22 changes: 1 addition & 21 deletions packages/nodes-base/nodes/Slack/MessageDescription.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export const messageFields = [
],
},
},
description: 'Set the bot\'s user name.',
description: 'Set the bot\'s user name. This field will be ignored if you are using a user token.',
},
{
displayName: 'JSON parameters',
Expand Down Expand Up @@ -486,26 +486,6 @@ export const messageFields = [
},
description: `Timestamp of the message to be updated.`,
},
{
displayName: 'As User',
name: 'as_user',
type: 'boolean',
default: false,
displayOptions: {
show: {
authentication: [
'accessToken',
],
operation: [
'update'
],
resource: [
'message',
],
},
},
description: 'Pass true to update the message as the authed user. Bot users in this context are considered authed users.',
},
{
displayName: 'Update Fields',
name: 'updateFields',
Expand Down
8 changes: 4 additions & 4 deletions packages/nodes-base/nodes/Slack/Slack.node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,10 @@ export class Slack implements INodeType {
body.username = this.getNodeParameter('username', i) as string;
}

// ignore body.as_user as it's deprecated

delete body.as_user;

if (!jsonParameters) {
const attachments = this.getNodeParameter('attachments', i, []) as unknown as Attachment[];
const blocksUi = (this.getNodeParameter('blocksUi', i, []) as IDataObject).blocksValues as IDataObject[];
Expand Down Expand Up @@ -691,10 +695,6 @@ export class Slack implements INodeType {
ts,
};

if (authentication === 'accessToken') {
body.as_user = this.getNodeParameter('as_user', i) as boolean;
}

// The node does save the fields data differently than the API
// expects so fix the data befre we send the request
for (const attachment of attachments) {
Expand Down

0 comments on commit 54a670c

Please sign in to comment.