revert back to base64 approach for submit dev challenge submission API

Author: fireice.topcoder

actions/challenges.js

@@ -864,7 +864,8 @@ var submitForDevelopChallenge = function (api, connection, dbConnectionMap, next
         ret = {},
         userId = connection.caller.userId,
         challengeId = Number(connection.params.challengeId),
-        fileName,
+        fileName = connection.params.fileName,
+        fileData = connection.params.fileData,
         type = connection.params.type,
         error,
         resourceId,
@@ -879,8 +880,7 @@ var submitForDevelopChallenge = function (api, connection, dbConnectionMap, next
         thurgoodApiKey = process.env.THURGOOD_API_KEY || api.config.thurgoodApiKey,
         thurgoodJobId = null,
         multipleSubmissionPossible,
-        savedFilePath = null,
-        submissionFile = connection.params.submissionFile;
+        savedFilePath = null;
 
     async.waterfall([
         function (cb) {
@@ -893,7 +893,9 @@ var submitForDevelopChallenge = function (api, connection, dbConnectionMap, next
 
             //Simple validations of the incoming parameters
             error = helper.checkPositiveInteger(challengeId, 'challengeId') ||
-                helper.checkMaxNumber(challengeId, MAX_INT, 'challengeId');
+                helper.checkMaxNumber(challengeId, MAX_INT, 'challengeId') ||
+                helper.checkStringPopulated(fileName, 'fileName') ||
+                helper.checkStringPopulated(fileData, 'fileData');
 
             if (error) {
                 cb(error);
@@ -911,15 +913,7 @@ var submitForDevelopChallenge = function (api, connection, dbConnectionMap, next
                 }
             }
 
-            //Simple validations of the incoming parameters
-            if (submissionFile.constructor.name !== 'File') {
-                cb(new IllegalArgumentError("submissionFile must be a File"));
-                return;
-            }
-
-
             //Validation for the size of the fileName parameter. It should be 256 chars as this is max length of parameter field in submission table.
-            fileName = submissionFile.name;
             if (fileName.length > 256) {
                 cb(new BadRequestError("The file name is too long. It must be 256 characters or less."));
                 return;
@@ -988,37 +982,53 @@ var submitForDevelopChallenge = function (api, connection, dbConnectionMap, next
             uploadId = generatedIds.uploadId;
             submissionId = generatedIds.submissionId;
 
-            var submissionPath;
+            var submissionPath,
+                filePathToSave,
+                decodedFileData;
 
             //The file output dir should be overwritable by environment variable
             submissionPath = api.config.submissionDir;
 
             //The path to save is the folder with the name as <base submission path>
             //The name of the file is the <generated upload id>_<original file name>
-            savedFilePath = submissionPath + "/" + uploadId + "_" + fileName;
-
-            //Check the max length of the submission file (if there is a limit)
-            if (api.config.submissionMaxSizeBytes > 0) {
-                fs.stat(submissionFile.path, function (err, stats) {
-                    if (err) {
-                        cb(err);
-                        return;
-                    }
+            filePathToSave = submissionPath + "/" + uploadId + "_" + connection.params.fileName;
 
-                    if (stats.size > api.config.submissionMaxSizeBytes) {
-                        cb(new RequestTooLargeError(
-                            "The submission file size is greater than the max allowed size: " + (api.config.submissionMaxSizeBytes / 1024) + " KB."
-                        ));
-                        return;
-                    }
+            //Decode the base64 encoded file data
+            decodedFileData = new Buffer(connection.params.fileData, 'base64');
+
+            //Write the submission to file
+            fs.writeFile(filePathToSave, decodedFileData, function (err) {
+                if (err) {
+                    cb(err);
+                    return;
+                }
+
+                //Check the max length of the submission file (if there is a limit)
+                if (api.config.submissionMaxSizeBytes > 0) {
+                    fs.stat(filePathToSave, function (err, stats) {
+                        if (err) {
+                            cb(err);
+                            return;
+                        }
+                        console.log('-------------------------------------------');
+                        console.log(stats.size + '\t' + api.config.submissionMaxSizeBytes);
+                        console.log('-------------------------------------------');
+                        
+                        if (stats.size > api.config.submissionMaxSizeBytes) {
+                            cb(new RequestTooLargeError(
+                                "The submission file size is greater than the max allowed size: " + (api.config.submissionMaxSizeBytes / 1024) + " KB."
+                            ));
+                            return;
+                        }
+                        savedFilePath = filePathToSave;
+                        cb();
+                    });
+                } else {
+                    savedFilePath = filePathToSave;
                     cb();
-                });
-            } else {
-                cb();
-            }
+                }
+            });
         }, function (cb) {
-            fs.createReadStream(submissionFile.path).pipe(fs.createWriteStream(savedFilePath));
-
             //Now insert into upload table
             _.extend(sqlParams, {
                 uploadId: uploadId,
@@ -1029,7 +1039,7 @@ var submitForDevelopChallenge = function (api, connection, dbConnectionMap, next
                 fileName: uploadId + "_" + fileName
             });
             api.dataAccess.executeQuery("insert_upload", sqlParams, dbConnectionMap, cb);
-        }, function (notUsed, cb) {
+        }, function(notUsed, cb) {
             //Now check if the contest is a CloudSpokes one and if it needs to submit the thurgood job
             if (!_.isUndefined(thurgoodPlatform) && !_.isUndefined(thurgoodLanguage) && type === 'final') {
                 //Make request to the thurgood job api url
@@ -1609,7 +1619,7 @@ exports.submitForDevelopChallenge = {
     name: "submitForDevelopChallenge",
     description: "submitForDevelopChallenge",
     inputs: {
-        required: ["challengeId", "submissionFile"],
+        required: ["challengeId", "fileName", "fileData"],
         optional: ["type"]
     },
     blockedConnectionTypes: [],

apiary.apib

@@ -2698,7 +2698,8 @@ Register a new user.
 + Request (application/json)
 
 + Parameters
-    + submissionFile (required, string, `abcd.zip`) ... The submission zip
+    + fileName (required, string, `abcd.zip`) ... The name of the file that is being uploaded
+    + fileData (required, string, `SGVsbG8gV29ybGQ=`) ... The Base64 encoded content of the file being uploaded. The example value is 'Hello World' base64 encoded
     + type (optional, string, `checkpoint`) ... The type of submission. Can be 'final' or 'checkpoint'. If absent, 'final' is assumed.
 
 + Response 200 (application/json)