Skip to content

Commit

Permalink
replaced config.json with config module.
Browse files Browse the repository at this point in the history
  • Loading branch information
guumaster committed Mar 11, 2016
1 parent 585c4d5 commit 74a9222
Show file tree
Hide file tree
Showing 88 changed files with 90 additions and 87 deletions.
3 changes: 3 additions & 0 deletions config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';

module.exports = require('./config.json');
2 changes: 1 addition & 1 deletion src/managers/dao.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const assert = require('assert');
const async = require('async');
const escapeRegexp = require('escape-regexp');
const config = require('../../config.json');
const config = require('../../config');
const MongoClient = require('mongodb').MongoClient;
const ObjectID = require('mongodb').ObjectID;
const _ = require('lodash');
Expand Down
2 changes: 1 addition & 1 deletion src/managers/email.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ function sendEmailMagicLink(email, link, cbk){
}

module.exports = function (settings) {
const config = require('../../config.json');
const config = require('../../config');
_settings = Object.assign({}, config, settings);

return {
Expand Down
2 changes: 1 addition & 1 deletion src/managers/file_store.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const AWS = require('aws-sdk');
const https = require('https');
const config = require('../../config.json');
const config = require('../../config');

let s3;

Expand Down
2 changes: 1 addition & 1 deletion src/managers/phone.js
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ function verifyPhone(redisKeyId, phone, country, pin, cbk) {
}

module.exports = function (settings) {
const config = require('../../config.json');
const config = require('../../config');
_settings = _.assign({}, config, settings);

return {
Expand Down
2 changes: 1 addition & 1 deletion src/managers/redis.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const redis = require('redis');
const config = require('../../config.json');
const config = require('../../config');

const REDIS_HOST = config.redis.host || 'localhost';
const REDIS_PORT = config.redis.port || 6379;
Expand Down
2 changes: 1 addition & 1 deletion src/managers/token.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const async = require('async');
const isFunction = require('lodash/isFunction');
const ciphertoken = require('ciphertoken');
const config = require('../../config.json');
const config = require('../../config');

const accessTokenSettings = {
cipherKey: config.accessToken.cipherKey,
Expand Down
2 changes: 1 addition & 1 deletion src/managers/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const _ = require('lodash');
const ciphertoken = require('ciphertoken');
const async = require('async');

const config = require('../../config.json');
const config = require('../../config');
const log = require('../logger/service');
const daoMng = require('./dao');
const tokenMng = require('./token');
Expand Down
2 changes: 1 addition & 1 deletion src/middlewares/accessTokenParam.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

const config = require('../../config.json');
const config = require('../../config');

module.exports = function checkAccessTokenParam(req, res, next) {
const paramAT = req.params.at;
Expand Down
2 changes: 1 addition & 1 deletion src/middlewares/authHeaderRequired.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const _ = require('lodash');
const config = require('../../config.json');
const config = require('../../config');

module.exports = function checkAuthHeader(req, res, next) {
const authHeader = req.header('Authorization');
Expand Down
2 changes: 1 addition & 1 deletion src/middlewares/bodyParserWrapper.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

const config = require('../../config.json');
const config = require('../../config');
const _ = require('lodash');

module.exports = function (middleware) {
Expand Down
2 changes: 1 addition & 1 deletion src/middlewares/checkAuthBasic.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

const config = require('../../config.json');
const config = require('../../config');

const expectedAuthorizationBasic = `basic ${new Buffer(`${config.management.clientId}:${config.management.clientSecret}`).toString('base64')}`;

Expand Down
2 changes: 1 addition & 1 deletion src/middlewares/decodeToken.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

const config = require('../../config.json');
const config = require('../../config');
const log = require('../logger/service');
const tokenMng = require('../managers/token');

Expand Down
2 changes: 1 addition & 1 deletion src/middlewares/permissions.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const _ = require('lodash');
const config = require('../../config.json');
const config = require('../../config');

module.exports = function checkPermissions(req, res, next) {
if (!config.endpoints) {
Expand Down
2 changes: 1 addition & 1 deletion src/middlewares/pinValidation.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const log = require('../logger/service');
const _ = require('lodash');
const phoneMng = require('../managers/phone');
const isValidJSON = require('../managers/json_validator');
const config = require('../../config.json');
const config = require('../../config');

const errInvalidFields = {
err: 'auth_proxy_error',
Expand Down
2 changes: 1 addition & 1 deletion src/middlewares/prepareOptions.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

const config = require('../../config.json');
const config = require('../../config');
const fs = require('fs');

function prepareOptions(req, res, next) {
Expand Down
2 changes: 1 addition & 1 deletion src/middlewares/propagateRequest.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const log = require('../logger/service');
const config = require('../../config.json');
const config = require('../../config');
const request = require('request');
const httpProxy = require('http-proxy');
const _ = require('lodash');
Expand Down
2 changes: 1 addition & 1 deletion src/middlewares/userAppVersion.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const _ = require('lodash');

const log = require('../logger/service');
const userDao = require('../managers/dao');
const config = require('../../config.json');
const config = require('../../config');

const updatingUserError = {
err: 'proxy_error',
Expand Down
2 changes: 1 addition & 1 deletion src/platforms/salesforce.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const daoMng = require('../managers/dao');
const userMng = require('../managers/user')();
const tokenMng = require('../managers/token');
const fileStoreMng = require('../managers/file_store');
const config = require('../../config.json');
const config = require('../../config');

const forcedotcomStrategy = require('passport-forcedotcom').Strategy;

Expand Down
2 changes: 1 addition & 1 deletion src/public_service.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const fs = require('fs');
const path = require('path');
const versionControl = require('version-control');

const config = require('../config.json');
const config = require('../config');
const log = require('./logger/service');
const checkAccessTokenParam = require('./middlewares/accessTokenParam');
const checkAuthHeader = require('./middlewares/authHeaderRequired');
Expand Down
2 changes: 1 addition & 1 deletion src/routes_internal/auth/user_post.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const daoMng = require('../../managers/dao');
const config = require('../../../config.json');
const config = require('../../../config');
const ObjectID = require('mongodb').ObjectID;
const crypto = require('../../managers/crypto');
const cryptoMng = crypto(config.password);
Expand Down
2 changes: 1 addition & 1 deletion src/routes_public/auth/loginEmail_post.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const emailManager = require('../../managers/email')();
const config = require('../../../config.json');
const config = require('../../../config');
const tokenManager = require('../../managers/token');
const daoManager = require('../../managers/dao');

Expand Down
2 changes: 1 addition & 1 deletion src/routes_public/auth/loginFacebook_post.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const log = require('../../logger/service');
const daoMng = require('../../managers/dao');
const userMng = require('../../managers/user')();
const tokenMng = require('../../managers/token');
const config = require('../../../config.json');
const config = require('../../../config');
const crypto = require('../../managers/crypto');
const cryptoMng = crypto(config.password);

Expand Down
2 changes: 1 addition & 1 deletion src/routes_public/auth/loginRefreshToken_get.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const tokenManager = require('../../managers/token');
const config = require('../../../config.json');
const config = require('../../../config');

module.exports = function (req, res, next) {

Expand Down
2 changes: 1 addition & 1 deletion src/routes_public/auth/login_post.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const async = require('async');
const log = require('../../logger/service');
const daoMng = require('../../managers/dao');
const crypto = require('../../managers/crypto');
const config = require('../../../config.json');
const config = require('../../../config');
const cryptoMng = crypto(config.password);
const sessionRequest = require('./session');
const tokenMng = require('../../managers/token');
Expand Down
2 changes: 1 addition & 1 deletion src/routes_public/auth/renew_post.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const async = require('async');
const log = require('../../logger/service');
const daoMng = require('../../managers/dao');
const tokenMng = require('../../managers/token');
const config = require('../../../config.json');
const config = require('../../../config');
const sessionRequest = require('./../auth/session');

module.exports = function (req, res, next) {
Expand Down
2 changes: 1 addition & 1 deletion src/routes_public/auth/session.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const request = require('request');
const config = require('../../../config.json');
const config = require('../../../config');

module.exports = function sessionRequest(deviceId, userId, method, userAgent, cbk) {
if (deviceId) {
Expand Down
2 changes: 1 addition & 1 deletion src/routes_public/routes.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

const config = require('../../config.json');
const config = require('../../config');

const authHeaderRequired = require('../middlewares/authHeaderRequired');
const decodeAccessToken = require('../middlewares/decodeToken');
Expand Down
2 changes: 1 addition & 1 deletion src/routes_public/user/activateUser_get.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

const config = require('../../../config.json');
const config = require('../../../config');
const userMng = require('../../managers/user');

module.exports = function (req, res, next) {
Expand Down
2 changes: 1 addition & 1 deletion src/routes_public/user/createUser_post.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

const config = require('../../../config.json');
const config = require('../../../config');
const tokenMng = require('../../managers/token');
const userMng = require('../../managers/user');

Expand Down
2 changes: 1 addition & 1 deletion src/routes_public/user/forgotPassword_get.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const async = require('async');

const daoMng = require('../../managers/dao');
const config = require('../../../config.json');
const config = require('../../../config');
const crypto = require('../../managers/crypto');
const cryptoMng = crypto(config.password);
const emailMng = require('../../managers/email');
Expand Down
2 changes: 1 addition & 1 deletion src/routes_public/user/validateOldPassword_put.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

const config = require('../../../config.json');
const config = require('../../../config');
const userMng = require('../../managers/user');

module.exports = function validateOldPassword(req, res, next) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const world = require('../support/world');
const request = require('request');
const assert = require('assert');
const async = require('async');
const config = require('../../config.json');
const config = require('../../config');

const dao = require('../../src/managers/dao');
const _ = require('lodash');
Expand Down
2 changes: 1 addition & 1 deletion tests-acceptance/step_definitions/client_pass_through.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const request = require('request');
const assert = require('assert');
const world = require('../support/world');
const nock = require('nock');
const config = require('../../config.json');
const config = require('../../config');

module.exports = function () {
this.When(/^the client makes a pass through (.*) with the following (.*) in the body$/, function (METHOD, PUBLIC_PAYLOAD, callback) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const request = require('request');
const assert = require('assert');
const world = require('../support/world');
const config = require('../../config.json');
const config = require('../../config');

module.exports = function () {
this.When(/^the client makes a pass through (.*) with the following (.*) in the body with a pin header$/, function (METHOD, PUBLIC_PAYLOAD, callback) {
Expand Down
2 changes: 1 addition & 1 deletion tests-acceptance/step_definitions/config_params.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

let config = require('../../config.json'); // eslint-disable-line prefer-const
let config = require('../../config'); // eslint-disable-line prefer-const

module.exports = function () {
this.Given(/^config has no param emailverification$/, function (callback) {
Expand Down
2 changes: 1 addition & 1 deletion tests-acceptance/step_definitions/login_invalid_request.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const world = require('../support/world');
const request = require('request');
const assert = require('assert');
const config = require('../../config.json');
const config = require('../../config');

module.exports = function () {
this.When(/^the client app requests log in the protected application with invalid credentials$/, function (callback) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const world = require('../support/world');
const request = require('request');
const assert = require('assert');
const config = require('../../config.json');
const config = require('../../config');

module.exports = function () {
this.When(/^the client app requests log in the protected application with username substring/, function (callback) {
Expand Down
2 changes: 1 addition & 1 deletion tests-acceptance/step_definitions/login_valid_request.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const world = require('../support/world');
const request = require('request');
const assert = require('assert');
const config = require('../../config.json');
const config = require('../../config');

module.exports = function () {
this.When(/^the user requests log in the protected application with valid credentials$/, function (callback) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const world = require('../support/world');
const request = require('request');
const assert = require('assert');
const config = require('../../config.json');
const config = require('../../config');

module.exports = function () {
this.When(/^the application makes a (.*) without credentials (.*) to a protected (.*)$/, function (METHOD, PAYLOAD, PATH, callback) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const world = require('../support/world');
const nock = require('nock');
const config = require('../../config.json');
const config = require('../../config');

module.exports = function(){
this.Given(/^a protected service replies to a public GET request with (.*) to (.*) with status (.*) and a body (.*)$/, function (REQUEST_PAYLOAD, PATH, STATUS, RESPONSE_PAYLOAD, callback){
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const world = require('../../support/world');
const request = require('request');
const assert = require('assert');
const config = require('../../../config.json');
const config = require('../../../config');

module.exports = function () {
this.When(/^the client app request to start SalesForce login process$/, function (callback) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const world = require('../../support/world');
const request = require('request');
const assert = require('assert');
const config = require('../../../config.json');
const config = require('../../../config');
const nock = require('nock');
const url = require('url');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const world = require('../../support/world');
const request = require('request');
const assert = require('assert');
const config = require('../../../config.json');
const config = require('../../../config');

module.exports = function () {
this.Given(/^a user with valid credentials in SalesForce linked to SalesForce$/, function (callback) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const world = require('../../support/world');
const request = require('request');
const assert = require('assert');
const config = require('../../../config.json');
const config = require('../../../config');

module.exports = function () {
this.Given(/^a user with valid credentials in SalesForce not linked to SalesForce$/, function (callback) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
const world = require('../support/world');
const request = require('request');
const assert = require('assert');
const config = require('../../config.json');
const config = require('../../config');
const nock = require('nock');

module.exports = function () {
Expand Down
Loading

0 comments on commit 74a9222

Please sign in to comment.