From 3f41b0f1664fe2927a1b12515064289629c397e1 Mon Sep 17 00:00:00 2001
From: Tanay Pant <tanaypant@protonmail.com>
Date: Wed, 4 Nov 2020 14:20:29 +0100
Subject: [PATCH] :bug: Bug Fixes

---
 .../nodes/Google/Books/GenericFunctions.ts    |  2 --
 .../nodes/Google/Books/GoogleBooks.node.ts    | 29 +++++++++++++++----
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts
index d357f307aa..6c57cd4f5f 100644
--- a/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts
@@ -46,11 +46,9 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 			const { access_token } = await getAccessToken.call(this, credentials as IDataObject);
 
 			options.headers!.Authorization = `Bearer ${access_token}`;
-			console.log(options);
 			//@ts-ignore
 			return await this.helpers.request(options);
 		} else {
-			console.log(this.getCredentials('googleBooksOAuth2Api'));
 			//@ts-ignore
 			return await this.helpers.requestOAuth2.call(this, 'googleBooksOAuth2Api', options);
 		}
diff --git a/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts b/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts
index eab2ad39e6..b9635512f5 100644
--- a/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts
+++ b/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts
@@ -279,6 +279,24 @@ export class GoogleBooks implements INodeType {
 					},
 				},
 			},
+			{
+				displayName: 'Bookshelf ID',
+				name: 'shelfId',
+				type: 'string',
+				description: 'ID of the bookshelf',
+				default: '',
+				required: true,
+				displayOptions: {
+					show: {
+						operation: [
+							'getAll',
+						],
+						resource: [
+							'bookshelfVolume',
+						],
+					},
+				},
+			},
 			{
 				displayName: 'Volume ID',
 				name: 'volumeId',
@@ -296,6 +314,7 @@ export class GoogleBooks implements INodeType {
 						],
 						resource: [
 							'bookshelfVolume',
+							'volume',
 						],
 					},
 				},
@@ -423,12 +442,12 @@ export class GoogleBooks implements INodeType {
 					const body: IDataObject = {
 						volumeId,
 					};
-					responseData = await googleApiRequest.call(this, 'POST', `mylibrary/bookshelves/${shelfId}/addVolume`, body);
+					responseData = await googleApiRequest.call(this, 'POST', `v1/mylibrary/bookshelves/${shelfId}/addVolume`, body);
 				}
 
 				if (operation === 'clear') {
 					const shelfId = this.getNodeParameter('shelfId', i) as string;
-					responseData = await googleApiRequest.call(this, 'POST', `mylibrary/bookshelves/${shelfId}/clearVolumes`);
+					responseData = await googleApiRequest.call(this, 'POST', `v1/mylibrary/bookshelves/${shelfId}/clearVolumes`);
 				}
 
 				 if (operation === 'getAll') {
@@ -459,16 +478,16 @@ export class GoogleBooks implements INodeType {
 						volumeId,
 						volumePosition,
 					};
-					responseData = await googleApiRequest.call(this, 'POST', `mylibrary/bookshelves/${shelfId}/moveVolume`, body);
+					responseData = await googleApiRequest.call(this, 'POST', `v1/mylibrary/bookshelves/${shelfId}/moveVolume`, body);
 				}
 
-				if (operation === 'move') {
+				if (operation === 'remove') {
 					const shelfId = this.getNodeParameter('shelfId', i) as string;
 					const volumeId = this.getNodeParameter('volumeId', i) as string;
 					const body: IDataObject = {
 						volumeId,
 					};
-					responseData = await googleApiRequest.call(this, 'POST', `mylibrary/bookshelves/${shelfId}/removeVolume`, body);
+					responseData = await googleApiRequest.call(this, 'POST', `v1/mylibrary/bookshelves/${shelfId}/removeVolume`, body);
 				}
 			}
 			if (Array.isArray(responseData)) {