From b60c9be282c8ea603acb8e63da961c38e8bdb510 Mon Sep 17 00:00:00 2001
From: ricardo <ricardoespinoza105@gmail.com>
Date: Sun, 22 Mar 2020 13:03:56 -0400
Subject: [PATCH] :zap: added folder and changed name to credentials

---
 ...ls.ts => MicrosoftExcelOAuth2Api.credentials.ts} |   4 ++--
 .../nodes/Microsoft/{ => Excel}/GenericFunctions.ts |   2 +-
 .../Microsoft/{ => Excel}/MicrosoftExcel.node.ts    |   2 +-
 .../nodes/Microsoft/{ => Excel}/TableDescription.ts |   0
 .../Microsoft/{ => Excel}/WorkbookDescription.ts    |   0
 .../Microsoft/{ => Excel}/WorksheetDescription.ts   |   0
 .../nodes/Microsoft/{ => Excel}/excel.png           | Bin
 packages/nodes-base/package.json                    |   4 ++--
 8 files changed, 6 insertions(+), 6 deletions(-)
 rename packages/nodes-base/credentials/{MicrosoftOAuth2Api.credentials.ts => MicrosoftExcelOAuth2Api.credentials.ts} (91%)
 rename packages/nodes-base/nodes/Microsoft/{ => Excel}/GenericFunctions.ts (96%)
 rename packages/nodes-base/nodes/Microsoft/{ => Excel}/MicrosoftExcel.node.ts (99%)
 rename packages/nodes-base/nodes/Microsoft/{ => Excel}/TableDescription.ts (100%)
 rename packages/nodes-base/nodes/Microsoft/{ => Excel}/WorkbookDescription.ts (100%)
 rename packages/nodes-base/nodes/Microsoft/{ => Excel}/WorksheetDescription.ts (100%)
 rename packages/nodes-base/nodes/Microsoft/{ => Excel}/excel.png (100%)

diff --git a/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftExcelOAuth2Api.credentials.ts
similarity index 91%
rename from packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts
rename to packages/nodes-base/credentials/MicrosoftExcelOAuth2Api.credentials.ts
index 2519ba583..d6e8e0f45 100644
--- a/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/MicrosoftExcelOAuth2Api.credentials.ts
@@ -3,8 +3,8 @@ import {
 	NodePropertyTypes,
 } from 'n8n-workflow';
 
-export class MicrosoftOAuth2Api implements ICredentialType {
-	name = 'microsoftOAuth2Api';
+export class MicrosoftExcelOAuth2Api implements ICredentialType {
+	name = 'microsoftExcelOAuth2Api';
 	extends = [
 		'oAuth2Api',
 	];
diff --git a/packages/nodes-base/nodes/Microsoft/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts
similarity index 96%
rename from packages/nodes-base/nodes/Microsoft/GenericFunctions.ts
rename to packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts
index b4f68be34..33090090b 100644
--- a/packages/nodes-base/nodes/Microsoft/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts
@@ -24,7 +24,7 @@ export async function microsoftApiRequest(this: IExecuteFunctions | IExecuteSing
 			options.headers = Object.assign({}, options.headers, headers);
 		}
 		//@ts-ignore
-		return await this.helpers.requestOAuth.call(this, 'microsoftOAuth2Api', options);
+		return await this.helpers.requestOAuth.call(this, 'microsoftExcelOAuth2Api', options);
 	} catch (error) {
 		if (error.response && error.response.body && error.response.body.error && error.response.body.error.message) {
 			// Try to return the error prettier
diff --git a/packages/nodes-base/nodes/Microsoft/MicrosoftExcel.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
similarity index 99%
rename from packages/nodes-base/nodes/Microsoft/MicrosoftExcel.node.ts
rename to packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
index fd3de9065..d7c372c2d 100644
--- a/packages/nodes-base/nodes/Microsoft/MicrosoftExcel.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
@@ -49,7 +49,7 @@ export class MicrosoftExcel implements INodeType {
 		outputs: ['main'],
 		credentials: [
 			{
-				name: 'microsoftOAuth2Api',
+				name: 'microsoftExcelOAuth2Api',
 				required: true,
 			},
 		],
diff --git a/packages/nodes-base/nodes/Microsoft/TableDescription.ts b/packages/nodes-base/nodes/Microsoft/Excel/TableDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Microsoft/TableDescription.ts
rename to packages/nodes-base/nodes/Microsoft/Excel/TableDescription.ts
diff --git a/packages/nodes-base/nodes/Microsoft/WorkbookDescription.ts b/packages/nodes-base/nodes/Microsoft/Excel/WorkbookDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Microsoft/WorkbookDescription.ts
rename to packages/nodes-base/nodes/Microsoft/Excel/WorkbookDescription.ts
diff --git a/packages/nodes-base/nodes/Microsoft/WorksheetDescription.ts b/packages/nodes-base/nodes/Microsoft/Excel/WorksheetDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Microsoft/WorksheetDescription.ts
rename to packages/nodes-base/nodes/Microsoft/Excel/WorksheetDescription.ts
diff --git a/packages/nodes-base/nodes/Microsoft/excel.png b/packages/nodes-base/nodes/Microsoft/Excel/excel.png
similarity index 100%
rename from packages/nodes-base/nodes/Microsoft/excel.png
rename to packages/nodes-base/nodes/Microsoft/Excel/excel.png
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 3bd0b4a6f..b8ef81cde 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -55,7 +55,7 @@
             "dist/credentials/MailgunApi.credentials.js",
             "dist/credentials/MandrillApi.credentials.js",
 			"dist/credentials/MattermostApi.credentials.js",
-			"dist/credentials/MicrosoftOAuth2Api.credentials.js",
+			"dist/credentials/MicrosoftExcelOAuth2Api.credentials.js",
             "dist/credentials/MongoDb.credentials.js",
             "dist/credentials/MySql.credentials.js",
             "dist/credentials/NextCloudApi.credentials.js",
@@ -135,7 +135,7 @@
             "dist/nodes/Mandrill/Mandrill.node.js",
             "dist/nodes/Mattermost/Mattermost.node.js",
 			"dist/nodes/Merge.node.js",
-			"dist/nodes/Microsoft/MicrosoftExcel.node.js",
+			"dist/nodes/Microsoft/Excel/MicrosoftExcel.node.js",
             "dist/nodes/MoveBinaryData.node.js",
             "dist/nodes/MongoDb/MongoDb.node.js",
             "dist/nodes/MySql/MySql.node.js",