Skip to content

Commit 74a9222

Browse files
guumasterguumaster
committed
replaced config.json with config module.
1 parent 585c4d5 commit 74a9222

File tree

88 files changed

+90
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+90
-87
lines changed

‎config.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
'use strict';
2+
3+
module.exports = require('./config.json');

‎src/managers/dao.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const assert = require('assert');
44
const async = require('async');
55
const escapeRegexp = require('escape-regexp');
6-
const config = require('../../config.json');
6+
const config = require('../../config');
77
const MongoClient = require('mongodb').MongoClient;
88
const ObjectID = require('mongodb').ObjectID;
99
const _ = require('lodash');

‎src/managers/email.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ function sendEmailMagicLink(email, link, cbk){
156156
}
157157

158158
module.exports = function (settings) {
159-
const config = require('../../config.json');
159+
const config = require('../../config');
160160
_settings = Object.assign({}, config, settings);
161161

162162
return {

‎src/managers/file_store.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const AWS = require('aws-sdk');
44
const https = require('https');
5-
const config = require('../../config.json');
5+
const config = require('../../config');
66

77
let s3;
88

‎src/managers/phone.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ function verifyPhone(redisKeyId, phone, country, pin, cbk) {
154154
}
155155

156156
module.exports = function (settings) {
157-
const config = require('../../config.json');
157+
const config = require('../../config');
158158
_settings = _.assign({}, config, settings);
159159

160160
return {

‎src/managers/redis.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
const redis = require('redis');
4-
const config = require('../../config.json');
4+
const config = require('../../config');
55

66
const REDIS_HOST = config.redis.host || 'localhost';
77
const REDIS_PORT = config.redis.port || 6379;

‎src/managers/token.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const async = require('async');
44
const isFunction = require('lodash/isFunction');
55
const ciphertoken = require('ciphertoken');
6-
const config = require('../../config.json');
6+
const config = require('../../config');
77

88
const accessTokenSettings = {
99
cipherKey: config.accessToken.cipherKey,

‎src/managers/user.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const _ = require('lodash');
55
const ciphertoken = require('ciphertoken');
66
const async = require('async');
77

8-
const config = require('../../config.json');
8+
const config = require('../../config');
99
const log = require('../logger/service');
1010
const daoMng = require('./dao');
1111
const tokenMng = require('./token');

‎src/middlewares/accessTokenParam.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
const config = require('../../config.json');
3+
const config = require('../../config');
44

55
module.exports = function checkAccessTokenParam(req, res, next) {
66
const paramAT = req.params.at;

‎src/middlewares/authHeaderRequired.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
const _ = require('lodash');
4-
const config = require('../../config.json');
4+
const config = require('../../config');
55

66
module.exports = function checkAuthHeader(req, res, next) {
77
const authHeader = req.header('Authorization');

‎src/middlewares/bodyParserWrapper.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
const config = require('../../config.json');
3+
const config = require('../../config');
44
const _ = require('lodash');
55

66
module.exports = function (middleware) {

‎src/middlewares/checkAuthBasic.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
const config = require('../../config.json');
3+
const config = require('../../config');
44

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

‎src/middlewares/decodeToken.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
const config = require('../../config.json');
3+
const config = require('../../config');
44
const log = require('../logger/service');
55
const tokenMng = require('../managers/token');
66

‎src/middlewares/permissions.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
const _ = require('lodash');
4-
const config = require('../../config.json');
4+
const config = require('../../config');
55

66
module.exports = function checkPermissions(req, res, next) {
77
if (!config.endpoints) {

‎src/middlewares/pinValidation.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const log = require('../logger/service');
44
const _ = require('lodash');
55
const phoneMng = require('../managers/phone');
66
const isValidJSON = require('../managers/json_validator');
7-
const config = require('../../config.json');
7+
const config = require('../../config');
88

99
const errInvalidFields = {
1010
err: 'auth_proxy_error',

‎src/middlewares/prepareOptions.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
const config = require('../../config.json');
3+
const config = require('../../config');
44
const fs = require('fs');
55

66
function prepareOptions(req, res, next) {

‎src/middlewares/propagateRequest.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
const log = require('../logger/service');
4-
const config = require('../../config.json');
4+
const config = require('../../config');
55
const request = require('request');
66
const httpProxy = require('http-proxy');
77
const _ = require('lodash');

‎src/middlewares/userAppVersion.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const _ = require('lodash');
44

55
const log = require('../logger/service');
66
const userDao = require('../managers/dao');
7-
const config = require('../../config.json');
7+
const config = require('../../config');
88

99
const updatingUserError = {
1010
err: 'proxy_error',

‎src/platforms/salesforce.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const daoMng = require('../managers/dao');
99
const userMng = require('../managers/user')();
1010
const tokenMng = require('../managers/token');
1111
const fileStoreMng = require('../managers/file_store');
12-
const config = require('../../config.json');
12+
const config = require('../../config');
1313

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

‎src/public_service.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const fs = require('fs');
77
const path = require('path');
88
const versionControl = require('version-control');
99

10-
const config = require('../config.json');
10+
const config = require('../config');
1111
const log = require('./logger/service');
1212
const checkAccessTokenParam = require('./middlewares/accessTokenParam');
1313
const checkAuthHeader = require('./middlewares/authHeaderRequired');

‎src/routes_internal/auth/user_post.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
const daoMng = require('../../managers/dao');
4-
const config = require('../../../config.json');
4+
const config = require('../../../config');
55
const ObjectID = require('mongodb').ObjectID;
66
const crypto = require('../../managers/crypto');
77
const cryptoMng = crypto(config.password);

‎src/routes_public/auth/loginEmail_post.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
const emailManager = require('../../managers/email')();
4-
const config = require('../../../config.json');
4+
const config = require('../../../config');
55
const tokenManager = require('../../managers/token');
66
const daoManager = require('../../managers/dao');
77

‎src/routes_public/auth/loginFacebook_post.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const log = require('../../logger/service');
77
const daoMng = require('../../managers/dao');
88
const userMng = require('../../managers/user')();
99
const tokenMng = require('../../managers/token');
10-
const config = require('../../../config.json');
10+
const config = require('../../../config');
1111
const crypto = require('../../managers/crypto');
1212
const cryptoMng = crypto(config.password);
1313

‎src/routes_public/auth/loginRefreshToken_get.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
const tokenManager = require('../../managers/token');
4-
const config = require('../../../config.json');
4+
const config = require('../../../config');
55

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

‎src/routes_public/auth/login_post.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const async = require('async');
44
const log = require('../../logger/service');
55
const daoMng = require('../../managers/dao');
66
const crypto = require('../../managers/crypto');
7-
const config = require('../../../config.json');
7+
const config = require('../../../config');
88
const cryptoMng = crypto(config.password);
99
const sessionRequest = require('./session');
1010
const tokenMng = require('../../managers/token');

‎src/routes_public/auth/renew_post.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const async = require('async');
44
const log = require('../../logger/service');
55
const daoMng = require('../../managers/dao');
66
const tokenMng = require('../../managers/token');
7-
const config = require('../../../config.json');
7+
const config = require('../../../config');
88
const sessionRequest = require('./../auth/session');
99

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

‎src/routes_public/auth/session.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
const request = require('request');
4-
const config = require('../../../config.json');
4+
const config = require('../../../config');
55

66
module.exports = function sessionRequest(deviceId, userId, method, userAgent, cbk) {
77
if (deviceId) {

‎src/routes_public/routes.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
const config = require('../../config.json');
3+
const config = require('../../config');
44

55
const authHeaderRequired = require('../middlewares/authHeaderRequired');
66
const decodeAccessToken = require('../middlewares/decodeToken');

‎src/routes_public/user/activateUser_get.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
const config = require('../../../config.json');
3+
const config = require('../../../config');
44
const userMng = require('../../managers/user');
55

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

‎src/routes_public/user/createUser_post.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
const config = require('../../../config.json');
3+
const config = require('../../../config');
44
const tokenMng = require('../../managers/token');
55
const userMng = require('../../managers/user');
66

‎src/routes_public/user/forgotPassword_get.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const async = require('async');
44

55
const daoMng = require('../../managers/dao');
6-
const config = require('../../../config.json');
6+
const config = require('../../../config');
77
const crypto = require('../../managers/crypto');
88
const cryptoMng = crypto(config.password);
99
const emailMng = require('../../managers/email');

‎src/routes_public/user/validateOldPassword_put.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
const config = require('../../../config.json');
3+
const config = require('../../../config');
44
const userMng = require('../../managers/user');
55

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

‎tests-acceptance/step_definitions/client_application_with_valid_token.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const world = require('../support/world');
22
const request = require('request');
33
const assert = require('assert');
44
const async = require('async');
5-
const config = require('../../config.json');
5+
const config = require('../../config');
66

77
const dao = require('../../src/managers/dao');
88
const _ = require('lodash');

‎tests-acceptance/step_definitions/client_pass_through.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const request = require('request');
22
const assert = require('assert');
33
const world = require('../support/world');
44
const nock = require('nock');
5-
const config = require('../../config.json');
5+
const config = require('../../config');
66

77
module.exports = function () {
88
this.When(/^the client makes a pass through (.*) with the following (.*) in the body$/, function (METHOD, PUBLIC_PAYLOAD, callback) {

‎tests-acceptance/step_definitions/client_pass_through_pin.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const request = require('request');
22
const assert = require('assert');
33
const world = require('../support/world');
4-
const config = require('../../config.json');
4+
const config = require('../../config');
55

66
module.exports = function () {
77
this.When(/^the client makes a pass through (.*) with the following (.*) in the body with a pin header$/, function (METHOD, PUBLIC_PAYLOAD, callback) {

‎tests-acceptance/step_definitions/config_params.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

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

55
module.exports = function () {
66
this.Given(/^config has no param emailverification$/, function (callback) {

‎tests-acceptance/step_definitions/login_invalid_request.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const world = require('../support/world');
22
const request = require('request');
33
const assert = require('assert');
4-
const config = require('../../config.json');
4+
const config = require('../../config');
55

66
module.exports = function () {
77
this.When(/^the client app requests log in the protected application with invalid credentials$/, function (callback) {

‎tests-acceptance/step_definitions/login_invalid_username.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const world = require('../support/world');
22
const request = require('request');
33
const assert = require('assert');
4-
const config = require('../../config.json');
4+
const config = require('../../config');
55

66
module.exports = function () {
77
this.When(/^the client app requests log in the protected application with username substring/, function (callback) {

‎tests-acceptance/step_definitions/login_valid_request.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const world = require('../support/world');
22
const request = require('request');
33
const assert = require('assert');
4-
const config = require('../../config.json');
4+
const config = require('../../config');
55

66
module.exports = function () {
77
this.When(/^the user requests log in the protected application with valid credentials$/, function (callback) {

‎tests-acceptance/step_definitions/protected_service_call.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const world = require('../support/world');
22
const request = require('request');
33
const assert = require('assert');
4-
const config = require('../../config.json');
4+
const config = require('../../config');
55

66
module.exports = function () {
77
this.When(/^the application makes a (.*) without credentials (.*) to a protected (.*)$/, function (METHOD, PAYLOAD, PATH, callback) {

‎tests-acceptance/step_definitions/protected_service_definiton.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const world = require('../support/world');
22
const nock = require('nock');
3-
const config = require('../../config.json');
3+
const config = require('../../config');
44

55
module.exports = function(){
66
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){

‎tests-acceptance/step_definitions/salesforce/login_process.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const world = require('../../support/world');
22
const request = require('request');
33
const assert = require('assert');
4-
const config = require('../../../config.json');
4+
const config = require('../../../config');
55

66
module.exports = function () {
77
this.When(/^the client app request to start SalesForce login process$/, function (callback) {

‎tests-acceptance/step_definitions/salesforce/salesforce_callback.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const world = require('../../support/world');
22
const request = require('request');
33
const assert = require('assert');
4-
const config = require('../../../config.json');
4+
const config = require('../../../config');
55
const nock = require('nock');
66
const url = require('url');
77

‎tests-acceptance/step_definitions/salesforce/user_linked_to_salesforce.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const world = require('../../support/world');
22
const request = require('request');
33
const assert = require('assert');
4-
const config = require('../../../config.json');
4+
const config = require('../../../config');
55

66
module.exports = function () {
77
this.Given(/^a user with valid credentials in SalesForce linked to SalesForce$/, function (callback) {

‎tests-acceptance/step_definitions/salesforce/user_not_linked_to_salesforce.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const world = require('../../support/world');
22
const request = require('request');
33
const assert = require('assert');
4-
const config = require('../../../config.json');
4+
const config = require('../../../config');
55

66
module.exports = function () {
77
this.Given(/^a user with valid credentials in SalesForce not linked to SalesForce$/, function (callback) {

‎tests-acceptance/step_definitions/the_app_requests_a_magic_link_for_a_valid_user.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
const world = require('../support/world');
33
const request = require('request');
44
const assert = require('assert');
5-
const config = require('../../config.json');
5+
const config = require('../../config');
66
const nock = require('nock');
77

88
module.exports = function () {

0 commit comments

Comments
 (0)