Worked on requests

packages/nodes-base/credentials/MicrosoftCosmosDbSharedKeyApi.credentials.ts

@@ -55,8 +55,7 @@ export class MicrosoftCosmosDbSharedKeyApi implements ICredentialType {
 		credentials: ICredentialDataDecryptedObject,
 		requestOptions: IHttpRequestOptions,
 	): Promise<IHttpRequestOptions> {
-		console.log('Authenticate invoked with requestOptions:', requestOptions);
+		// Remove undefined query parameters?
-
 		if (requestOptions.qs) {
 			for (const [key, value] of Object.entries(requestOptions.qs)) {
 				if (value === undefined) {
@@ -65,38 +64,54 @@ export class MicrosoftCosmosDbSharedKeyApi implements ICredentialType {
 			}
 		}
 
+		// Add headers for date and version
 		requestOptions.headers ??= {};
-		const date = new Date().toUTCString();
+		const date = new Date().toUTCString().toLowerCase();
 		requestOptions.headers = {
 			...requestOptions.headers,
 			'x-ms-date': date,
 			'x-ms-version': '2018-12-31',
+			'x-ms-partitionkey': '[]',
 		};
 
 		if (credentials.sessionToken) {
 			requestOptions.headers['x-ms-session-token'] = credentials.sessionToken;
 		}
 
-		let resourceType = '';
+		// This shouldn't be the full url
-		const resourceLink = '/dbs/first_database_1' + requestOptions.url;
+		// Refer to https://stackoverflow.com/questions/45645389/documentdb-rest-api-authorization-token-error
 
-		console.log('Link', resourceLink);
+		const url = new URL(requestOptions.baseURL + requestOptions.url);
-		if (resourceLink.includes('/colls')) {
+		const pathSegments = url.pathname.split('/').filter((segment) => segment);
-			resourceType = 'colls';
+		console.log('Filtered Path Segments:', pathSegments);
-		} else if (resourceLink.includes('/docs')) {
+
+		let resourceType = '';
+		let resourceId = '';
+
+		if (pathSegments.includes('docs')) {
+			const docsIndex = pathSegments.lastIndexOf('docs');
 			resourceType = 'docs';
-		} else if (resourceLink.includes('/dbs')) {
+			resourceId = pathSegments.slice(0, docsIndex).join('/');
+		} else if (pathSegments.includes('colls')) {
+			const collsIndex = pathSegments.lastIndexOf('colls');
+			resourceType = 'colls';
+			resourceId = pathSegments.slice(0, collsIndex).join('/');
+		} else if (pathSegments.includes('dbs')) {
+			const dbsIndex = pathSegments.lastIndexOf('dbs');
 			resourceType = 'dbs';
+			resourceId = pathSegments.slice(0, dbsIndex + 2).join('/');
 		} else {
-			throw new ApplicationError('Unable to determine resourceType');
+			throw new ApplicationError('Unable to determine resourceType and resourceId from the URL.');
 		}
-		console.log('Type', resourceType);
+
+		console.log('resourceId', resourceId);
+		console.log('resourceType', resourceType);
 
 		if (requestOptions.method) {
 			const authToken = getAuthorizationTokenUsingMasterKey(
 				requestOptions.method,
 				resourceType,
-				resourceLink,
+				resourceId,
 				date,
 				credentials.key as string,
 			);

packages/nodes-base/nodes/Microsoft/CosmosDB/CosmosDb.node.ts

@@ -3,9 +3,9 @@ import { NodeConnectionType } from 'n8n-workflow';
 
 import { containerFields, containerOperations } from './descriptions/ContainerDescription';
 import { itemFields, itemOperations } from './descriptions/ItemDescription';
-import { searchCollections } from './GenericFunctions';
+import { presendStringifyBody, searchCollections } from './GenericFunctions';
 
-export class AzureCosmosDb implements INodeType {
+export class CosmosDb implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Cosmos DB',
 		name: 'cosmosDb',
@@ -58,6 +58,11 @@ export class AzureCosmosDb implements INodeType {
 				name: 'resource',
 				type: 'options',
 				noDataExpression: true,
+				routing: {
+					send: {
+						preSend: [presendStringifyBody],
+					},
+				},
 				options: [
 					{
 						name: 'Container',

packages/nodes-base/nodes/Microsoft/CosmosDB/GenericFunctions.ts

@@ -3,6 +3,7 @@ import type {
 	DeclarativeRestApiSettings,
 	IDataObject,
 	IExecutePaginationFunctions,
+	IExecuteSingleFunctions,
 	IHttpRequestOptions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
@@ -43,7 +44,7 @@ export const HeaderConstants = {
 export function getAuthorizationTokenUsingMasterKey(
 	verb: string,
 	resourceType: string,
-	resourceLink: string,
+	resourceId: string,
 	date: string,
 	masterKey: string,
 ): string {
@@ -51,14 +52,24 @@ export function getAuthorizationTokenUsingMasterKey(
 	const payload =
 		`${verb.toLowerCase()}\n` +
 		`${resourceType.toLowerCase()}\n` +
-		`${resourceLink}\n` +
+		`${resourceId}\n` +
-		`${date}\n` +
+		`${date.toLowerCase()}\n` +
 		'\n';
 
 	const hmacSha256 = crypto.createHmac('sha256', key);
-	const hashPayload = hmacSha256.update(payload, 'utf8').digest('base64');
+	const signature = hmacSha256.update(payload, 'utf8').digest('base64');
 
-	return encodeURIComponent('type=master&ver=1.0&sig=' + hashPayload);
+	return `type=master&ver=1.0&sig=${signature}`;
+}
+
+export async function presendStringifyBody(
+	this: IExecuteSingleFunctions,
+	requestOptions: IHttpRequestOptions,
+): Promise<IHttpRequestOptions> {
+	if (requestOptions.body) {
+		requestOptions.body = JSON.stringify(requestOptions.body);
+	}
+	return requestOptions;
 }
 
 export async function handlePagination(
@@ -207,10 +218,12 @@ export async function searchCollections(
 	}
 
 	const results: INodeListSearchItems[] = collections
-		.map((collection) => ({
+		.map((collection) => {
-			name: String(collection.id),
+			return {
-			value: String(collection.id),
+				name: String(collection.id),
-		}))
+				value: String(collection.id),
+			};
+		})
 		.filter((collection) => !filter || collection.name.includes(filter))
 		.sort((a, b) => a.name.localeCompare(b.name));
 

packages/nodes-base/nodes/Microsoft/CosmosDB/descriptions/ContainerDescription.ts

@@ -21,6 +21,9 @@ export const containerOperations: INodeProperties[] = [
 						ignoreHttpStatusErrors: true,
 						method: 'POST',
 						url: '/colls',
+						headers: {
+							headers: {},
+						},
 					},
 				},
 				action: 'Create container',

packages/nodes-base/nodes/Microsoft/CosmosDB/descriptions/ItemDescription.ts

@@ -23,6 +23,9 @@ export const itemOperations: INodeProperties[] = [
 						ignoreHttpStatusErrors: true,
 						method: 'POST',
 						url: '=/colls/{{ $parameter["collId"] }}/docs',
+						headers: {
+							// 'x-ms-documentdb-partitionkey': '={{$parameter["partitionKey"]}}',
+						},
 					},
 				},
 				action: 'Create item',
@@ -108,6 +111,9 @@ export const itemOperations: INodeProperties[] = [
 						ignoreHttpStatusErrors: true,
 						method: 'PATCH',
 						url: '=/colls/{{ $parameter["collId"] }}/docs/{{ $parameter["id"] }}',
+						headers: {
+							'Content-Type': 'application/json-patch+json',
+						},
 					},
 				},
 				action: 'Update item',
@@ -198,10 +204,11 @@ export const createFields: INodeProperties[] = [
 				operation: ['create'],
 			},
 		},
+		//To-Do-add preSend function
 		routing: {
 			send: {
 				type: 'body',
-				value: '={{ $json["id"] ? Object.assign({ id: $json["id"] }, $value) : $value }}',
+				value: '={{$value}}',
 			},
 		},
 	},