feat(generators): update with-mongo & with-postgres' uri config to contain user & password

Author: phatpham9

generators/with-mongo/templates/src/config/mongo.ts

@@ -1,13 +1,14 @@
 const host = process.env.MONGO_HOST ?? 'localhost';
 const port = +(process.env.MONGO_PORT ?? '27017');
 const dbName = process.env.MONGO_DB_NAME ?? '<%= elementName %>';
-const user = process.env.MONGO_USER;
-const password = process.env.MONGO_PASSWORD;
+const user = process.env.MONGO_USER ?? '';
+const password = process.env.MONGO_PASSWORD ?? '';
 
 const config = {
-  uri: `mongodb://${host}:${port}/${dbName}`,
-  user,
-  password,
+  uri:
+    user === '' || password === ''
+      ? `mongodb://${host}:${port}/${dbName}`
+      : `mongodb://${user}:${password}@${host}:${port}/${dbName}`,
 };
 
 export default config;

generators/with-mongo/templates/src/db/mongo.ts

@@ -7,8 +7,6 @@ import config from '../config/mongo';
 const connect = async (): Promise<void> => {
   try {
     await mongoose.connect(config.uri, {
-      user: config.user,
-      pass: config.password,
       useUnifiedTopology: true,
       useNewUrlParser: true,
       promiseLibrary: Promise,

generators/with-postgres/templates/src/config/postgres.ts

@@ -1,13 +1,14 @@
 const host = process.env.POSTGRES_HOST ?? 'localhost';
 const port = +(process.env.POSTGRES_PORT ?? '5432');
 const dbName = process.env.POSTGRES_DB_NAME ?? '<%= elementName %>';
-const user = process.env.POSTGRES_USER;
-const password = process.env.POSTGRES_PASSWORD;
+const user = process.env.POSTGRES_USER ?? '';
+const password = process.env.POSTGRES_PASSWORD ?? '';
 
 const config = {
-  uri: `postgres://${host}:${port}/${dbName}`,
-  user,
-  password,
+  uri:
+    user === '' || password === ''
+      ? `postgres://${host}:${port}/${dbName}`
+      : `postgres://${user}:${password}@${host}:${port}/${dbName}`,
 };
 
 export default config;

generators/with-postgres/templates/src/db/postgres.ts

@@ -10,10 +10,7 @@ import logger from '@boringcodes/utils/logger';
 import config from '../config/postgres';
 
 // create sequelize
-const sequelize = new Sequelize(config.uri, {
-  username: config.user,
-  password: config.password,
-});
+const sequelize = new Sequelize(config.uri);
 
 // connect postgres
 const connect = async (): Promise<void> => {