Separa variaveis de ambiente e credenciais

Author: raphaellima8

.gitignore

@@ -12,3 +12,4 @@ perf-logs
 v8.log
 *.js.map
 !gulpfile.js
+script

Dockerfile

@@ -12,15 +12,8 @@ RUN echo "listen_addresses='*'" >> /etc/postgresql/9.3/main/postgresql.conf
 EXPOSE 5432
 VOLUME  ["/etc/postgresql", "/var/log/postgresql", "/var/lib/postgresql"]
 CMD ["/usr/lib/postgresql/9.3/bin/postgres", "-D", "/var/lib/postgresql/9.3/main", "-c", "config_file=/etc/postgresql/9.3/main/postgresql.conf"]
-USER root
-RUN /etc/init.d/postgresql stop
-RUN /etc/init.d/postgresql start
-RUN psql -h localhost -U postgres
-RUN psql -c "ALTER USER postgres WITH PASSWORD 'pgroot'";
-RUN psql -c "CREATE DATABASE api OWNER postgres"
-RUN psql -c 'CREATE TABLE "Users" (id serial NOT NULL, "name" character varying (255), "email" character varying (255), "password" character varying(255), "createdAt" timestamp with time zone NOT NULL, "updatedAt" timestamp with time zone NOT NULL);'
 
-# USER root
+USER root
 RUN mkdir -p /usr/src/ts-api
 WORKDIR /usr/src/ts-api
 

README.md

@@ -30,4 +30,26 @@ Tests:
 npm run test
 ```
 
+## If Docker
+Run:
+```
+[sudo] docker build -t <image_name> .
+```
+```
+[sudo] docker run -d -p 9000:3000 --name <label> <image_name>
+```
+Connect to the container:
+```
+[sudo] docker exec -it <id_container> /bin/bash
+```
+Run the commands below in the container terminal:
+```
+su postgres
+/etc/init.d/postgresql start
+psql -c "ALTER USER postgres WITH PASSWORD 'pgroot'"
+psql -c "CREATE DATABASE api OWNER postgres"
+npm run watch
+```
+
+
 License: MIT

package.json

@@ -4,11 +4,9 @@
   "description": "\"TypeScript API - Node + ES6 + Sequelize + PostgreSQL\"",
   "main": "server.ts",
   "scripts": {
-    "test": "mocha --compilers ts:ts-node/register server/**/test.ts",
+    "test": "sh script/test.sh",
     "dist-test": "mocha --require dist/config/tests/functional/helpers.js --reporter spec --compilers js:babel-core/register dist/**/test.js",
-    "start": "./node_modules/.bin/ts-node ./server/server.ts",
-    "watch": "./node_modules/.bin/nodemon -w . --ext \".ts\" --exec \"npm run start\"",
-    "node": "node dist/server/server.js",
+    "watch": "sh script/server.sh",
     "lint": "eslint 'dist/**/*.js'",
     "lint:fix": "eslint 'dist/**/*.js' --fix",
     "dist-start": "babel-node dist/server/server.js"

scripts/server.sh

@@ -0,0 +1,10 @@
+export NODE_ENV= #Parâmetros
+export DB_NAME= #Parâmetros
+export DIALECT= #Parâmetros
+export DB_USER= #Parâmetros
+export DB_PASS= #Parâmetros
+export HOST= #Parâmetros
+export SERVER_PORT= #Parâmetros
+export PG_PORT= #Parâmetros
+export DB_URL= #Parâmetros
+./node_modules/.bin/nodemon -w . --ext ".ts" --exec "npm run start"

scripts/test.sh

@@ -0,0 +1,10 @@
+export NODE_ENV= #Parâmetros
+export DB_NAME= #Parâmetros
+export DIALECT= #Parâmetros
+export DB_USER= #Parâmetros
+export DB_PASS= #Parâmetros
+export HOST= #Parâmetros
+export SERVER_PORT= #Parâmetros
+export PG_PORT= #Parâmetros
+export DB_URL= #Parâmetros
+mocha --compilers ts:ts-node/register server/**/test.ts

server/auth.js

@@ -12,25 +12,19 @@ function authConfig() {
     opts.jwtFromRequest = ExtractJwt.fromAuthHeader();
     var strategy = new Strategy(opts, function (jwtPayload, done) {
         UserService.getById(jwtPayload.id)
-            .then(function () {
-            success(jwtPayload, done);
+            .then(function (data) {
+            if (data) {
+                return done(null, {
+                    id: data.id,
+                    email: data.email
+                });
+            }
+            return done(null, false);
         })
-            .catch(_.partial(error, done, error));
+            .catch(_.partial(function (error) {
+            return done(error, null);
+        }, done));
     });
-    function success(data, done) {
-        if (data) {
-            return done(null, {
-                id: data.id,
-                email: data.email
-            });
-        }
-        return done(null, false);
-    }
-    ;
-    function error(done) {
-        return done(error, null);
-    }
-    ;
     passport.use(strategy);
     return {
         initialize: function () {

server/auth.ts

@@ -14,25 +14,20 @@ export default function authConfig () {
 
   const strategy = new Strategy(opts, (jwtPayload, done) => {
     UserService.getById(jwtPayload.id)
-      .then(() => {
-        success(jwtPayload, done)
+      .then((data) => {
+        if(data) {
+          return done(null, {
+            id: data.id,
+            email: data.email
+          });
+        }
+        return done(null, false);
       })
-      .catch(_.partial(error, done, error));
-  })
+      .catch(_.partial((error) => {
+        return done(error, null);
+      }, done));
+  });
 
-  function success(data:any, done): Function {
-      if(data) {
-        return done(null, {
-          id: data.id,
-          email: data.email
-        });
-      }
-      return done(null, false);
-  };
-
-  function error(done): Function {
-    return done(error, null);
-  };
   passport.use(strategy);
 
   return {

server/config/env/config.js

@@ -0,0 +1,4 @@
+/* jshint esversion:6*/
+module.exports = function () {
+	return require(`../env/${process.env.NODE_ENV}.env.js`);
+};

server/config/env/development.env.js

@@ -0,0 +1,12 @@
+/* jshint esversion:6*/
+module.exports = {
+  env: process.env.NODE_ENV,
+  db: process.env.DB_NAME,
+  dialect: process.env.DIALECT,
+  username: process.env.DB_USER,
+  password: process.env.DB_PASS,
+  host: process.env.HOST,
+  server_port: process.env.SERVER_PORT,
+  pg_port: process.env.PG_PORT,
+  db_url: process.env.DB_URL,
+};

server/config/env/test.env.js

@@ -0,0 +1,12 @@
+/* jshint esversion:6*/
+module.exports = {
+  env: process.env.NODE_ENV,
+  db: process.env.DB_NAME,
+  dialect: process.env.DIALECT,
+  username: process.env.DB_USER,
+  password: process.env.DB_PASS,
+  host: process.env.HOST,
+  server_port: process.env.SERVER_PORT,
+  pg_port: process.env.PG_PORT,
+  db_url: process.env.DB_URL,
+};

server/models/index.js

@@ -1,31 +1,32 @@
 'use strict';
-var fs = require('fs');
-var path = require('path');
-var Sequelize = require('sequelize');
-var basename = path.basename(module.filename);
-var env = process.env.NODE_ENV || 'development';
-var config = require('../config/config.json')[env];
-var db = {};
-if (config.use_env_variable) {
-    var sequelize = new Sequelize(process.env[config.use_env_variable]);
-}
-else {
-    var sequelize = new Sequelize(config.database, config.username, config.password, config);
-}
+  let fs = require('fs');
+  let path = require('path');
+  let Sequelize = require('sequelize');
+  let basename = path.basename(module.filename);
+  const config = require('../config/env/config')();
+  let env = config.env || 'development';
+  let db = {};
+  let sequelize;
+
+  if (config.db_url) {
+    sequelize = new Sequelize(config.db_url);
+  } else {
+    sequelize = new Sequelize(config.db, config.username, config.password);
+  }
 fs
-    .readdirSync(__dirname)
-    .filter(function (file) {
-    return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js');
-})
-    .forEach(function (file) {
-    var model = sequelize['import'](path.join(__dirname, file));
-    db[model.name] = model;
-});
+      .readdirSync(__dirname)
+      .filter((file) => {
+        return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js');
+      })
+      .forEach((file) => {
+        var model = sequelize['import'](path.join(__dirname, file));
+        db[model.name] = model;
+      });
 Object.keys(db).forEach(function (modelName) {
-    if (db[modelName].associate) {
-        db[modelName].associate(db);
-    }
-});
-db.sequelize = sequelize;
-db.Sequelize = Sequelize;
-module.exports = db;
+      if (db[modelName].associate) {
+          db[modelName].associate(db);
+      }
+  });
+  db.sequelize = sequelize;
+  db.Sequelize = Sequelize;
+  module.exports = db;

server/models/user.js

@@ -1,5 +1,4 @@
 "use strict";
-
 var bcrypt = require('bcrypt');
 function default_1(sequelize, DataTypes) {
     var User = sequelize.define('User', {
@@ -45,3 +44,4 @@ function default_1(sequelize, DataTypes) {
 }
 exports.__esModule = true;
 exports["default"] = default_1;
+;

server/server.ts

@@ -3,9 +3,10 @@ import * as debug from 'debug';
 import Api from './api/api';
 import {errorHandlerApi} from './api/errorHandlerApi';
 var models = require('./models');
+const config = require('./config/env/config')();
 debug('ts-api:server');
 
-const port = normalizePort(process.env.PORT || 3000);
+const port = normalizePort(config.server_port);
 
 Api.set('port', port);
 const server = http.createServer(Api);