From d7f415b3f7c10a094b0604243bac14e55b99c9f3 Mon Sep 17 00:00:00 2001
From: Mumshad Mannambeth <mmumshad@gmail.com>
Date: Tue, 11 Jul 2017 13:35:04 -0400
Subject: [PATCH] Fix login page and remove facebook from login. Move admin and
 test password to environment variable for seed.

---
 client/app/account/login/login.html                |  2 --
 client/components/oauth-buttons/oauth-buttons.html |  4 ++--
 server/api/project/project.controller.js           | 12 +++++-------
 server/config/environment/development.js           |  2 +-
 server/config/seed.js                              |  8 ++++----
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/client/app/account/login/login.html b/client/app/account/login/login.html
index f595f95..5381a40 100644
--- a/client/app/account/login/login.html
+++ b/client/app/account/login/login.html
@@ -2,8 +2,6 @@
   <div class="row">
     <div class="col-sm-12">
       <h1>Login</h1>
-      <p>Accounts are reset on server restart from <code>server/config/seed.js</code>. Default account is <code>test@example.com</code> / <code>test</code></p>
-      <p>Admin account is <code>admin@example.com</code> / <code>admin</code></p>
     </div>
     <div class="col-sm-12">
       <form class="form" name="form" ng-submit="vm.login(form)" novalidate>
diff --git a/client/components/oauth-buttons/oauth-buttons.html b/client/components/oauth-buttons/oauth-buttons.html
index ce6026a..a015dcf 100644
--- a/client/components/oauth-buttons/oauth-buttons.html
+++ b/client/components/oauth-buttons/oauth-buttons.html
@@ -1,7 +1,7 @@
-<a ng-class="classes" ng-click="OauthButtons.loginOauth('facebook')" class="btn btn-social btn-facebook">
+<!--<a ng-class="classes" ng-click="OauthButtons.loginOauth('facebook')" class="btn btn-social btn-facebook">
   <i class="fa fa-facebook"></i>
   Connect with Facebook
-</a>
+</a>-->
 <a ng-class="classes" ng-click="OauthButtons.loginOauth('google')" class="btn btn-social btn-google">
   <i class="fa fa-google-plus"></i>
   Connect with Google+
diff --git a/server/api/project/project.controller.js b/server/api/project/project.controller.js
index e2212cc..7ca482d 100644
--- a/server/api/project/project.controller.js
+++ b/server/api/project/project.controller.js
@@ -14,7 +14,9 @@ import jsonpatch from 'fast-json-patch';
 import Project from './project.model';
 import config from '../../config/environment';
 const util = require('util');
-var ansibleTool = require('../../components/ansible/ansible_tool');
+const ansibleTool = require('../../components/ansible/ansible_tool');
+
+const logger = require('../../components/logger/logger');
 
 function respondWithResult(res, statusCode) {
   statusCode = statusCode || 200;
@@ -51,7 +53,6 @@ function removeEntity(res) {
 }
 
 function handleEntityNotFound(res) {
-  console.log("Entity Not Found");
   return function(entity) {
     if(!entity) {
       res.status(404).end();
@@ -64,23 +65,20 @@ function handleEntityNotFound(res) {
 function handleError(res, statusCode) {
   statusCode = statusCode || 500;
   return function(err) {
-    console.log("ERror " + err);
+    logger.error("Error = " + err);
     res.status(statusCode).send(err);
   };
 }
 
 // Gets a list of Projects
 export function index(req, res) {
-  console.log("Getting projects list");
-
   let filter ={owner_id: req.user._id};
 
   if(config.userRoles.indexOf(req.user.role) >= config.userRoles.indexOf('admin')){
-    console.log("User is admin");
     filter = {}
   }
 
-  console.log("Filter =" + JSON.stringify(filter));
+  logger.info("Get projects filter = %s", JSON.stringify(filter) );
 
   return Project.find(filter).exec()
     .then(respondWithResult(res))
diff --git a/server/config/environment/development.js b/server/config/environment/development.js
index 16a1ec9..4c73c6b 100644
--- a/server/config/environment/development.js
+++ b/server/config/environment/development.js
@@ -11,6 +11,6 @@ module.exports = {
   },
 
   // Seed database on startup
-  seedDB: true
+  seedDB: process.env.SEED_DB || true
 
 };
diff --git a/server/config/seed.js b/server/config/seed.js
index 89de543..5dc2372 100644
--- a/server/config/seed.js
+++ b/server/config/seed.js
@@ -14,14 +14,14 @@ export default function seedDatabaseIfNeeded() {
         User.create({
           provider: 'local',
           name: 'Test User',
-          email: 'test@example.com',
-          password: 'test'
+          email: 'test@playable.com',
+          password: process.env.PASSWORD_TEST || 'test'
         }, {
           provider: 'local',
           role: 'admin',
           name: 'Admin',
-          email: 'admin@example.com',
-          password: 'admin'
+          email: 'admin@playable.com',
+          password: process.env.PASSWORD_ADMIN || 'admin'
         })
         .then(() => console.log('finished populating users'))
         .catch(err => console.log('error populating users', err));