Allow deleteByToken to pass through when there's no api secret in config.

Author: nitzanj

cloudinary-android/src/main/java/com/cloudinary/android/UploaderStrategy.java

@@ -25,9 +25,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
         }
         boolean returnError = ObjectUtils.asBoolean(options.get("return_error"), false);
 
-        if (Boolean.TRUE.equals(options.get("unsigned"))) {
-            // Nothing to do
-        } else {
+        if (requiresSigning(action, options)) {
             String apiKey = ObjectUtils.asString(options.get("api_key"), this.cloudinary().config.apiKey);
             if (apiKey == null)
                 throw new IllegalArgumentException("Must supply api_key");
@@ -43,6 +41,8 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
                 params.put("signature", this.cloudinary().apiSignRequest(params, apiSecret));
                 params.put("api_key", apiKey);
             }
+        } else {
+            // Nothing to do
         }
 
         String apiUrl = buildUploadUrl(action, options);

cloudinary-core/src/main/java/com/cloudinary/strategies/AbstractUploaderStrategy.java

@@ -42,4 +42,11 @@ protected String buildUploadUrl(String action, Map options) {
             return StringUtils.join(new String[]{cloudinary, "v1_1", cloud_name, resource_type, action}, "/");
         }
     }
+
+    protected boolean requiresSigning(String action, Map options) {
+        boolean unsigned = Boolean.TRUE.equals(options.get("unsigned"));
+        boolean deleteByToken = "delete_by_token".equals(action);
+
+        return !unsigned && !deleteByToken;
+    }
 }

cloudinary-http42/src/main/java/com/cloudinary/http42/UploaderStrategy.java

@@ -44,7 +44,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 
         boolean returnError = ObjectUtils.asBoolean(options.get("return_error"), false);
 
-        if (options.get("unsigned") == null || Boolean.FALSE.equals(options.get("unsigned"))) {
+        if (requiresSigning(action, options)) {
             uploader.signRequestParams(params, options);
         } else {
             Util.clearEmpty(params);

cloudinary-http43/src/main/java/com/cloudinary/http43/UploaderStrategy.java

@@ -67,7 +67,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 
         boolean returnError = ObjectUtils.asBoolean(options.get("return_error"), false);
 
-        if (options.get("unsigned") == null || Boolean.FALSE.equals(options.get("unsigned"))) {
+        if (requiresSigning(action, options)) {
             uploader.signRequestParams(params, options);
         } else {
             Util.clearEmpty(params);

cloudinary-http44/src/main/java/com/cloudinary/http44/UploaderStrategy.java

@@ -67,7 +67,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 
         boolean returnError = ObjectUtils.asBoolean(options.get("return_error"), false);
 
-        if (options.get("unsigned") == null || Boolean.FALSE.equals(options.get("unsigned"))) {
+        if (requiresSigning(action, options)) {
             uploader.signRequestParams(params, options);
         } else {
             Util.clearEmpty(params);

cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractUploaderTest.java

@@ -88,7 +88,7 @@ public void testDeleteByToken() throws Exception {
         Map options = ObjectUtils.asMap("return_delete_token", true, "tags", new String[]{SDK_TEST_TAG, UPLOADER_TAG});
         Map res = cloudinary.uploader().upload(SRC_TEST_IMAGE, options);
         String token = (String) res.get("delete_token");
-        res = cloudinary.uploader().deleteByToken(token);
+        res = new Cloudinary(ObjectUtils.asMap("cloud_name", cloudinary.config.cloudName)).uploader().deleteByToken(token);
         assertNotNull(res);
         assertEquals("ok", res.get("result"));
     }