Merge pull request #61 from imagekit-developer/dev

Dev

Author: imagekitio

README.md

@@ -261,7 +261,7 @@ The SDK provides a simple interface using the `.upload()` method to upload files
 
 The `upload()` method requires mandatory `file` and the `fileName` parameter. In addition, it accepts all the parameters supported by the [ImageKit Upload API](https://docs.imagekit.io/api-reference/upload-file-api/client-side-file-upload).
 
-Also, make sure that you have specified `authenticationEndpoint` during SDK initialization. The SDK makes an HTTP GET request to this endpoint and expects a JSON response with three fields, i.e. `signature`, `token`, and `expire`.  
+Also, ensure that you have specified `authenticationEndpoint` during SDK initialization. The SDK makes an HTTP GET request to this endpoint and expects a JSON response with three fields, i.e. `signature`, `token`, and `expire`. In addition, the SDK adds a query parameter `t` with a random value to ensure that the request URL is unique and the response is not cached in [Safari iOS](https://github.com/imagekit-developer/imagekit-javascript/issues/59). Your backend can ignore this query parameter.
 
 [Learn how to implement authenticationEndpoint](https://docs.imagekit.io/api-reference/upload-file-api/client-side-file-upload#how-to-implement-authenticationendpoint-endpoint) on your server.
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "imagekit-javascript",
-    "version": "1.5.1",
+    "version": "1.5.2",
     "description": "Javascript SDK for using ImageKit.io in the browser",
     "main": "dist/imagekit.cjs.js",
     "module": "dist/imagekit.esm.js",

src/utils/request.ts

@@ -65,7 +65,9 @@ export const generateSignatureToken = (
     return new Promise((resolve, reject) => {
         var xhr = new XMLHttpRequest();
         xhr.timeout = 60000;
-        xhr.open('GET', authenticationEndpoint);
+        var urlObj = new URL(authenticationEndpoint);
+        urlObj.searchParams.set("t", Math.random().toString());
+        xhr.open('GET', urlObj.toString());
         xhr.ontimeout = function (e) {
             return reject(errorMessages.AUTH_ENDPOINT_TIMEOUT);
         };

test/upload.js

@@ -27,7 +27,7 @@ const uploadSuccessResponseObj = {
 };
 
 function successSignature() {
-    server.respondWith("GET", initializationParams.authenticationEndpoint,
+    server.respondWith("GET", new RegExp(initializationParams.authenticationEndpoint + ".*"),
         [
             200,
             { "Content-Type": "application/json" },
@@ -41,7 +41,7 @@ function successSignature() {
 }
 
 function nonSuccessErrorSignature() {
-    server.respondWith("GET", initializationParams.authenticationEndpoint,
+    server.respondWith("GET", new RegExp(initializationParams.authenticationEndpoint + ".*"),
         [
             403,
             { "Content-Type": "application/json" },
@@ -221,7 +221,7 @@ describe("File upload", function () {
         expect(server.requests.length).to.be.equal(2);
 
         // Simulate non 200 response on authentication endpoint
-        server.respondWith("GET", initializationParams.authenticationEndpoint,
+        server.respondWith("GET", new RegExp(initializationParams.authenticationEndpoint + ".*"),
             [
                 200,
                 { "Content-Type": "application/json" },
@@ -245,7 +245,7 @@ describe("File upload", function () {
         expect(server.requests.length).to.be.equal(2);
 
         // Simulate non 200 response on authentication endpoint
-        server.respondWith("GET", initializationParams.authenticationEndpoint,
+        server.respondWith("GET", new RegExp(initializationParams.authenticationEndpoint + ".*"),
             [
                 200,
                 { "Content-Type": "application/json" },
@@ -664,7 +664,7 @@ describe("File upload", function () {
         });
 
         expect(server.requests.length).to.be.equal(2);
-        server.respondWith("GET", newAuthEndpoint,
+        server.respondWith("GET", new RegExp(newAuthEndpoint + ".*"),
             [
                 200,
                 { "Content-Type": "application/json" },