@@ -125,7 +125,7 @@ var isObject = require('lodash/isObject');
125125*/
126126var errorMessages = require ( "../../constants/errorMessages" ) ;
127127var respond = require ( "../../utils/respond" ) ;
128- var request = require ( "../../utils/request" ) ;
128+ var request = require ( "../../utils/request" ) . request ;
129129
130130module . exports = function ( uploadOptions , defaultOptions , callback ) {
131131 if ( ! isObject ( uploadOptions ) ) {
@@ -3684,45 +3684,103 @@ module.exports = {
36843684} , { } ] , 65 :[ function ( require , module , exports ) {
36853685
36863686
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 ) {
36883761 var xhr = new XMLHttpRequest ( ) ;
36893762 xhr . open ( 'GET' , defaultOptions . authenticationEndpoint ) ;
36903763 xhr . onload = function ( ) {
36913764 if ( xhr . status === 200 ) {
36923765 try {
36933766 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 ;
37123774 } catch ( ex ) {
3713- console . log ( ex ) ;
37143775 if ( typeof callback != "function" ) return ;
37153776 callback ( ex ) ;
37163777 }
3717- }
3718- else {
3778+ } else {
37193779 try {
37203780 var error = JSON . parse ( xhr . responseText ) ;
3721- console . log ( error ) ;
37223781 if ( typeof callback != "function" ) return ;
37233782 callback ( error ) ;
37243783 } catch ( ex ) {
3725- console . log ( ex ) ;
37263784 if ( typeof callback != "function" ) return ;
37273785 callback ( ex ) ;
37283786 }
@@ -3732,7 +3790,29 @@ module.exports = function(formData, defaultOptions, callback) {
37323790 return ;
37333791}
37343792
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+ }
37353810
3811+ module . exports = {
3812+ request,
3813+ generateSignatureToken : _generateSignatureToken ,
3814+ uploadFile : _uploadFile ,
3815+ }
37363816} , { } ] , 66 :[ function ( require , module , exports ) {
37373817module . exports = function ( isError , response , callback ) {
37383818 if ( typeof callback == "function" ) {
0 commit comments