Merge branch 'master' of https://github.com/codex-academy/BasicExpressWebApp

Author: Unalo

index.js

@@ -15,17 +15,30 @@ const flash = require('express-flash');
 const CategoryService = require('./services/category-service');
 const ProductService = require('./services/product-service');
 const UserService = require('./services/user-service');
-
 const pgp = require('pg-promise')();
 
-let useSSL = false;
-let local = process.env.LOCAL || false;
-if (process.env.DATABASE_URL && !local){
-    useSSL = true;
+const DATABASE_URL= process.env.DATABASE_URL || "postgresql://localhost:5432/my_products_list";
+
+const config = { 
+	connectionString : DATABASE_URL
+}
+
+if (process.env.NODE_ENV == 'production') {
+	config.ssl = { 
+		rejectUnauthorized : false
+	}
 }
-const connectionString = process.env.DATABASE_URL || 'postgresql://localhost:5432/my_products_list';
 
-const db = pgp(connectionString);
+const db = pgp(config);
+
+// let useSSL = false;
+// let local = process.env.LOCAL || false;
+// if (process.env.DATABASE_URL && !local){
+//     useSSL = true;
+// }
+// const connectionString = process.env.DATABASE_URL || 'postgresql://localhost:5432/my_products_list';
+
+// const db = pgp(connectionString);
 
 const categoryService = CategoryService(db);
 const productService = ProductService(db);