fh-mbaas-client
Advanced tools
Comparing version 0.6.2 to 0.6.3
var _ = require('underscore'); | ||
var constants = require('./constants.js'); | ||
var url = require('url'); | ||
var logger = require('../logger/logger.js').getLogger(); | ||
@@ -79,4 +80,6 @@ //There can be many environment configuration | ||
initEnvironment: function(environment, mbaasConfig){ | ||
setMbaasUrl(mbaasConfig); | ||
environmentConfig[environment] = mbaasConfig; | ||
var config = _.clone(mbaasConfig); | ||
setMbaasUrl(config); | ||
environmentConfig[environment] = config; | ||
logger.info({env: environment, mbaasUrl: config.__mbaasUrl}, "mbaas-client.initEnvironment Mbaas Target details:"); | ||
}, | ||
@@ -83,0 +86,0 @@ getEnvironmentConfig: function(environment){ |
@@ -95,3 +95,2 @@ var request = require('request'); | ||
missingParam = validateParamsPresent(expectedAdminMbaasConfig, params); | ||
if(missingParam){ | ||
@@ -101,3 +100,3 @@ return new Error("Missing MbaaS Config Param " + missingParam); | ||
return undefined; | ||
return undefined; | ||
} | ||
@@ -123,7 +122,7 @@ | ||
var mbaasUrl = config.getEnvironmentConfig(params.environment).__mbaasUrl; | ||
var mbaasUrl = params.__mbaasUrl; | ||
var parsedMbaasUrl = url.parse(mbaasUrl); | ||
parsedMbaasUrl.pathname = basePath + resourcePath; | ||
var adminRequestParams = { | ||
var adminRequestParams = { | ||
url: parsedMbaasUrl.format(), | ||
@@ -162,3 +161,3 @@ method: method, | ||
params.json = false; | ||
} else { | ||
}else{ | ||
//Normal JSON Request | ||
@@ -169,3 +168,3 @@ params.json = true; | ||
params.qs = params.data; | ||
} else { | ||
}else{ | ||
params.body = params.data; | ||
@@ -202,19 +201,23 @@ } | ||
body = JSON.parse(body); | ||
} catch(e){ | ||
}catch(e){ | ||
logger.error("FH-MBAAS-CLIENT: Invalid Response Body ", {body: body}); | ||
} | ||
logger.debug("FH-MBAAS-CLIENT: doFHMbaaSRequest File Upload Request Finish ", {err: err, httpResponse: httpResponse.statusCode, body: body}); | ||
logger.debug("FH-MBAAS-CLIENT: doFHMbaaSRequest File Upload Request Finish ", { | ||
err: err, | ||
httpResponse: httpResponse.statusCode, | ||
body: body | ||
}); | ||
if(err || (httpResponse.statusCode !== 200 && httpResponse.statusCode !== 204)){ | ||
cb(err || body || "Unexpected Status Code " + httpResponse.statusCode); | ||
} else { | ||
}else{ | ||
cb(undefined, body); | ||
} | ||
}); | ||
} else if(params.fileRequest){ | ||
}else if(params.fileRequest){ | ||
logger.debug("FH-MBAAS-CLIENT: doFHMbaaSRequest File Download Request"); | ||
//File Download Request. Return the readable request stream. | ||
return cb(undefined, request(params)); | ||
} else { | ||
}else{ | ||
//Normal call. | ||
@@ -275,3 +278,7 @@ logger.debug("FH-MBAAS-CLIENT: doFHMbaaSRequest Normal Request"); | ||
var fullParams = _.extend(_.clone(params), config.getEnvironmentConfig(params.environment)); | ||
logger.info({ | ||
env: params.environment, | ||
domain: fullParams.domain, | ||
mbaasUrl: fullParams.__mbaasUrl | ||
}, "FH-MBAAS-CLIENT.adminRequest - calling mbaas:"); | ||
var invalidParamError = validateAdminParams(fullParams); | ||
@@ -278,0 +285,0 @@ |
{ | ||
"name": "fh-mbaas-client", | ||
"version": "0.6.1", | ||
"version": "0.6.3", | ||
"dependencies": { | ||
@@ -5,0 +5,0 @@ "bunyan": { |
{ | ||
"name": "fh-mbaas-client", | ||
"description": "FeedHenry MBaaS Client", | ||
"version": "0.6.2", | ||
"version": "0.6.3", | ||
"author": "FeedHenry", | ||
@@ -6,0 +6,0 @@ "main": "index.js", |
@@ -46,3 +46,3 @@ var assert = require('assert'); | ||
var envMbaasConfig = configModule.getEnvironmentConfig("dev"); | ||
mbaasConf.__mbaasUrl = envMbaasConfig.__mbaasUrl; | ||
assert.ok(_.isEqual(mbaasConf, envMbaasConfig), "Expected Equal MbaaS Configurations. Expected: " + JSON.stringify(mbaasConf) + " But Got: " + JSON.stringify(envMbaasConfig)); | ||
@@ -49,0 +49,0 @@ done(); |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
New author
Supply chain riskA new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
New author
Supply chain riskA new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.
Found 1 instance in 1 package
116017
3384