eitri-cli 1.7.0-beta.2 → 1.7.0-beta.4

package/package.json

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

package/src/cmd/push-version.js

@@ -19,6 +19,7 @@ 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')
 
 module.exports = async function pushVersion(cmdObj) {
     try {
@@ -29,6 +30,9 @@ module.exports = async function pushVersion(cmdObj) {
         return
     }
 
+    const {slug: miniConfSlug} = workspace.getMiniConf()
+    await vegvisirService.isCurrentWorkspaceOwnedByUser(miniConfSlug)
+
     const separator = '======================================================================='
 
     try {

package/src/cmd/start.js

@@ -7,7 +7,6 @@ const TrackingService = require('../service/TrackingService')
 const fs = require('fs')
 const config = require('../service/ConfigService')
 const handleStartServer = require('../service/StarterService')
-const inquirer = require('inquirer')
 const TrackingEitriAnalytics = require('../service/TrackingEitriAnalytics')
 const VegvisirService = require('../modules/vegvisir/VegvisirService')
 const UserLocalCredential = require('../util/UserLocalCredential')
@@ -16,11 +15,14 @@ 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()
+const vegvisirService = new VegvisirService(workspace)
 const debug = require('debug')('eitri:start')
 
 module.exports = async function start(args) {
     debug("Iniciando start()")
+    const miniConf = workspace.getMiniConf()
+
+    await vegvisirService.isCurrentWorkspaceOwnedByUser(miniConf.slug)
     
     const separator = '======================================================================='
     let displayFriendlyErrorAtEnd = ""
@@ -48,7 +50,6 @@ module.exports = async function start(args) {
             workspace.setResourceFolder2Watch(resourceFolders2watch)
         }
 
-        const miniConf = workspace.getMiniConf()
         await vegvisirService.check(miniConf.slug)
         debug("Fim da busca e validação do EitriAppConf", {miniConf})
         
@@ -57,20 +58,6 @@ module.exports = async function start(args) {
         debug("Informações do setupResult do workspace", {setupResult})
 
         const target = setupResult.target.name
-        
-        let targetConfig = {}
-
-        if(args.listTargetConfigs) {
-            await listTargetConfigs(target)
-            process.exit(1)
-        }
-
-        debug("Verificando se há targetConfig nos argumentos", {targetConfig: args?.targetConfig})
-        if(args.targetConfig) {
-            targetConfig = await askTargetConfig(args, target)
-        } else {
-            targetConfig = await getDefaultTargetConfig(target)
-        }
 
         blindGuardian.readConf()
         const qrCodeUrl = config.get('qrCode').url
@@ -124,8 +111,8 @@ module.exports = async function start(args) {
             ...args,
             deepLinks: loadedTarget?.deepLinks || []
         }
-        debug("Iniciando servidor", {argsWithDeeplinks, trackingService, watcher, workspace, target, targetConfig, platform})
-        await handleStartServer(argsWithDeeplinks, trackingService, watcher, workspace, target, targetConfig, platform)
+        debug("Iniciando servidor", {argsWithDeeplinks, trackingService, watcher, workspace, target, setupResult, platform})
+        await handleStartServer(argsWithDeeplinks, trackingService, watcher, workspace, target, setupResult, platform)
         debug("Servidor iniciado", {loadedTarget})
 
         TrackingEitriAnalytics.sendEvent({
@@ -175,34 +162,3 @@ module.exports = async function start(args) {
         }
     }
 }
-
-async function askTargetConfig(args, target) {
-    const availableConfigs = await workspace.getTargetConfig(args.targetConfig, target)
-
-    console.log(`Utilizando configuração: ${availableConfigs[0].id}`)
-    return availableConfigs[0]
-   
-}
-
-async function getDefaultTargetConfig(target) {
-    const configs = await workspace.getTargetConfig('default', target)
-    return configs[0]
-}
-
-async function listTargetConfigs(target) {
-    const availableConfigs = await workspace.getAllTargetConfigs(target)
-
-    const availableConfigsIds = availableConfigs.map(config => config.id)
-
-    const res = await inquirer.prompt([
-        {
-            name: 'accepted',
-            type: 'rawlist',
-            message: 'Configurações disponíveis:',
-            choices: availableConfigsIds
-        }
-    ]).then(input => input)
-
-    const config = availableConfigs.find(cfg => cfg.id === res.accepted)
-    console.log(`Utilize o comando --target-config ${config.id} para iniciar o Eitri-App com a configuração desejada`)
-}

package/src/model/Target.js

@@ -1,15 +1,4 @@
 /* eslint-disable no-unused-vars */
-class TargetConfig {
-    constructor() {
-        this.id = ''
-        this.libUrl = ''
-        this.runnerUrl = ''
-        this.bootstrapBaseUrl = ''
-        this.askUserDataApiUrl = ''
-        this.default = ''
-    }
-}
-
 class MiniAppBoilerplateList {
     constructor() {
         this.name = ''
@@ -57,10 +46,6 @@ module.exports = class Target {
         */
         this.platform= ''
         /**
-        *  @type {TargetConfig[]}
-        */
-        this.targetConfig= ''
-        /**
         * @type {string}
         */
         this.sdkSupport= ''

package/src/modules/vegvisir/VegvisirService.js

@@ -9,6 +9,8 @@ const {validateUUID} = require("../../util/GenericUtils");
 const path = require("path");
 const fs = require('fs')
 const debug = require('debug')('eitri:VegvisirService')
+const inquirer = require("inquirer");
+const chalk = require("chalk");
 
 module.exports = class VegvisirService {
     constructor() {
@@ -134,4 +136,57 @@ module.exports = class VegvisirService {
             return process.exit(1)
         }
     };
+
+    async isCurrentWorkspaceOwnedByUser(slug = "") {
+        const localWorkspace = await this.getWorkspace()
+        if (!localWorkspace?.id) {
+            return
+        }
+
+        const workspacesRemote = await this.listMyWorkspaces()
+
+        const isOwner = workspacesRemote.find(w => w?.id === localWorkspace?.id)
+        if (isOwner) return
+
+        debug("Workspace local é diferente do remoto para esse usuário", {localWorkspace, workspacesRemote})
+
+        const reseted = await this.redefineWorkspace(slug)
+        if (reseted) return debug("Workspace validado com sucesso. Continuando...")
+
+        console.log("Parece que você está usando um workspace de outro usuário. Como não foi redefinido, não podemos prosseguir.")
+        process.exit(1)
+    };
+
+    async redefineWorkspace(slug = "") {
+        const question1 = "\n Deseja redefinir o seu workspace?"
+        const question2 = chalk.italic(" O workspace atual pertence a outro usuário, portanto, é necessária a redefinição.")
+        const question3 = chalk.italic(" Atenção! A redefinição do workspace poderá acarretar na alteração do tema.")
+
+        const res = await inquirer.prompt([
+            {
+                name: "confirm",
+                type: "confirm",
+                message:
+                    question1 + "\n" + question2 + "\n" + question3 + "\n",
+                default: true,
+            },
+        ]);
+
+        if (res.confirm) {
+            const workspaceGlobalPath = path.resolve(
+                os.homedir(),
+                ".eitri",
+                "workspaces",
+                "workspace"
+            );
+
+            if (fs.existsSync(workspaceGlobalPath)) {
+                fs.unlinkSync(workspaceGlobalPath);
+            }
+
+            await this.check(slug)
+        }
+
+        return res.confirm
+    }
 };

package/src/service/Emulator/IOSEmulatorService.js

@@ -1,5 +1,6 @@
 const util = require('util');
 const exec = util.promisify(require("child_process").exec)
+const inquirer = require("inquirer");
 
 module.exports = class IOSEmulatorService {
     

package/src/service/StarterService.js

@@ -4,7 +4,7 @@ const WebStarterFactory = require('./factories/WebStarterFactory')
 
 
 const strategy = require('./GATrackingStrategy')
-async function handleStartServer(args, trackingService, watcher, workspace, factoryName, targetConfig, platform) {
+async function handleStartServer(args, trackingService, watcher, workspace, factoryName, setupConfig, platform) {
     const factories = {
         mobile: new QRCodeStarterFactory(),
         web: new WebStarterFactory(),
@@ -24,7 +24,7 @@ async function handleStartServer(args, trackingService, watcher, workspace, fact
     }
 
 
-    const starter = await factory.create(args, trackingService, watcher, workspace, targetConfig)
+    const starter = await factory.create(args, trackingService, watcher, workspace, setupConfig)
     await starter.startServer()
 }
 

package/src/service/Workspace.js

@@ -93,49 +93,6 @@ class Workspace {
         return this.resourceFolders2watch;
     }
 
-
-    async getTargetConfig(id, target) {
-        try {
-            const configs = await this.getAllTargetConfigs(target);
-            const config = configs.find((cfg) => cfg.id === id);
-
-            if (!config) {
-                console.log(
-                    `TargetConfig [${target}] não encontrado, utilize o comando --list-target-configs para ver as configurações disponíveis`
-                );
-                process.exit(1);
-            }
-
-            return [config];
-        } catch (e) {
-            console.log(`Erro ao buscar configuração: ${e}`);
-            if (process.env.NODE_ENV !== 'test') {
-                process.exit(1);
-            }
-        }
-    }
-
-    async getAllTargetConfigs(applicationName) {
-        // const targetUrl = `${this.config.url}${this.config.targetPath}?name=${target}`
-        try {
-            // const response = await axios.get(targetUrl)
-            // const fullTarget = response.data
-
-            const targets = await this.availableTargets();
-            const fullTarget = targets.filter(
-                (a) => a.name === applicationName
-            );
-            const configs = fullTarget[0].targetConfig;
-
-            return configs;
-        } catch (e) {
-            console.log(`Erro ao buscar configuração: ${e}`);
-            if (process.env.NODE_ENV !== 'test') {
-                process.exit(1);
-            }
-        }
-    }
-
     getTarget() {
         if (!this.target) {
             console.warn("Target não foi detectado no setup()");
@@ -357,51 +314,6 @@ class Workspace {
         return Base64.encode(JSON.stringify(miniAppData));
     }
 
-    async getWorkspaceURL(args, targetConfig) {
-        args = args || {};
-        const cookie = await this.http.getCookieSession(this.serverUrl);
-        let paramOrderId = "";
-        let paramShareId = "";
-        let cid;
-        const viewHtml = (args.view || "index") + ".html";
-        const miniAppConf = this.getMiniConf();
-        const data = {
-            publicKey: miniAppConf["public-key"],
-            metadata: miniAppConf["metadata"],
-            slug: miniAppConf["slug"],
-            title: miniAppConf["title"],
-        };
-        if (args.orderId) {
-            paramOrderId = "&orderId=" + encodeURIComponent(args.orderId);
-        }
-        if (args.shareId) {
-            paramShareId = "&shareId=" + encodeURIComponent(args.shareId);
-        }
-        if (args.initializationParams) {
-            data.initializationParams = args.initializationParams;
-        }
-        const encodedData = Base64.encode(JSON.stringify(data));
-        if (cookie) {
-            cid = Base64.encode(cookie.cookieString());
-        }
-
-        if (!targetConfig.bootstrapBaseUrl) {
-            throw new Error(
-                "Workspace.getWorkspaceURL.internalError#missingBootstrapBaseUrl"
-            );
-        }
-
-        let miniAppUrl = `${this.getBootstrapURL(
-            targetConfig.bootstrapBaseUrl
-        )}/${this.config.basePath || "workspace"
-            }/user/${(await vegvisirService.getWorkspace()).id}/${viewHtml}?data=${encodedData}${paramOrderId}${paramShareId}&devmode=true`;
-
-        if (cid) {
-            miniAppUrl = miniAppUrl + "&cid=" + cid;
-        }
-        return miniAppUrl;
-    }
-
     /**
      *
      * @param {string} bootstrapBaseUrl
@@ -419,13 +331,11 @@ class Workspace {
         return bootstrapBaseUrl;
     }
 
-    async getNewWorkspaceURL(args, targetConfig) {
-        const qrCodeConfig = await this.getQrCodeConfig(args, targetConfig);
+    async getNewWorkspaceURL(args, setupConfig) {
+        const qrCodeConfig = await this.getQrCodeConfig(args, setupConfig);
         const stateData = await this.saveShareState(qrCodeConfig);
         const stateId = stateData.id;
-        const miniAppUrl = `${this.qrCodeUrl}/${stateId}?environment=${(process.env.NODE_ENV === "hmlv2" ? "hml" : process.env.NODE_ENV) ||
-            "hml"
-            }`;
+        const miniAppUrl = `${this.qrCodeUrl}/${stateId}`;
         return {
             miniAppConf: {
                 ...qrCodeConfig,
@@ -448,7 +358,7 @@ class Workspace {
         return response.data;
     }
 
-    async getQrCodeConfig(args, targetConfig) {
+    async getQrCodeConfig(args, setupConfig) {
         args = args || {};
         const cookie = await this.http.getCookieSession(this.serverUrl);
         let cid;
@@ -468,10 +378,7 @@ class Workspace {
             slug: miniAppConf["slug"],
             title: miniAppConf["title"],
             permissions: miniAppConf["permissions"],
-
-            // Se nao enviarmos essa url pronta, o superapp tera que monta-la
-            // Essa url chama a funcao users.js do workspace-api
-            miniAppBootstrapUrl: await this.getWorkspaceURL(args, targetConfig),
+            miniAppBootstrapUrl: this.getBootstrapURL(setupConfig.eitriAppBootstrapURL),
             initializationParams,
             orderId,
             view,

package/src/service/factories/QRCodeStarterFactory.js

@@ -9,29 +9,20 @@ function QRCodeStarter(
     trackingService,
     watcher,
     workspace,
-    targetConfig
+    setupConfig
 ) {
     this.args = args;
     this.trackingService = trackingService;
     this.watcher = watcher;
     this.workspace = workspace;
-    this.targetConfig = targetConfig;
+    this.setupConfig = setupConfig;
 
     this.startServer = async function () {
-        let fullUrl;
-        if (this.args.oldQrcode) {
-            fullUrl = await this.workspace.getWorkspaceURL(
+        const workspaceURLConfig = await this.workspace.getNewWorkspaceURL(
                 this.args,
-                this.targetConfig
+                this.setupConfig
             );
-        } else {
-            const { miniAppUrl } = await this.workspace.getNewWorkspaceURL(
-                this.args,
-                this.targetConfig
-            );
-            fullUrl = miniAppUrl;
-        }
-
+        const fullUrl = workspaceURLConfig.miniAppUrl
         if (this.args.verbose) {
             console.log(`QrCodeUrl: ${fullUrl}`);
         }
@@ -130,14 +121,14 @@ function QRCodeContentFactory() {
         trackingService,
         watcher,
         workspace,
-        targetConfig
+        setupConfig
     ) {
         return new QRCodeStarter(
             args,
             trackingService,
             watcher,
             workspace,
-            targetConfig
+            setupConfig
         );
     };
 }

package/test/service/Workspace.test.js

@@ -131,126 +131,6 @@ describe('Workspace', () => {
             ])
         })
     })
-
-    describe('.getWorkspaceURL()', () => {
-        beforeEach(() => {
-            workspace.userEmail = 'dev@calindra.com.br'
-            workspace.target = {
-                bootstrapBaseUrl: 'http://minhaconta.base.url'
-            }
-            workspace.folder2watch = path.resolve(
-                __dirname,
-                '..',
-                '_fixtures',
-                'src'
-            )
-        })
-
-        it('retorna a url do workspace do usuario apontando para index.html', async () => {
-            let url = await workspace.getWorkspaceURL('', {bootstrapBaseUrl: 'http://minhaconta.base.url'})
-            expect(url).toContain('/index.html?')
-        })
-
-        it('Deve retornar queries string ', async () => {
-            let args = {
-                initializationParams: {
-                    foo: 'bar'
-                }
-            }
-            let urlValue = await workspace.getWorkspaceURL(args,  {bootstrapBaseUrl: 'http://minhaconta.base.url'})
-            console.log(urlValue)
-            let query = url.parse(urlValue, true).query
-            let dataString = Buffer.from(query.data, 'base64').toString()
-            let data = JSON.parse(dataString)
-            expect(data.initializationParams).toMatchObject(args.initializationParams)
-        })
-
-        it('retorna a url do workspace do usuario apontando para OrderDetails.html', async () => {
-            let url = await workspace.getWorkspaceURL({ view: 'OrderDetails' },  {bootstrapBaseUrl: 'http://minhaconta.base.url'})
-            expect(url).toContain('/OrderDetails.html?')
-        })
-
-        it('retorna a url do workspace do usuario com o parametro order id', async () => {
-            let url = await workspace.getWorkspaceURL({
-                view: 'OrderDetails',
-                orderId: 'e08a2547-b8d6-4437-91a7-0bc67987689d',
-            },  {bootstrapBaseUrl: 'http://minhaconta.base.url'})
-            expect(url).toContain(
-                'orderId=e08a2547-b8d6-4437-91a7-0bc67987689d'
-            )
-        })
-    })
-    describe('.getTargetConfig() & .getAllTargetConfigs()', () => {
-        const target = 'CALINDRA_MOBILE'
-        const res = [
-            {
-                id: 7,
-                name: 'CALINDRA_MOBILE',
-                minimumCliVersion: '1.16.5',
-                boilerplateUrl: 'https://github.com/Calindra/servless-backend-template.git',
-                superAppClientLibName: 'eitri-app-client',
-                componentsLibName: 'eitri-app-components',
-                description: 'CALINDRA_MOBILE',
-                status: 'ACTIVE',
-                platform: 'mobile',
-                targetConfig: [
-                    {
-                        id: 'default',
-                        libUrl: 'https://www.npmjs.com/package/eitri-app-client',
-                        runnerUrl: 'https://dev.eitri.calindra.com.br/app/',
-                        bootstrapBaseUrl: 'https://dev.eitri.calindra.com.br',
-                        askUserDataApiUrl: 'https://dev.eitri.calindra.com.br/miniapp-manager-api/o/mini-apps/:slug/token'
-                    },
-                    {
-                        id: 'ws',
-                        libUrl: 'https://www.npmjs.com/package/eitri-app-client',
-                        runnerUrl: 'https://dev.eitri.calindra.com.br/app/',
-                        bootstrapBaseUrl: 'http://localhost:3333',
-                        askUserDataApiUrl: 'https://dev.eitri.calindra.com.br/miniapp-manager-api/p/mini-apps/:slug/token/foundry'
-                    }
-                ],
-                default: true
-            }
-        ]
-
-        beforeEach(() => {
-            nock.cleanAll()
-            nock('https://dev.eitri.calindra.com.br')
-            .get(/\/eitri-manager-api\/p\/users\/self\/targets/).reply(200, res)
-        })
-
-        it('deve receber a configuração correta', async () => {
-            const config = await workspace.getTargetConfig('default', target)
-            expect(config[0]).toStrictEqual({
-                id: 'default',
-                libUrl: 'https://www.npmjs.com/package/eitri-app-client',
-                runnerUrl: 'https://dev.eitri.calindra.com.br/app/',
-                bootstrapBaseUrl: 'https://dev.eitri.calindra.com.br',
-                askUserDataApiUrl: 'https://dev.eitri.calindra.com.br/miniapp-manager-api/o/mini-apps/:slug/token'
-            })
-
-        }
-        )
-        it('deve retornar todos os configs', async () => {
-            const config = await workspace.getAllTargetConfigs(target)
-            expect(config).toMatchObject([
-                {
-                    id: 'default',
-                    libUrl: 'https://www.npmjs.com/package/eitri-app-client',
-                    runnerUrl: 'https://dev.eitri.calindra.com.br/app/',
-                    bootstrapBaseUrl: 'https://dev.eitri.calindra.com.br',
-                    askUserDataApiUrl: 'https://dev.eitri.calindra.com.br/miniapp-manager-api/o/mini-apps/:slug/token'
-                },
-                {
-                    id: 'ws',
-                    libUrl: 'https://www.npmjs.com/package/eitri-app-client',
-                    runnerUrl: 'https://dev.eitri.calindra.com.br/app/',
-                    bootstrapBaseUrl: 'http://localhost:3333',
-                    askUserDataApiUrl: 'https://dev.eitri.calindra.com.br/miniapp-manager-api/p/mini-apps/:slug/token/foundry'
-                }
-            ])
-        })  
-    })
     
     describe('.availableTargets()', () => {