Merge pull request #147 from ForestAdmin/fix/generate

[*] Generate - Fixing port and authentication

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [Unreleased]
+### Fixed
+- Generate - App port is set in .env file
+
 ## Release 1.10.0
 ### Changed
 - MySQL & PostgreSQL - Detect enum type for model generation.

lumber-generate.js

@@ -76,19 +76,15 @@ program
     }
 
     let project;
-    if (config.authToken) {
-      try {
-        project = await authenticator.createProject(config);
-      } catch (error) {
-        if (error.message === 'Unauthorized') {
-          logger.error('💀  Oops, you are unauthorized to connect to forest. 💀 Try the "lumber logout && lumber login" command.');
-        } else {
-          logger.error('💀  Oops, authentication operation aborted 💀 due to the following error: ', error);
-        }
-        process.exit(1);
+    try {
+      project = await authenticator.authenticateAndCreateProject(config);
+    } catch (error) {
+      if (error.message === 'Unauthorized') {
+        logger.error('💀  Oops, you are unauthorized to connect to forest. 💀 Try the "lumber logout && lumber login" command.');
+      } else {
+        logger.error('💀  Oops, authentication operation aborted 💀 due to the following error: ', error);
       }
-    } else {
-      project = await authenticator.register(config);
+      process.exit(1);
     }
 
     const dumper = await new Dumper(project, config);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lumber-cli",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "description": "Generate the admin micro-service of your application",
   "main": "lumber.js",
   "scripts": {

services/authenticator.js

@@ -59,7 +59,7 @@ function Authenticator() {
       });
   };
 
-  this.register = (config) => {
+  this.registerAndCreateProject = (config) => {
     let guest = { email: config.email };
 
     return agent
@@ -116,8 +116,9 @@ function Authenticator() {
       })
       .catch((err) => {
         if (err.status === 409) {
-          logger.error('💀  Oops, this email already exists. Please, run ' +
-            chalk.bold('$ lumber login') + ' before 💀');
+          // NOTICE: Account already exists
+          return this.login(config)
+            .then(() => this.createProject(config));
         } else {
           logger.error('💀  Ouch, cannot create your account 💀');
         }
@@ -138,6 +139,14 @@ function Authenticator() {
         return fs.writeFileSync(`${os.homedir()}/.lumberrc`, auth.token);
       });
   };
+
+  this.authenticateAndCreateProject = (config) => {
+    if (config.authToken) {
+      return this.createProject(config);
+    }
+
+    return this.registerAndCreateProject(config);
+  };
 }
 
 module.exports = new Authenticator();

services/dumper.js

@@ -127,7 +127,8 @@ function Dumper(project, config) {
       forestUrl: process.env.FOREST_URL,
       ssl: config.ssl,
       encrypt: config.ssl && config.dbDialect === 'mssql',
-      dbSchema: config.dbSchema
+      dbSchema: config.dbSchema,
+      port: config.appPort
     };
 
     fs.writeFileSync(`${path}/.env`, template(settings));

templates/app/env

@@ -5,3 +5,4 @@ FOREST_ENV_SECRET=<%= forestEnvSecret %>
 <% if (!encrypt) {%>#<% } %>ENCRYPT_DATABASE=true
 <% if (forestUrl) {%>FOREST_URL=<%= forestUrl %><% } %>
 <% if (dbSchema) {%>DATABASE_SCHEMA=<%= dbSchema %><% } %>
+<% if (port) {%>PORT=<%= port %><% } %>