From 68f9dd15609f07e91e18f71ef82f299356db5c4d Mon Sep 17 00:00:00 2001
From: Rupenieks <ru@myos,co>
Date: Wed, 10 Jun 2020 09:50:50 +0200
Subject: [PATCH] OAuth2 support

---
 .../TypeformOAuth2Api.credentials.ts          | 46 +++++++++++++++++++
 .../nodes/Typeform/GenericFunctions.ts        | 29 +++++++-----
 .../nodes/Typeform/TypeformTrigger.node.ts    | 37 ++++++++++++++-
 packages/nodes-base/package.json              |  1 +
 4 files changed, 101 insertions(+), 12 deletions(-)
 create mode 100644 packages/nodes-base/credentials/TypeformOAuth2Api.credentials.ts

diff --git a/packages/nodes-base/credentials/TypeformOAuth2Api.credentials.ts b/packages/nodes-base/credentials/TypeformOAuth2Api.credentials.ts
new file mode 100644
index 0000000000..5465eee72c
--- /dev/null
+++ b/packages/nodes-base/credentials/TypeformOAuth2Api.credentials.ts
@@ -0,0 +1,46 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+
+export class TypeformOAuth2Api implements ICredentialType {
+	name = 'typeformOAuth2Api';
+	extends = [
+		'oAuth2Api',
+	];
+	properties = [
+		{
+			displayName: 'Authorization URL',
+			name: 'authUrl',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'https://api.typeform.com/oauth/authorize',
+			required: true,
+		},
+		{
+			displayName: 'Access Token URL',
+			name: 'accessTokenUrl',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'https://api.typeform.com/oauth/token',
+			required: true,
+		},
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'string' as NodePropertyTypes,
+			default: 'webhooks:write,webhooks:read,forms:read,',
+		},
+		{
+			displayName: 'Auth URI Query Parameters',
+			name: 'authQueryParameters',
+			type: 'hidden' as NodePropertyTypes,
+			default: '',
+		},
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'header',
+		},
+	];
+}
diff --git a/packages/nodes-base/nodes/Typeform/GenericFunctions.ts b/packages/nodes-base/nodes/Typeform/GenericFunctions.ts
index c5e9242465..83ca713afe 100644
--- a/packages/nodes-base/nodes/Typeform/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Typeform/GenericFunctions.ts
@@ -45,18 +45,10 @@ export interface ITypeformAnswerField {
  * @returns {Promise<any>}
  */
 export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, endpoint: string, body: object, query?: IDataObject): Promise<any> { // tslint:disable-line:no-any
-	const credentials = this.getCredentials('typeformApi');
-
-	if (credentials === undefined) {
-		throw new Error('No credentials got returned!');
-	}
-
-	query = query || {};
+	const authenticationMethod = this.getNodeParameter('authentication', 0);
 
 	const options: OptionsWithUri = {
-		headers: {
-			'Authorization': `bearer ${credentials.accessToken}`,
-		},
+		headers: {},
 		method,
 		body,
 		qs: query,
@@ -64,8 +56,23 @@ export async function apiRequest(this: IHookFunctions | IExecuteFunctions | ILoa
 		json: true,
 	};
 
+	query = query || {};
+
 	try {
-		return await this.helpers.request!(options);
+		if (authenticationMethod === 'accessToken') {
+
+			const credentials = this.getCredentials('typeformApi');
+
+			if (credentials === undefined) {
+				throw new Error('No credentials got returned!');
+			}
+
+			options.headers!['Authorization'] = `bearer ${credentials.accessToken}`;
+
+			return await this.helpers.request!(options);
+		} else {
+			return await this.helpers.requestOAuth2!.call(this, 'typeformOAuth2Api', options);
+		}
 	} catch (error) {
 		if (error.statusCode === 401) {
 			// Return a clear error
diff --git a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
index b127a1f594..9c8f6e16ff 100644
--- a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
+++ b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
@@ -37,7 +37,25 @@ export class TypeformTrigger implements INodeType {
 			{
 				name: 'typeformApi',
 				required: true,
-			}
+				displayOptions: {
+					show: {
+						authentication: [
+							'accessToken',
+						],
+					},
+				},
+			},
+			{
+				name: 'typeformOAuth2Api',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: [
+							'oAuth2',
+						],
+					},
+				},
+			},
 		],
 		webhooks: [
 			{
@@ -48,6 +66,23 @@ export class TypeformTrigger implements INodeType {
 			},
 		],
 		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						name: 'Access Token',
+						value: 'accessToken',
+					},
+					{
+						name: 'OAuth2',
+						value: 'oAuth2',
+					},
+				],
+				default: 'accessToken',
+				description: 'The resource to operate on.',
+			},
 			{
 				displayName: 'Form',
 				name: 'formId',
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 3f28db9dec..13b3f0c128 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -119,6 +119,7 @@
             "dist/credentials/TwilioApi.credentials.js",
             "dist/credentials/TwitterOAuth1Api.credentials.js",
             "dist/credentials/TypeformApi.credentials.js",
+            "dist/credentials/TypeformOAuth2Api.credentials.js",
             "dist/credentials/TogglApi.credentials.js",
             "dist/credentials/UpleadApi.credentials.js",
             "dist/credentials/VeroApi.credentials.js",