moved jwt utils to util folder

salesforce · Nov 16, 2016 · 53fa41e · 53fa41e
1 parent 4148fbb
commit 53fa41e
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/api/v1/controllers/authenticate.js b/api/v1/controllers/authenticate.js
@@ -14,7 +14,7 @@ const configuredPassport = require('../../../index').passportModule;
 const httpStatus = require('../constants').httpStatus;
 const u = require('../helpers/verbs/utils');
 const apiErrors = require('../apiErrors');
-const jwtUtil = require('../helpers/jwtUtil');
+const jwtUtil = require('../../../utils/jwtUtil');
 
 const resourceName = 'authenticate';
 

diff --git a/api/v1/controllers/globalconfig.js b/api/v1/controllers/globalconfig.js
@@ -21,7 +21,7 @@ const doGet = require('../helpers/verbs/doGet');
 const doFind = require('../helpers/verbs/doFind');
 const apiErrors = require('../apiErrors');
 const u = require('../helpers/verbs/utils');
-const jwtUtil = require('../helpers/jwtUtil');
+const jwtUtil = require('../../../utils/jwtUtil');
 
 function isAdmin(req) {
   return new Promise((resolve, reject) => {

diff --git a/api/v1/controllers/register.js b/api/v1/controllers/register.js
@@ -14,7 +14,7 @@ const configuredPassport = require('../../../index').passportModule;
 const httpStatus = require('../constants').httpStatus;
 const u = require('../helpers/verbs/utils');
 const helper = require('../helpers/nouns/users');
-const jwtUtil = require('../helpers/jwtUtil');
+const jwtUtil = require('../../../utils/jwtUtil');
 
 const resourceName = 'register';
 

diff --git a/api/v1/controllers/token.js b/api/v1/controllers/token.js
@@ -14,7 +14,7 @@ const configuredPassport = require('../../../index').passportModule;
 const httpStatus = require('../constants').httpStatus;
 const u = require('../helpers/verbs/utils');
 const apiErrors = require('../apiErrors');
-const jwtUtil = require('../helpers/jwtUtil');
+const jwtUtil = require('../../../utils/jwtUtil');
 
 const resourceName = 'token';
 

diff --git a/index.js b/index.js
@@ -68,7 +68,7 @@ function start() { // eslint-disable-line max-statements
   require('./config/passportconfig')(passportModule);
 
   // middleware for checking api token
-  const jwtUtil = require('./api/v1/helpers/jwtUtil');
+  const jwtUtil = require('./utils/jwtUtil');
 
   // set up httpServer params
   const listening = 'Listening on port';

diff --git a/tests/db/model/token/create.js b/tests/db/model/token/create.js
@@ -20,7 +20,7 @@ const Profile = tu.db.Profile;
 const User = tu.db.User;
 const Token = tu.db.Token;
 const pfx = '___';
-const jwtUtil = require('../../../../api/v1/helpers/jwtUtil');
+const jwtUtil = require('../../../../utils/jwtUtil');
 
 describe('db: Token: create', () => {
   let userObj = {};

diff --git a/tests/db/model/token/utils.js b/tests/db/model/token/utils.js
@@ -16,7 +16,7 @@ const tu = require('../../../testUtils');
 
 const testStartTime = new Date();
 const pfx = '___';
-const jwtUtil = require('../../../../api/v1/helpers/jwtUtil');
+const jwtUtil = require('../../../../utils/jwtUtil');
 const tokenName = 'testTokenName';
 
 module.exports = {

diff --git a/tests/testUtils.js b/tests/testUtils.js
@@ -13,7 +13,7 @@
 'use strict';
 
 var pfx = '___';
-const jwtUtil = require('../api/v1/helpers/jwtUtil');
+const jwtUtil = require('../utils/jwtUtil');
 const db = require('../db');
 const testStartTime = new Date();
 

diff --git a/api/v1/helpers/jwtUtil.js → utils/jwtUtil.js b/api/v1/helpers/jwtUtil.js → utils/jwtUtil.js
@@ -7,16 +7,16 @@
  */
 
 /**
- * api/v1/helpers/jwt.js
+ * utils/jwtUtil.js
  */
 'use strict'; // eslint-disable-line strict
 
 const jwt = require('jsonwebtoken');
-const u = require('./verbs/utils');
-const apiErrors = require('../apiErrors');
-const conf = require('../../../config');
+const u = require('../api/v1/helpers/verbs/utils');
+const apiErrors = require('../api/v1/apiErrors');
+const conf = require('../config');
 const env = conf.environment[conf.nodeEnv];
-const User = require('../../../db/index').User;
+const User = require('../db/index').User;
 
 /**
  * create and handle Invalid Token error

diff --git a/view/loadView.js b/view/loadView.js
@@ -19,7 +19,7 @@ const User = require('../db/index').User;
 const Profile = require('../db/index').Profile;
 const SamlStrategy = require('passport-saml').Strategy;
 const viewConfig = require('../viewConfig');
-const jwtUtil = require('../api/v1/helpers/jwtUtil');
+const jwtUtil = require('../utils/jwtUtil');
 const NOT_FOUND = 404;
 const url = require('url');