@@ -125,7 +125,7 @@ var isObject = require('lodash/isObject');
125
125
*/
126
126
var errorMessages = require ( "../../constants/errorMessages" ) ;
127
127
var respond = require ( "../../utils/respond" ) ;
128
- var request = require ( "../../utils/request" ) ;
128
+ var request = require ( "../../utils/request" ) . request ;
129
129
130
130
module . exports = function ( uploadOptions , defaultOptions , callback ) {
131
131
if ( ! isObject ( uploadOptions ) ) {
@@ -3684,45 +3684,103 @@ module.exports = {
3684
3684
} , { } ] , 65 :[ function ( require , module , exports ) {
3685
3685
3686
3686
3687
- module . exports = function ( formData , defaultOptions , callback ) {
3687
+ // module.exports = function(formData, defaultOptions, callback) {
3688
+ // var xhr = new XMLHttpRequest();
3689
+ // xhr.open('GET', defaultOptions.authenticationEndpoint);
3690
+ // xhr.onload = function() {
3691
+ // if (xhr.status === 200) {
3692
+ // try {
3693
+ // var body = JSON.parse(xhr.responseText);
3694
+ // formData.append("signature", body.signature || "");
3695
+ // formData.append("expire", body.expire || 0);
3696
+ // formData.append("token", body.token);
3697
+
3698
+ // var uploadFileXHR= new XMLHttpRequest();
3699
+ // uploadFileXHR.open('POST', 'https://upload.imagekit.io/api/v1/files/upload');
3700
+ // uploadFileXHR.onload = function() {
3701
+ // if (uploadFileXHR.status === 200) {
3702
+ // if(typeof callback != "function") return;
3703
+ // var uploadResponse = JSON.parse(uploadFileXHR.responseText);
3704
+ // callback(null, uploadResponse);
3705
+ // }
3706
+ // else if (uploadFileXHR.status !== 200) {
3707
+ // if(typeof callback != "function") return;
3708
+ // callback(JSON.parse(uploadFileXHR.responseText));
3709
+ // }
3710
+ // };
3711
+ // uploadFileXHR.send(formData);
3712
+ // } catch(ex) {
3713
+ // console.log(ex);
3714
+ // if(typeof callback != "function") return;
3715
+ // callback(ex);
3716
+ // }
3717
+ // }
3718
+ // else {
3719
+ // try {
3720
+ // var error = JSON.parse(xhr.responseText);
3721
+ // console.log(error);
3722
+ // if(typeof callback != "function") return;
3723
+ // callback(error);
3724
+ // } catch (ex) {
3725
+ // console.log(ex);
3726
+ // if(typeof callback != "function") return;
3727
+ // callback(ex);
3728
+ // }
3729
+ // }
3730
+ // };
3731
+ // xhr.send();
3732
+ // return;
3733
+ // }
3734
+
3735
+ function request ( formData , defaultOptions , callback ) {
3736
+ module . exports . generateSignatureToken ( defaultOptions , function ( err , signaturObj ) {
3737
+ if ( err ) {
3738
+ console . log ( err ) ;
3739
+ if ( typeof callback != "function" ) return ;
3740
+ callback ( err ) ;
3741
+ return ;
3742
+ } else {
3743
+ formData . append ( "signature" , signaturObj . signature || "" ) ;
3744
+ formData . append ( "expire" , signaturObj . expire || 0 ) ;
3745
+ formData . append ( "token" , signaturObj . token ) ;
3746
+
3747
+ module . exports . uploadFile ( formData , function ( err , responseSucessText ) {
3748
+ if ( err ) {
3749
+ console . log ( error ) ;
3750
+ if ( typeof callback != "function" ) return ;
3751
+ callback ( error ) ;
3752
+ } else {
3753
+ callback ( null , responseSucessText ) ;
3754
+ }
3755
+ } ) ;
3756
+ }
3757
+ } ) ;
3758
+ }
3759
+
3760
+ function _generateSignatureToken ( defaultOptions , callback ) {
3688
3761
var xhr = new XMLHttpRequest ( ) ;
3689
3762
xhr . open ( 'GET' , defaultOptions . authenticationEndpoint ) ;
3690
3763
xhr . onload = function ( ) {
3691
3764
if ( xhr . status === 200 ) {
3692
3765
try {
3693
3766
var body = JSON . parse ( xhr . responseText ) ;
3694
- formData . append ( "signature" , body . signature || "" ) ;
3695
- formData . append ( "expire" , body . expire || 0 ) ;
3696
- formData . append ( "token" , body . token ) ;
3697
-
3698
- var uploadFileXHR = new XMLHttpRequest ( ) ;
3699
- uploadFileXHR . open ( 'POST' , 'https://upload.imagekit.io/api/v1/files/upload' ) ;
3700
- uploadFileXHR . onload = function ( ) {
3701
- if ( uploadFileXHR . status === 200 ) {
3702
- if ( typeof callback != "function" ) return ;
3703
- var uploadResponse = JSON . parse ( uploadFileXHR . responseText ) ;
3704
- callback ( null , uploadResponse ) ;
3705
- }
3706
- else if ( uploadFileXHR . status !== 200 ) {
3707
- if ( typeof callback != "function" ) return ;
3708
- callback ( JSON . parse ( uploadFileXHR . responseText ) ) ;
3709
- }
3710
- } ;
3711
- uploadFileXHR . send ( formData ) ;
3767
+ var obj = {
3768
+ signature : body . signature ,
3769
+ expire : body . expire ,
3770
+ token : body . token
3771
+ }
3772
+ callback ( null , obj ) ;
3773
+ return ;
3712
3774
} catch ( ex ) {
3713
- console . log ( ex ) ;
3714
3775
if ( typeof callback != "function" ) return ;
3715
3776
callback ( ex ) ;
3716
3777
}
3717
- }
3718
- else {
3778
+ } else {
3719
3779
try {
3720
3780
var error = JSON . parse ( xhr . responseText ) ;
3721
- console . log ( error ) ;
3722
3781
if ( typeof callback != "function" ) return ;
3723
3782
callback ( error ) ;
3724
3783
} catch ( ex ) {
3725
- console . log ( ex ) ;
3726
3784
if ( typeof callback != "function" ) return ;
3727
3785
callback ( ex ) ;
3728
3786
}
@@ -3732,7 +3790,29 @@ module.exports = function(formData, defaultOptions, callback) {
3732
3790
return ;
3733
3791
}
3734
3792
3793
+ function _uploadFile ( formData , callback ) {
3794
+ var uploadFileXHR = new XMLHttpRequest ( ) ;
3795
+ uploadFileXHR . open ( 'POST' , 'https://upload.imagekit.io/api/v1/files/upload' ) ;
3796
+ uploadFileXHR . onload = function ( ) {
3797
+ if ( uploadFileXHR . status === 200 ) {
3798
+ if ( typeof callback != "function" ) return ;
3799
+ var uploadResponse = JSON . parse ( uploadFileXHR . responseText ) ;
3800
+ callback ( null , uploadResponse ) ;
3801
+ }
3802
+ else if ( uploadFileXHR . status !== 200 ) {
3803
+ if ( typeof callback != "function" ) return ;
3804
+ callback ( JSON . parse ( uploadFileXHR . responseText ) ) ;
3805
+ }
3806
+ } ;
3807
+ uploadFileXHR . send ( formData ) ;
3808
+ return
3809
+ }
3735
3810
3811
+ module . exports = {
3812
+ request,
3813
+ generateSignatureToken : _generateSignatureToken ,
3814
+ uploadFile : _uploadFile ,
3815
+ }
3736
3816
} , { } ] , 66 :[ function ( require , module , exports ) {
3737
3817
module . exports = function ( isError , response , callback ) {
3738
3818
if ( typeof callback == "function" ) {
0 commit comments