eitri-cli 1.2.0-beta.1 → 1.2.0-beta.2

package/.vscode/settings.json

@@ -1,5 +1,7 @@
 {
     "cSpell.words": [
-        "eitri"
+        "eitri",
+        "Unmocked",
+        "Vegvisir"
     ]
 }

package/README.md

@@ -50,4 +50,4 @@ Update the Eitri-CLI itself to the latest version.
 <details>
     <summary><b>v1.0.0</b></summary>  
     <p>Nasce eitri-cli!</p>
-</details>
+</details>

package/bitbucket-pipelines.yml

@@ -1,7 +1,19 @@
 image: node:18
 pipelines:
+  default:
+    - step: &runTests
+        name: Run tests
+        caches:
+          - node
+        script:
+          - yarn
+          - npm i -g .
+          - yarn test cli.test.js --force-exit
   branches:
+    "**":
+      - step: *runTests
     '{beta,master}':
+      - step: *runTests
       - step:
           name: "Generation of a new version: beta or stable."
           caches:

package/config/dev.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-undef */
-const HOST = "dev.eitri.calindra.com.br";
+const HOST = "api.eitri.tech";
 const packageJson = require("../package.json");
 const path = require("path");
 
@@ -43,7 +43,7 @@ const config = {
         colossus: {
             // url: 'https://colossus.lab.calindra.com.br/colossus-api/v1',
             // url: 'https://a32bcb528a6a.ngrok.io/colossus-api/v1',
-            url: `https://${HOST}/workspace/server`,
+            url: `https://${HOST}/foundry/server`,
 
             // pasta do Eitri-App dentro de src
             watchUserDir: "/server",

package/config/k8s-eitri.js

@@ -40,7 +40,7 @@ const config = {
         colossus: {
             // url: 'https://colossus.lab.calindra.com.br/colossus-api/v1',
             // url: 'https://a32bcb528a6a.ngrok.io/colossus-api/v1',
-            url: `https://${HOST}/workspace/server`,
+            url: `https://${HOST}/foundry/server`,
 
             // pasta do miniapp dentro de src
             watchUserDir: '/server'

package/config/loc-eitri.js

@@ -45,7 +45,7 @@ const config = {
         colossus: {
             // url: 'https://colossus.lab.calindra.com.br/colossus-api/v1',
             // url: 'https://a32bcb528a6a.ngrok.io/colossus-api/v1',
-            url: `http://${HOST}:3000/workspace/server`,
+            url: `http://${HOST}:3000/foundry/server`,
 
             // pasta do miniapp dentro de src
             watchUserDir: "/server",

package/config/prod-eitri.js

@@ -1,5 +1,7 @@
 /* eslint-disable no-undef */
 const HOST = "prod.eitri.calindra.com.br";
+const EITRI_TECH_HOST = "eitri.tech";
+const API_EITRI_TECH_URL = `api.${EITRI_TECH_HOST}`
 const packageJson = require("../package.json");
 const path = require("path");
 const FOUNDRY_CONTEXT_PATH = process.env.FOUNDRY_CONTEXT_PATH ?? 'foundry'
@@ -15,16 +17,16 @@ const config = {
             .replace(".js", ".")}conf.js`,
     },
     doc: {
-        createUrl: `https://admin.${HOST}/docs`,
+        createUrl: `https://console.${EITRI_TECH_HOST}/docs`,
     },
     blindGuardian: {
-        url: `https://${HOST}/blind-guardian-api`,
+        url: `https://${API_EITRI_TECH_URL}/blind-guardian-api`,
     },
     shareApi: {
-        url: `https://${HOST}/share-api/share`,
+        url: `https://${API_EITRI_TECH_URL}/share-api/share`,
     },
     workspace: {
-        url: `https://${HOST}`,
+        url: `https://${API_EITRI_TECH_URL}`,
         basePath: FOUNDRY_CONTEXT_PATH,
         targetPath: "/foundry/targets",
         target: {
@@ -42,7 +44,7 @@ const config = {
             v2Header: "application/vnd.workspace.api.v2+json",
         },
         colossus: {
-            url: `https://${HOST}/workspace/server`,
+            url: `https://${HOST}/foundry/server`,
 
             // pasta do miniapp dentro de src
             watchUserDir: "/server",
@@ -57,14 +59,14 @@ const config = {
         },
     },
     qrCode: {
-        url: "https://prod.eitri.calindra.com.br/workspace/share",
+        url: `https://${HOST}/workspace/share`,
     },
     miniLog: {
         url: `https://${HOST}/mini-log/rooms`,
         path: "/mini-log/socket.io",
     },
     managerApi: {
-        url: `https://${HOST}/miniapp-manager-api`,
+        url: `https://${API_EITRI_TECH_URL}/miniapp-manager-api`,
         invites: {
             send: "/p/invites",
             slug: "/p/invites/s/:slug",
@@ -77,7 +79,7 @@ const config = {
         },
     },
     eitriManager: {
-        url: `https://${HOST}/eitri-manager-api`,
+        url: `https://${API_EITRI_TECH_URL}/eitri-manager-api`,
     },
     workspaceManager: {
         url: `https://${HOST}`,
@@ -85,15 +87,15 @@ const config = {
         contextPath: "/workspace-manager",
     },
     eitriAnalytics: {
-        url: "https://analytics.dev.eitri.calindra.com.br/analytics/event",
+        url: `https://${API_EITRI_TECH_URL}/analytics/event`,
     },
     managerFront: {
-        url: `https://admin.eitri.calindra.com.br`,
+        url: `https://console.${EITRI_TECH_HOST}`,
         managerCredential: "/settings/manager-credential",
         cliGenerateLoginCredential: "/settings/cli-generate-credential",
     },
     vegvisir: {
-        url: `https://${HOST}`,
+        url: `https://${API_EITRI_TECH_URL}`,
         basePath: "/eitri-vegvisir-api",
         workspace: "/workspace",
         my: "/workspace/my",

package/developer-folder/README.md

@@ -0,0 +1 @@
+Pasta para fazer o teste e2e

package/index.js

@@ -5,14 +5,14 @@ const program = new commander.Command();
 const emoji = require("emojilib");
 const path = require("path");
 const { workspace } = require("./src/service/Workspace");
-const config = require("config");
+const configService = require("./src/service/ConfigService");
 const VegvisirCommand = require("./src/modules/vegvisir/VegvisirCommand");
 
 const run = async () => {
     try {
         const srcFolder2watch = path.join(process.cwd(), "src");
         workspace.setFolder2Watch(srcFolder2watch);
-        workspace.setServerUrl(`${config.get("workspace").url}`);
+        workspace.setServerUrl(`${configService.get("workspace").url}`);
     } catch (e) {
         if (process.env.LOG_LEVEL === "full") {
             console.log("Current directory listening has failed", e);
@@ -39,9 +39,9 @@ const run = async () => {
         .description(`Cria um projeto com um Eitri-App totalmente funcional.`)
         .option(
             "--yes",
-            "Aceita os valores default para nome titulo e organização"
+            "Aceita os valores default para nome título e organização"
         )
-        .option("--application", "Define o application de execução do Eitri-App")
+        .option("--application <application>", "Define o application de execução do Eitri-App")
         .option("-v, --verbose", "Exibe mais logs")
         .action((projectName, cmdObj) => {
             require("./src/cmd/create")(projectName, cmdObj);

package/install-dev.sh

@@ -1 +1 @@
-npm uninstall eitri -g && npm i -g
+npm uninstall eitri-cli -g && npm i -g .

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eitri-cli",
-  "version": "1.2.0-beta.1",
+  "version": "1.2.0-beta.2",
   "description": "Command Line Interface to make \"Eitri-App\" with code and fire.",
   "main": "index.js",
   "bin": {
@@ -8,6 +8,7 @@
   },
   "scripts": {
     "test-eitri": "NODE_APP_INSTANCE=eitri jest --detectOpenHandles",
+    "test": "NODE_APP_INSTANCE=eitri jest --detectOpenHandles",
     "linter": "./node_modules/.bin/eslint --fix ./src/**/*.js",
     "docsify:run": "cd docsify && docsify serve",
     "build": "echo \"no build\"",

package/src/cmd/create.js

@@ -1,7 +1,7 @@
 const Watcher = require("../service/Watcher");
 const inquirer = require("inquirer");
 const slugify = require("slugify");
-const config = require("config");
+const configService = require("../service/ConfigService");
 const { Workspace } = require("../service/Workspace");
 const BlindGuardian = require("../service/BlindGuardian");
 const HashFolder = require("../service/HashFolder");
@@ -28,14 +28,6 @@ const watcher = new Watcher(workspace, hashFolder, trackingService);
 const ITEM_DOUBT = "DOUBTS";
 const eitriAppManager = new EitriAppManager(blindGuardian);
 
-const notBlank = (inpt) => {
-    if (!inpt || !inpt.trim()) {
-        return "Não pode ficar em branco";
-    } else {
-        return true;
-    }
-};
-
 const nameOrTitle = (inpt) => {
     if (!NAME_TITLE_REGEX.test(inpt)) {
         return "Não use caracteres especiais";
@@ -66,9 +58,9 @@ module.exports = async function create(projectName, cmdObj) {
     );
 
     try {
-        const url = config.get("workspace").url;
+        const url = configService.get("workspace").url;
         workspace.setServerUrl(url);
-        const clientApplication = await askClientApplication();
+        const clientApplication = await askClientApplication(cmdObj.application);
         if (clientApplication.name === ITEM_DOUBT) {
             handleStartServer(
                 cmdObj,
@@ -97,7 +89,7 @@ module.exports = async function create(projectName, cmdObj) {
     }
 };
 
-async function askClientApplication() {
+async function askClientApplication(applicationName) {
     const availableApplications = await eitriAppManager.findAllApplications();
     if (availableApplications.length <= 0) {
         console.log(
@@ -105,6 +97,14 @@ async function askClientApplication() {
         );
         process.exit(0);
     }
+    if (applicationName) {
+        const clientApplication = availableApplications.find(application => application.name === applicationName)
+        if (clientApplication) {
+            return clientApplication
+        } else {
+            throw new Error(`Application not found by name ${applicationName}`)
+        }
+    }
     const cliOptions = [
         ...availableApplications,
         { name: ITEM_DOUBT, label: "Dúvidas? Veja documentação no browser" },

package/src/cmd/credentials.js

@@ -11,7 +11,7 @@ const workspace = new Workspace(blindGuardian, new HashFolder())
 const credentialService = new CredentialsService(workspace)
 const trackingService = new TrackingService(blindGuardian, { ignoreCredentialError: true })
 
-const config = require('config')
+const config = require('../service/ConfigService')
 
 const credentialStrategies = {
     [credentialService.upsert.name]: credentialService.upsert,

package/src/cmd/login.js

@@ -1,5 +1,5 @@
 const inquirer = require('inquirer')
-const config = require('config')
+const configService = require('../service/ConfigService')
 const open = require('open')
 const TrackingEitriAnalytics = require('../service/TrackingEitriAnalytics')
 const Server = require('../service/Server')
@@ -18,7 +18,7 @@ module.exports = async function login(args) {
 
         const res = Server.startCliLogin()
         
-        const urlAdminManagerCredential = `${config.get("managerFront").url}`
+        const urlAdminManagerCredential = `${configService.get("managerFront").url}`
         const urlAdminManagerCredentialWithParams = `${urlAdminManagerCredential}?loginType=EITRI_CLI&port=${res?.port}`
         
         let portalOpenMessage = ""

package/src/cmd/manage-env.js

@@ -1,5 +1,5 @@
 const path = require('path')
-const config = require('config')
+const configService = require('../service/ConfigService')
 
 const { workspace } = require('../service/Workspace')
 const MiniLog = require('../service/MiniLog')
@@ -15,7 +15,7 @@ const ManageEnvService = require('../service/ManageEnvService')
 const manageEnvService = new ManageEnvService()
 
 const blindGuardian = workspace.blindGuardian
-const CONFIG_WORKSPACE = config.get('workspace')
+const CONFIG_WORKSPACE = configService.get('workspace')
 
 module.exports = async function manageEnv(envList, cmd) {
     try {
@@ -31,7 +31,7 @@ module.exports = async function manageEnv(envList, cmd) {
 }
 
 const getEnv = async (cmd) => {
-    const miniLog = new MiniLog(config.get('miniLog'))
+    const miniLog = new MiniLog(configService.get('miniLog'))
     const folder2watch = path.join(process.cwd(), 'src')
 
     workspace.setFolder2Watch(folder2watch)
@@ -72,7 +72,7 @@ const setEnv = async (envList, cmd) => {
     try {
         panicCheckEnvList(envList)
         const environmentVariables = environmentVariable(envList)
-        const miniLog = new MiniLog(config.get('miniLog'))
+        const miniLog = new MiniLog(configService.get('miniLog'))
         const folder2watch = path.join(process.cwd(), 'src')
 
         workspace.setFolder2Watch(folder2watch)

package/src/cmd/tail-logs.js

@@ -9,14 +9,14 @@ const hashFolder = new HashFolder()
 const workspace = new Workspace(blindGuardian, hashFolder)
 
 module.exports = async function tailLogs(clientEmail) {
-    const config = require('config')
-    const miniLog = new MiniLog(config.get('miniLog'))
+    const configService = require('../service/ConfigService')
+    const miniLog = new MiniLog(configService.get('miniLog'))
     version()
     const folder2watch = path.join(process.cwd(), 'src')
     workspace.setFolder2Watch(folder2watch)
     blindGuardian.readConf()
 
-    const url = config.get('workspace').url
+    const url = configService.get('workspace').url
     workspace.setServerUrl(url)
     await workspace.init()
     await miniLog.connect(workspace.userEmail)

package/src/modules/vegvisir/VegvisirService.js

@@ -1,7 +1,7 @@
 const { default: axios } = require("../../../node_modules/axios/index");
 const BlindGuardian = require("../../service/BlindGuardian");
 const Http = require("../../service/Http");
-const config = require("config");
+const configService = require("../../service/ConfigService");
 const getWorkspace = require("../../util/getWorkspace");
 const writeGlobalWorkspaceConfig = require("./utils/writeGlobalWorkspaceConfig");
 
@@ -9,7 +9,7 @@ module.exports = class VegvisirService {
     constructor() {
         const blindGuardian = new BlindGuardian();
         this.http = new Http(blindGuardian);
-        this.config = config.get("vegvisir");
+        this.config = configService.get("vegvisir");
     }
 
     async listMyWorkspaces() {

package/src/modules/vegvisir/cmd/list.js

@@ -8,6 +8,7 @@ module.exports = async function list(cmdObj) {
     console.log("\tWorkspaces Disponíveis");
     console.log("=======================================\n");
     for (const workspace of workspaces) {
-        console.log("Workspace: ", workspace.name);
+        console.log(`Workspace: ${workspace.name}`);
+        console.log(`  Id: ${workspace.id}`);
     }
 };

package/src/service/AuthConfig.js

@@ -1,8 +1,5 @@
-const fs = require('fs')
-const os = require('os')
-const path = require('path')
 const axios = require('axios')
-const config = require('config')
+const configService = require('../service/ConfigService')
 const { exit } = require('process')
 
 const DEFAULT_ENV = 'hml'
@@ -10,7 +7,7 @@ const DEFAULT_ENV = 'hml'
 class AuthConfig { // abastract
 
     constructor() {
-        this.blindGuardianUrl = config.get('blindGuardian').url
+        this.blindGuardianUrl = configService.get('blindGuardian').url
     }
 
     getConfPath() {}
@@ -18,12 +15,12 @@ class AuthConfig { // abastract
     readConf() {}
 
     readClientCredentials() {
-        const credencialConfig = this.readConf()
+        const credentialConfig = this.readConf()
         let data
-        if (this._isOldProfileVersion(credencialConfig)) {
+        if (this._isOldProfileVersion(credentialConfig)) {
             data = {
-                client_id: credencialConfig.devUser,
-                client_secret: credencialConfig.devKey,
+                client_id: credentialConfig.devUser,
+                client_secret: credentialConfig.devKey,
                 grant_type: 'client_credentials'
             }
         }
@@ -31,8 +28,8 @@ class AuthConfig { // abastract
             const env = process.env.NODE_ENV || DEFAULT_ENV
             try {
                 data = {
-                    client_id: credencialConfig[env].devUser,
-                    client_secret: credencialConfig[env].devKey,
+                    client_id: credentialConfig[env].devUser,
+                    client_secret: credentialConfig[env].devKey,
                     grant_type: 'client_credentials'
                 }
             }
@@ -61,7 +58,7 @@ class AuthConfig { // abastract
             const url = `${this.blindGuardianUrl}/v1/o/auth`
             const options = {
                 headers : {
-                    'User-Agent': config.get('userAgent')
+                    'User-Agent': configService.get('userAgent')
                 }
             }
             const auth = await axios.post(url, clientCredentials, options)

package/src/service/BlindGuardian.js

@@ -1,17 +1,15 @@
-const fs = require('fs')
 const os = require('os')
 const path = require('path')
 const axios = require('axios')
-const config = require('config')
+const configService = require('../service/ConfigService')
 const { exit } = require('process')
-const AmeCredential = require('../util/UserLocalCredential')
 const UserLocalCredential = require('../util/UserLocalCredential')
 
 const DEFAULT_ENV = 'hml'
 
 class BlindGuardian {
     constructor() {
-        this.blindGuardianUrl = config.get('blindGuardian').url
+        this.blindGuardianUrl = configService.get('blindGuardian').url
     }
 
     /**
@@ -20,41 +18,40 @@ class BlindGuardian {
     getConfPath() {
         let configPath = path.resolve(
             os.homedir(),
-            config.get('signup').get('configFilePath')
+            configService.get('signup').get('configFilePath')
         )
 
         return configPath
     }
 
     readConf() {
-        const ameCredencial = new AmeCredential()
         if (
-            process.env.AME_CLI_CLIENT_ID &&
-            process.env.AME_CLI_CLIENT_SECRET
+            process.env.EITRI_CLI_CLIENT_ID &&
+            process.env.EITRI_CLI_CLIENT_SECRET
         ) {
             return {
-                devUser: process.env.AME_CLI_CLIENT_ID,
-                devKey: process.env.AME_CLI_CLIENT_SECRET,
+                devUser: process.env.EITRI_CLI_CLIENT_ID,
+                devKey: process.env.EITRI_CLI_CLIENT_SECRET,
             }
         }
         return new UserLocalCredential()._getNewConfigPath()
     }
 
     readClientCredentials() {
-        const credencialConfig = this.readConf()
+        const credentialConfig = this.readConf()
         let data
-        if (this._isOldProfileVersion(credencialConfig)) {
+        if (this._isOldProfileVersion(credentialConfig)) {
             data = {
-                client_id: credencialConfig.devUser,
-                client_secret: credencialConfig.devKey,
+                client_id: credentialConfig.devUser,
+                client_secret: credentialConfig.devKey,
                 grant_type: 'client_credentials',
             }
         } else {
             const env = process.env.NODE_ENV || DEFAULT_ENV
             try {
                 data = {
-                    client_id: credencialConfig[env].devUser,
-                    client_secret: credencialConfig[env].devKey,
+                    client_id: credentialConfig[env].devUser,
+                    client_secret: credentialConfig[env].devKey,
                     grant_type: 'client_credentials',
                 }
             } catch (e) {
@@ -80,7 +77,7 @@ class BlindGuardian {
             const url = `${this.blindGuardianUrl}/v1/o/auth`
             const options = {
                 headers: {
-                    'User-Agent': config.get('userAgent'),
+                    'User-Agent': configService.get('userAgent'),
                 },
             }
             const auth = await axios.post(url, clientCredentials, options)
@@ -94,7 +91,7 @@ class BlindGuardian {
                 if (e.response && e.response.status === 403) {
                     throw new Error('Credencial inválida')
                 }
-                throw new Error('Por favor tente novamente mais tarde.')
+                throw new Error('AuthError: Por favor tente novamente mais tarde.')
             }
         }
     }
@@ -105,7 +102,7 @@ class BlindGuardian {
             const url = `${this.blindGuardianUrl}/v1/o/users`
             const options = {
                 headers: {
-                    'User-Agent': config.get('userAgent'),
+                    'User-Agent': configService.get('userAgent'),
                 },
             }
             const auth = await axios.post(url, userVo, options)

package/src/service/ConfigService.js

@@ -1,15 +1,8 @@
 const config = require('config')
-const {workspace} = require('../service/Workspace')
 
 class ConfigService {
     constructor() {
         this.configuration = config
-        if(workspace.isRollout()) {
-            this.configuration = require(`../../config/${process.env.NODE_ENV}`)
-            this.configuration.get = (key) => {
-                return this.configuration[key]
-            }
-        }
     }
 }
 

package/src/service/CredentialsService.js

@@ -1,10 +1,10 @@
-const config = require('config')
+const configService = require('./ConfigService')
 
 class CredentialsService {
 
     constructor(workspace) {
         this.workspace = workspace
-        this.conf = config.get('workspace')
+        this.conf = configService.get('workspace')
     }
 
     async upsert(args) {

package/src/service/EitriAppManager.js

@@ -1,10 +1,10 @@
-const config = require('config')
+const configService = require('./ConfigService')
 const Http = require("./Http")
 
 class EitriAppManager {
     constructor(blindGuardian) {
         this.http = new Http(blindGuardian)
-        this.config = config.get('eitriManager')
+        this.config = configService.get('eitriManager')
         this.managerBaseURL = this.config.url
     }
 

package/src/service/Http.js

@@ -1,12 +1,12 @@
 const axiosCookieJarSupport = require('axios-cookiejar-support').default
 const FileCookieStore = require('tough-cookie-file-store').FileCookieStore
 const CookieJar = require('tough-cookie').CookieJar
-const { v4: uuidv4 } = require('uuid')
 
 const os = require('os')
 const path = require('path')
 const getCliVersion = require('../util/getCliVersion')
 const getWorkspace = require('../util/getWorkspace')
+const { randomUUID } = require('crypto')
 
 const filePath = path.join(os.homedir(), './.eitri.cookie.json')
 const jar = new CookieJar(new FileCookieStore(filePath))
@@ -80,7 +80,7 @@ class Http {
     }
 
     async _getHeader(url) {
-        const tid = uuidv4()
+        const tid = randomUUID()
         const headers = {
             Authorization: `Bearer ${this.token.accessToken}`,
             'X-Transaction-Id': tid,
@@ -121,7 +121,7 @@ class Http {
 
     _delete(url, options, headers) {
         return new Promise((resolve, reject) => {
-            this.__delete(url, options, headers, resolve, reject)
+            this.__delete(url, options || {}, headers, resolve, reject)
         })
     }
 

package/src/service/InviteService.js

@@ -1,10 +1,10 @@
-const config = require('config')
+const configService = require('./ConfigService')
 
 class InviteService {
 
     constructor(workspace) {
         this.workspace = workspace
-        this.conf = config.get('managerApi')
+        this.conf = configService.get('managerApi')
     }
 
     async findAllPending() {