switched to handlebar template for passing the server's owasp config …

…down to the client. reverted some of the other changes (regarding the http request).
meanjs · Sep 8, 2016 · 4ddb059 · 4ddb059
1 parent d896d07
commit 4ddb059
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 27 deletions.
diff --git a/config/env/production.js b/config/env/production.js
@@ -79,11 +79,11 @@ module.exports = {
     sandbox: false
   },
   owasp: {
-      allowPassphrases       : true,
-      maxLength              : 128,
-      minLength              : 10,
-      minPhraseLength        : 20,
-      minOptionalTestsToPass : 4,
+    allowPassphrases: true,
+    maxLength: 128,
+    minLength: 10,
+    minPhraseLength: 20,
+    minOptionalTestsToPass: 4
   },
   mailer: {
     from: process.env.MAILER_FROM || 'MAILER_FROM',

diff --git a/config/env/test.js b/config/env/test.js
@@ -59,6 +59,13 @@ module.exports = {
     callbackURL: '/api/auth/paypal/callback',
     sandbox: true
   },
+  owasp: {
+    allowPassphrases: true,
+    maxLength: 128,
+    minLength: 10,
+    minPhraseLength: 20,
+    minOptionalTestsToPass: 4
+  },
   mailer: {
     from: process.env.MAILER_FROM || 'MAILER_FROM',
     options: {

diff --git a/modules/core/server/controllers/core.server.controller.js b/modules/core/server/controllers/core.server.controller.js
@@ -1,12 +1,13 @@
 'use strict';
 
-var validator = require('validator');
+var validator = require('validator'),
+  path = require('path'),
+  config = require(path.resolve('./config/config'));
 
 /**
  * Render the main application page
  */
 exports.renderIndex = function (req, res) {
-
   var safeUserObject = null;
   if (req.user) {
     safeUserObject = {
@@ -24,7 +25,8 @@ exports.renderIndex = function (req, res) {
   }
 
   res.render('modules/core/server/views/index', {
-    user: JSON.stringify(safeUserObject)
+    user: JSON.stringify(safeUserObject),
+    owaspcfg: JSON.stringify(config.owasp)
   });
 };
 

diff --git a/modules/core/server/views/layout.server.view.html b/modules/core/server/views/layout.server.view.html
@@ -65,6 +65,11 @@
 
   <!--Application JavaScript Files-->
     {{#each jsFiles}}<script type="text/javascript" src="{{this}}"></script>{{/each}}
+
+  <!--owasp config sync-->
+  <script type="text/javascript">
+    owaspPasswordStrengthTest.configs = {{{ owaspcfg }}};
+  </script>
 
   {{#if livereload}}
   <!--Livereload script rendered -->

diff --git a/modules/users/client/services/password-validator.client.service.js b/modules/users/client/services/password-validator.client.service.js
@@ -6,17 +6,11 @@
     .module('users.services')
     .factory('PasswordValidator', PasswordValidator);
 
-  PasswordValidator.$inject = ['$window', '$http'];
+  PasswordValidator.$inject = ['$window'];
 
-  function PasswordValidator($window, $http) {
+  function PasswordValidator($window) {
     var owaspPasswordStrengthTest = $window.owaspPasswordStrengthTest;
 
-    // get the owasp config from the server configuration
-    $http.get('/password/rules').success(function (response) {
-      owaspPasswordStrengthTest.configs = response; // same owasp config used on the server
-    }).error(function (response) {
-      // well, it should fall back on the default owasp config defined in that package
-    });
 
     var service = {
       getResult: getResult,

diff --git a/modules/users/server/controllers/users/users.password.server.controller.js b/modules/users/server/controllers/users/users.password.server.controller.js
@@ -14,12 +14,6 @@ var path = require('path'),
 
 var smtpTransport = nodemailer.createTransport(config.mailer.options);
 
-/**
- * Get the server defined owasp config for the client
- */
-exports.getowaspconfig = function (req, res) {
-  res.json(config.owasp);
-};
 
 /**
  * Forgot for reset password (forgot POST)

diff --git a/modules/users/server/models/user.server.model.js b/modules/users/server/models/user.server.model.js
@@ -12,7 +12,7 @@ var mongoose = require('mongoose'),
   generatePassword = require('generate-password'),
   owasp = require('owasp-password-strength-test');
 
-
+console.log(config.owasp, "========================================================", path.resolve('./config/config'));
 owasp.configs = config.owasp;
 
 

diff --git a/modules/users/server/routes/auth.server.routes.js b/modules/users/server/routes/auth.server.routes.js
@@ -54,8 +54,4 @@ module.exports = function (app) {
   // Setting the paypal oauth routes
   app.route('/api/auth/paypal').get(users.oauthCall('paypal'));
   app.route('/api/auth/paypal/callback').get(users.oauthCallback('paypal'));
-
-
-  // get the config settings for the client side owasp
-  app.route('/password/rules').get(users.getowaspconfig);
 };