Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Airtable Node): Do not allow to use deprecated api keys in v1 #9171

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/nodes-base/credentials/AirtableApi.credentials.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export class AirtableApi implements ICredentialType {
properties: INodeProperties[] = [
{
displayName:
'API Keys will be deprecated by the end of January 2024, see <a href="https://support.airtable.com/docs/airtable-api-key-deprecation-notice" target="_blank">this article</a> for more details. We recommend to use Personal Access Token instead.',
"This type of connection (API Key) was deprecated and can't be used anymore. Please create a new credential of type 'Access Token' instead.",
name: 'deprecated',
type: 'notice',
default: '',
Expand Down
27 changes: 23 additions & 4 deletions packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@ const versionDescription: INodeTypeDescription = {
name: 'authentication',
type: 'options',
options: [
{
name: 'API Key',
value: 'airtableApi',
},
{
name: 'Access Token',
value: 'airtableTokenApi',
Expand All @@ -74,10 +70,26 @@ const versionDescription: INodeTypeDescription = {
name: 'OAuth2',
value: 'airtableOAuth2Api',
},
{
name: 'API Key (Deprecated)',
value: 'airtableApi',
},
],
default: 'airtableApi',
},
oldVersionNotice,
{
displayName:
"This type of connection (API Key) was deprecated and can't be used anymore. Please create a new credential of type 'Access Token' instead.",
name: 'deprecated',
type: 'notice',
default: '',
displayOptions: {
show: {
authentication: ['airtableApi'],
},
},
},
{
displayName: 'Operation',
name: 'operation',
Expand Down Expand Up @@ -552,6 +564,13 @@ export class AirtableV1 implements INodeType {
}

async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
const authentication = this.getNodeParameter('authentication', 0);
if (authentication === 'airtableApi') {
throw new NodeOperationError(
this.getNode(),
'The API Key connection was deprecated by Airtable, please use Access Token or OAuth2 instead.',
);
}
const items = this.getInputData();
const returnData: INodeExecutionData[] = [];
let responseData;
Expand Down
19 changes: 9 additions & 10 deletions packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,15 @@ describe('Execute Airtable Node', () => {

for (const testData of tests) {
test(testData.description, async () => {
// execute workflow
const { result } = await executeWorkflow(testData, nodeTypes);

// check if result node data matches expected test data
const resultNodeData = Helpers.getResultNodeData(result, testData);
resultNodeData.forEach(({ nodeName, resultData }) =>
expect(resultData).toEqual(testData.output.nodeData[nodeName]),
);

expect(result.finished).toEqual(true);
try {
// execute workflow
await executeWorkflow(testData, nodeTypes);
} catch (error) {
expect(error).toBeUndefined();
expect(error.message).toEqual(
'The API Key connection was deprecated by Airtable, please use Access Token or OAuth2 instead.',
);
}
});
}
});
2 changes: 1 addition & 1 deletion packages/workflow/src/Interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2127,7 +2127,7 @@ export interface WorkflowTestData {
[key: string]: any[][];
};
};
nock: {
nock?: {
baseUrl: string;
mocks: Array<{
method: string;
Expand Down
Loading