Merge remote-tracking branch 'origin/master' into feature/delete-resources-by-asset-ids

Author: esguerrat

.github/workflows/ci.yml

@@ -0,0 +1,37 @@
+name: CI
+
+on:
+  push:
+    branches: ["**"]
+  pull_request:
+    branches: ["**"]
+
+jobs:
+  test:
+    name: Node ${{ matrix.node }} • tests
+    strategy:
+      fail-fast: false
+      matrix:
+        node: ["9", "10", "12", "14", "16", "18", "20", "22"]
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node }}
+
+      - name: Print Node & npm versions
+        run: |
+          node -v
+          npm -v
+
+      - name: Install dependencies
+        run: npm ci || npm i
+
+      - name: Run tests with timeout
+        timeout-minutes: 25
+        run: npm run test-with-temp-cloud

.gitignore

@@ -14,3 +14,4 @@ coverage
 tools/cloudinary_url.sh
 package-lock.json
 npm-debug.log
+.vscode/

.travis.yml

@@ -1,3 +1,29 @@
+2.7.0 / 2025-06-18
+==================
+
+* fix: prevent parameter injection via ampersand in parameter values (#709)
+
+2.6.1 / 2025-05-05
+==================
+
+
+
+2.6.1-rc.1 / 2025-05-05
+==================
+
+* fix: uploader interface
+
+2.6.0 / 2025-03-11
+==================
+
+  * chore: bumped jsdoc
+  * fix: defaults for related asset methods and proper content_type
+  * chore: Updated Sample Projects (#698)
+  * fix: metadata field datasource type (#693)
+  * feat: Add support for DELETE /resources/backup/:asset_id (#700)
+  * chore: dev dependencies cleanup
+  * chore: new node version support in CI
+
 2.5.1 / 2024-10-08
 ==================
 

CHANGELOG.md

@@ -74,7 +74,7 @@ cloudinary.v2.uploader.upload("/home/my_image.jpg", {upload_preset: "my_preset"}
 
 ## Contributions
 - Ensure tests run locally (add test command)
-- Open a PR and ensure Travis tests pass
+- Open a PR and ensure tests pass
 
 
 ## Get Help

README.md

@@ -184,6 +184,18 @@ exports.delete_all_resources = function delete_all_resources(callback, options =
   }), callback, options);
 };
 
+exports.delete_backed_up_assets = (assetId, versionIds, callback, options = {}) => {
+  const params = deleteBackupParams(versionIds);
+
+  return call_api('delete', ['resources', 'backup', assetId], params, callback, options);
+}
+
+const deleteBackupParams = (versionIds = []) => {
+  return {
+    "version_ids[]": Array.isArray(versionIds) ? versionIds : [versionIds]
+  };
+};
+
 const createRelationParams = (publicIds = []) => {
   return {
     assets_to_relate: Array.isArray(publicIds) ? publicIds : [publicIds]
@@ -198,21 +210,29 @@ const deleteRelationParams = (publicIds = []) => {
 
 exports.add_related_assets = (publicId, assetsToRelate, callback, options = {}) => {
   const params = createRelationParams(assetsToRelate);
-  return call_api('post', ['resources', 'related_assets', options.resource_type, options.type, publicId], params, callback, options);
+  const resourceType = options.resource_type || 'image';
+  const type = options.type || 'upload';
+  options.content_type = 'json';
+  return call_api('post', ['resources', 'related_assets', resourceType, type, publicId], params, callback, options);
 };
 
 exports.add_related_assets_by_asset_id = (assetId, assetsToRelate, callback, options = {}) => {
   const params = createRelationParams(assetsToRelate);
+  options.content_type = 'json';
   return call_api('post', ['resources', 'related_assets', assetId], params, callback, options);
 };
 
 exports.delete_related_assets = (publicId, assetsToUnrelate, callback, options = {}) => {
   const params = deleteRelationParams(assetsToUnrelate);
-  return call_api('delete', ['resources', 'related_assets', options.resource_type, options.type, publicId], params, callback, options);
+  const resourceType = options.resource_type || 'image';
+  const type = options.type || 'upload';
+  options.content_type = 'json';
+  return call_api('delete', ['resources', 'related_assets', resourceType, type, publicId], params, callback, options);
 };
 
 exports.delete_related_assets_by_asset_id = (assetId, assetsToUnrelate, callback, options = {}) => {
   const params = deleteRelationParams(assetsToUnrelate);
+  options.content_type = 'json';
   return call_api('delete', ['resources', 'related_assets', assetId], params, callback, options);
 };
 

lib/api.js

@@ -24,12 +24,7 @@ class PreloadedFile {
   }
 
   is_valid() {
-    let expected_signature;
-    expected_signature = utils.api_sign_request({
-      public_id: this.public_id,
-      version: this.version
-    }, config().api_secret);
-    return this.signature === expected_signature;
+    return utils.verify_api_response_signature(this.public_id, this.version, this.signature);
   }
 
   static split_format(identifier) {

lib/preloaded_file.js

@@ -26,7 +26,8 @@ function getSDKVersions(useSDKVersion = 'default', useNodeVersion = 'default') {
   const sdkSemver = useSDKVersion === 'default' ? readSdkSemver() : useSDKVersion;
 
   // allow to pass a custom techVersion (Node version)
-  const techVersion = useNodeVersion === 'default' ? process.versions.node : useNodeVersion;
+  const version = process.version.slice(1);
+  const techVersion = useNodeVersion === 'default' ? version : useNodeVersion;
 
   const product = 'A';