Skip to content

authentication endpoint timeout and URLSearchParams bug in react native #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 5, 2020
Merged

authentication endpoint timeout and URLSearchParams bug in react native #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/imagekit-min.js
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 8 additions & 3 deletions dist/imagekit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,10 @@ module.exports.buildURL = function(opts) {

var queryParameters = new URLSearchParams(parsedURL.query || "");
if(opts.sdkVersion && opts.sdkVersion.trim() != "") {
queryParameters.set("ik-sdk-version", opts.sdkVersion.trim());
queryParameters.append("ik-sdk-version", opts.sdkVersion.trim());
}
for(var i in opts.queryParameters) {
queryParameters.set(i, opts.queryParameters[i]);
queryParameters.append(i, opts.queryParameters[i]);
}

//Initial URL Construction Object
Expand All @@ -213,7 +213,7 @@ module.exports.buildURL = function(opts) {
//force that if src parameter is being used for URL construction then the transformation
//string should be added only as a query parameter
if(transformationUtils.addAsQueryParameter(opts) || isSrcParameterUsedForURL) {
queryParameters.set(TRANSFORMATION_PARAMETER, transformationString);
queryParameters.append(TRANSFORMATION_PARAMETER, transformationString);
} else {
urlObject.pathname = path.join(
[TRANSFORMATION_PARAMETER, transformationString].join(transformationUtils.getChainTransformDelimiter()),
Expand Down Expand Up @@ -3709,7 +3709,12 @@ function request (formData, defaultOptions, callback) {

function _generateSignatureToken(defaultOptions, callback) {
var xhr = new XMLHttpRequest();
xhr.timeout = 60000;
xhr.open('GET', defaultOptions.authenticationEndpoint);
xhr.ontimeout = function (e) {
if(typeof callback != "function") return;
callback("The authenticationEndpoint you provided timed out in 60 seconds");
};
xhr.onload = function() {
if (xhr.status === 200) {
try {
Expand Down
6 changes: 3 additions & 3 deletions libs/url/builder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ module.exports.buildURL = function(opts) {

var queryParameters = new URLSearchParams(parsedURL.query || "");
if(opts.sdkVersion && opts.sdkVersion.trim() != "") {
queryParameters.set("ik-sdk-version", opts.sdkVersion.trim());
queryParameters.append("ik-sdk-version", opts.sdkVersion.trim());
}
for(var i in opts.queryParameters) {
queryParameters.set(i, opts.queryParameters[i]);
queryParameters.append(i, opts.queryParameters[i]);
}

//Initial URL Construction Object
Expand All @@ -54,7 +54,7 @@ module.exports.buildURL = function(opts) {
//force that if src parameter is being used for URL construction then the transformation
//string should be added only as a query parameter
if(transformationUtils.addAsQueryParameter(opts) || isSrcParameterUsedForURL) {
queryParameters.set(TRANSFORMATION_PARAMETER, transformationString);
queryParameters.append(TRANSFORMATION_PARAMETER, transformationString);
} else {
urlObject.pathname = path.join(
[TRANSFORMATION_PARAMETER, transformationString].join(transformationUtils.getChainTransformDelimiter()),
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "imagekit-javascript",
"version": "1.2.0",
"version": "1.2.1",
"description": "Javascript SDK for using ImageKit.io in the browser",
"main": "dist/imagekit-min.js",
"dependencies": {
Expand Down
5 changes: 5 additions & 0 deletions utils/request.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@ function request (formData, defaultOptions, callback) {

function _generateSignatureToken(defaultOptions, callback) {
var xhr = new XMLHttpRequest();
xhr.timeout = 60000;
xhr.open('GET', defaultOptions.authenticationEndpoint);
xhr.ontimeout = function (e) {
if(typeof callback != "function") return;
callback("The authenticationEndpoint you provided timed out in 60 seconds");
};
xhr.onload = function() {
if (xhr.status === 200) {
try {
Expand Down