external/ansible-playable
1
0
Fork 0
mirror of https://github.com/mmumshad/ansible-playable.git synced 2025-02-15 04:42:05 +00:00
Code Issues Releases Wiki Activity

Fix login page and remove facebook from login.

Browse source 
Move admin and test password to environment variable for seed.
This commit is contained in:
Mumshad Mannambeth 2017-07-11 13:35:04 -04:00
parent babc1c5e6c
commit d7f415b3f7
5 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/app/account/login/login.html
View file

@ -2,8 +2,6 @@
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<h1>Login</h1> <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>
<div class="col-sm-12"> <div class="col-sm-12">
<form class="form" name="form" ng-submit="vm.login(form)" novalidate> <form class="form" name="form" ng-submit="vm.login(form)" novalidate>

4
client/components/oauth-buttons/oauth-buttons.html
View file

@ -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> <i class="fa fa-facebook"></i>
Connect with Facebook Connect with Facebook
</a> </a>-->
<a ng-class="classes" ng-click="OauthButtons.loginOauth('google')" class="btn btn-social btn-google"> <a ng-class="classes" ng-click="OauthButtons.loginOauth('google')" class="btn btn-social btn-google">
<i class="fa fa-google-plus"></i> <i class="fa fa-google-plus"></i>
Connect with Google+ Connect with Google+

12
server/api/project/project.controller.js
View file

@ -14,7 +14,9 @@ import jsonpatch from 'fast-json-patch';
import Project from './project.model'; import Project from './project.model';
import config from '../../config/environment'; import config from '../../config/environment';
const util = require('util'); 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) { function respondWithResult(res, statusCode) {
statusCode = statusCode || 200; statusCode = statusCode || 200;
@ -51,7 +53,6 @@ function removeEntity(res) {
} }
function handleEntityNotFound(res) { function handleEntityNotFound(res) {
console.log("Entity Not Found");
return function(entity) { return function(entity) {
if(!entity) { if(!entity) {
res.status(404).end(); res.status(404).end();
@ -64,23 +65,20 @@ function handleEntityNotFound(res) {
function handleError(res, statusCode) { function handleError(res, statusCode) {
statusCode = statusCode || 500; statusCode = statusCode || 500;
return function(err) { return function(err) {
console.log("ERror " + err); logger.error("Error = " + err);
res.status(statusCode).send(err); res.status(statusCode).send(err);
}; };
} }
// Gets a list of Projects // Gets a list of Projects
export function index(req, res) { export function index(req, res) {
console.log("Getting projects list");
let filter ={owner_id: req.user._id}; let filter ={owner_id: req.user._id};
if(config.userRoles.indexOf(req.user.role) >= config.userRoles.indexOf('admin')){ if(config.userRoles.indexOf(req.user.role) >= config.userRoles.indexOf('admin')){
console.log("User is admin");
filter = {} filter = {}
} }
console.log("Filter =" + JSON.stringify(filter)); logger.info("Get projects filter = %s", JSON.stringify(filter) );
return Project.find(filter).exec() return Project.find(filter).exec()
.then(respondWithResult(res)) .then(respondWithResult(res))

2
server/config/environment/development.js
View file

@ -11,6 +11,6 @@ module.exports = {
}, },
// Seed database on startup // Seed database on startup
seedDB: true seedDB: process.env.SEED_DB || true
}; };

8
server/config/seed.js
View file

@ -14,14 +14,14 @@ export default function seedDatabaseIfNeeded() {
User.create({ User.create({
provider: 'local', provider: 'local',
name: 'Test User', name: 'Test User',
email: 'test@example.com', email: 'test@playable.com',
password: 'test' password: process.env.PASSWORD_TEST || 'test'
}, { }, {
provider: 'local', provider: 'local',
role: 'admin', role: 'admin',
name: 'Admin', name: 'Admin',
email: 'admin@example.com', email: 'admin@playable.com',
password: 'admin' password: process.env.PASSWORD_ADMIN || 'admin'
}) })
.then(() => console.log('finished populating users')) .then(() => console.log('finished populating users'))
.catch(err => console.log('error populating users', err)); .catch(err => console.log('error populating users', err));