eitri-cli 1.7.0-beta.5 → 1.7.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eitri-cli",
-  "version": "1.7.0-beta.5",
+  "version": "1.7.0-beta.6",
   "description": "Command Line Interface to make \"Eitri-App\" with code and fire.",
   "main": "index.js",
   "bin": {

package/src/cmd/push-version.js

@@ -8,27 +8,19 @@ const config = require('../service/ConfigService')
 const TargetService = require('../service/TargetService')
 const inquirer = require('inquirer')
 const TrackingEitriAnalytics = require('../service/TrackingEitriAnalytics')
-const UserLocalCredential = require('../util/UserLocalCredential')
 const VegvisirService = require('../modules/vegvisir/VegvisirService')
 const {randomUUID} = require('crypto')
 const childProcess = require('child_process')
 const blindGuardian = workspace.blindGuardian
-const trackingService = new TrackingService(blindGuardian)
 const targetService = new TargetService(workspace)
 const vegvisirService = new VegvisirService()
-const standardVersion = require('standard-version')
 const releaseService = require('../service/ReleaseService')
 const {isGitRepo} = require('../util/GenericUtils')
-const debug = require('debug')('eitri:pushVersion')
+const PrerequisitesValidator = require('../service/PrerequisitesValidator')
+const prerequisitesValidator = new PrerequisitesValidator(workspace)
 
 module.exports = async function pushVersion(cmdObj) {
-    try {
-        UserLocalCredential.checkForCredentials()
-    } catch (error) {
-        const errorMessage = cmdObj?.verbose ? error : error?.message
-        console.error("\n", errorMessage, "\n")
-        return
-    }
+    prerequisitesValidator.checkCredentials()
 
     const {slug: miniConfSlug} = workspace.getMiniConf()
     await vegvisirService.isCurrentWorkspaceOwnedByUser(miniConfSlug)

package/src/cmd/start.js

@@ -9,13 +9,14 @@ const config = require('../service/ConfigService')
 const handleStartServer = require('../service/StarterService')
 const TrackingEitriAnalytics = require('../service/TrackingEitriAnalytics')
 const VegvisirService = require('../modules/vegvisir/VegvisirService')
-const UserLocalCredential = require('../util/UserLocalCredential')
+const PrerequisitesValidator = require('../service/PrerequisitesValidator')
 
 const blindGuardian = workspace.blindGuardian
 const hashFolder = workspace.hashFolder
 const trackingService = new TrackingService(blindGuardian, { ignoreCredentialError: true })
 const watcher = new Watcher(workspace, hashFolder, trackingService)
 const vegvisirService = new VegvisirService(workspace)
+const prerequisitesValidator = new PrerequisitesValidator(workspace)
 const debug = require('debug')('eitri:start')
 
 module.exports = async function start(args) {
@@ -27,15 +28,7 @@ module.exports = async function start(args) {
     const separator = '======================================================================='
     let displayFriendlyErrorAtEnd = ""
 
-    try {
-        UserLocalCredential.checkForCredentials()
-        debug("Successo na checagem de credenciais")
-    } catch (error) {
-        debug("ERRO na checagem de credenciais", {message: error?.message, error})
-        const errorMessage = args?.verbose ? error : error?.message
-        console.error("\n", errorMessage, "\n")
-        return
-    }
+    await prerequisitesValidator.checkAll()
 
     try {
         if (!args.force) {

package/src/modules/vegvisir/VegvisirService.js

@@ -125,7 +125,7 @@ module.exports = class VegvisirService {
             );
             const fileContent = await readFile(workspaceGlobalPath, "utf8");
             const workspace = JSON.parse(fileContent);
-            console.log("Construindo de", workspace.id)
+            console.log(`Construindo para o Workspace [${workspace.id}]`)
             workspace.id = validateUUID(this.workspaceId) ? this.workspaceId : workspace.id;
             return workspace;
         } catch (error) {

package/src/service/PrerequisitesValidator.js

@@ -0,0 +1,84 @@
+const configService = require('./ConfigService')
+const UserLocalCredential = require('../util/UserLocalCredential');
+const Http = require('./Http');
+const TrackingEitriAnalytics = require('./TrackingEitriAnalytics');
+const MANAGER_URL = configService.get('eitriManager')?.url
+const {workspace} = require('../service/Workspace')
+const debug = require('debug')('eitri:PrerequisitesValidator')
+class PrerequisitesValidator {
+
+    constructor(workspace) {
+        this.workspace = workspace
+        this.blindGuardian = workspace.blindGuardian;
+        this.http = new Http(workspace.blindGuardian);
+        this.userInfo = {id: "", email: ""}
+    }
+
+    async checkAll() {
+        this.checkCredentials()
+        await this.isUserInOrg()
+    }
+
+    checkCredentials() {
+        try {
+            UserLocalCredential.checkForCredentials()
+            debug("Successo na checagem de credenciais")
+        } catch (error) {
+            this.sendErrorToAnalytics("checkCredentials.error", error)
+
+            debug("ERRO na checagem de credenciais", {message: error?.message, error})
+            console.error("\nError: ", {message: error?.message, error})
+            process.exit(1);
+        }
+    }
+
+    async isUserInOrg() {
+        const eitriAppConf = workspace.getMiniConf();
+
+        const respEitriAppData = await this.http.get(`${MANAGER_URL}/v2/eitri-apps/${eitriAppConf.id}`);
+        const respMyOrgsData = await this.http.get(`${MANAGER_URL}/users/me/organizations`);
+
+        const belongTo = respMyOrgsData?.some(org => org?.id === respEitriAppData?.organizationId)
+        const myOrgs = respMyOrgsData?.length > 0
+        if (myOrgs && belongTo) {
+            return
+        }
+
+        this.sendErrorToAnalytics("isUserInOrg.error", {confOrgId: respEitriAppData.organizationId, organizations: respMyOrgsData})
+
+        const friendlyErrorMessage = `Você ainda não foi registrado em nenhuma organização. Por favor, entre em contato com o administrador da sua organização.`
+        console.log(`\n\x1b[1m\x1b[31m ${friendlyErrorMessage} \x1b[0m\n`)
+        process.exit(1)
+    }
+
+    async getUserBasicInfo() {
+        if (this.userInfo.id && this.userInfo.email) {
+            return this.userInfo
+        }
+
+        const token = await this.blindGuardian.getToken().then(res => res).catch(_err => null)
+        this.userInfo = {
+            id: token?.id || "",
+            email: token?.email || ""
+        }
+        return {
+            id: token?.id || "",
+            email: token?.email || ""
+        }
+    }
+
+
+    sendErrorToAnalytics(eventName = "", data = {}) {
+        TrackingEitriAnalytics.sendEvent({
+            eventName,
+            userId: this.userInfo.id,
+            data: {
+                userData: this.userInfo,
+                ...data
+            }
+        }).catch(_err => null)
+    }
+
+}
+
+module.exports = PrerequisitesValidator

package/src/service/Workspace.js

@@ -239,10 +239,10 @@ class Workspace {
                 if (m) {
                     version = m[1];
                 }
-                libVersionsOutput += `      ${lib.name} [${version}]\n`;
+                libVersionsOutput += `      ${lib.name} [${version}]`;
             }
         });
-        console.log(libVersionsOutput);
+        console.log("\n",libVersionsOutput, "\n");
     }
 
     async checkVersions() {