eitri-cli 1.0.3 → 1.0.5-beta.4

package/bitbucket-pipelines.yml

@@ -0,0 +1,15 @@
+image: node:14
+pipelines:
+  default:
+    - step: &npmPublish
+        name: Publicação no NPM
+        caches:
+          - node
+        script:
+          - yarn
+          - echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc
+          - node publisher.js
+
+  branches:
+    master:
+      - step: *npmPublish

package/config/dev.js

@@ -82,9 +82,7 @@ const config = {
         url: "https://analytics.dev.eitri.calindra.com.br/analytics/event/cli"
     },
     managerFront: {
-        url: `https://admin.${HOST}`,
-        managerCredential: "/settings/manager-credential",
-        cliGenerateLoginCredential: "/settings/cli-generate-credential",
+        url: `https://admin.${HOST}`
     }
 }
 

package/config/k8s-eitri.js

@@ -83,9 +83,7 @@ const config = {
         url: "https://analytics.dev.eitri.calindra.com.br/analytics/event/cli"
     },
     managerFront: {
-        url: `https://admin.k8s.eitri.calindra.com.br`,
-        managerCredential: "/settings/manager-credential",
-        cliGenerateLoginCredential: "/settings/cli-generate-credential",
+        url: `https://admin.k8s.eitri.calindra.com.br`
     }
 }
 

package/config/loc-eitri.js

@@ -83,9 +83,7 @@ const config = {
         url: "https://analytics.dev.eitri.calindra.com.br/analytics/event/cli"
     },
     managerFront: {
-        url: `https://admin.${HOST}`,
-        managerCredential: "/settings/manager-credential",
-        cliGenerateLoginCredential: "/settings/cli-generate-credential",
+        url: `https://admin.${HOST}`
     }
 }
 

package/config/prod-eitri.js

@@ -83,9 +83,7 @@ const config = {
         url: "https://analytics.dev.eitri.calindra.com.br/analytics/event/cli"
     },
     managerFront: {
-        url: `https://admin.eitri.calindra.com.br`,
-        managerCredential: "/settings/manager-credential",
-        cliGenerateLoginCredential: "/settings/cli-generate-credential",
+        url: `https://admin.eitri.calindra.com.br`
     }
 }
 

package/index.js

@@ -128,7 +128,7 @@ const run = async () => {
         .description('Desinstala a versao antiga e instala a mais nova')
         .action(() => {
             require('child_process').execSync(
-                'npm uninstall -g eitri && npm i eitri -g',
+                'npm uninstall -g eitri-cli && npm i eitri-cli -g',
                 {stdio: 'inherit'}
             )
         })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eitri-cli",
-  "version": "1.0.3",
+  "version": "1.0.5-beta.4",
   "description": "Command Line Interface to make \"eitri app\" with code and fire.",
   "main": "index.js",
   "bin": {
@@ -36,6 +36,7 @@
     "cli-progress": "^3.4.0",
     "commander": "^9.2.0",
     "config": "^3.3.0",
+    "cors": "^2.8.5",
     "emojilib": "^2.4.0",
     "express": "^4.17.3",
     "express-rate-limit": "^6.3.0",

package/src/cmd/login.js

@@ -16,12 +16,13 @@ module.exports = async function login(args) {
             },
         ])
 
-        const urlAdminManagerCredential = `${config.get("managerFront").url}${config.get("managerFront").cliGenerateLoginCredential}`
         const res = Server.startCliLogin()
-        const urlAdminManagerCredentialWithParams = `${urlAdminManagerCredential}?cli_login=true&redirect_url=http://${res?.host}:${res?.port}/cli-login`
+        
+        const urlAdminManagerCredential = `${config.get("managerFront").url}`
+        const urlAdminManagerCredentialWithParams = `${urlAdminManagerCredential}?loginType=EITRI_CLI&port=${res?.port}`
+        
         let portalOpenMessage = ""
 
-
         if (openPortalAnwser) {
             console.log("\n", "Abrindo o portal...")
             try {

package/src/cmd/push-version.js

@@ -96,8 +96,6 @@ ${await targetService.getAppConfExampleSnippet()}
         console.log('\x1b[1mdisponível no Eitri-console para aprovação\x1b[0m');
         console.log(separator)
 
-
-        await track(miniConf, start)
         await TrackingEitriAnalytics.sendEvent({
             command: "push-version",
             success: true,
@@ -122,7 +120,6 @@ ${await targetService.getAppConfExampleSnippet()}
             console.log(`\x1b[1m\x1b[31mNão será possível continuar por enquanto. A forja encontrou um erro.\x1b[0m`);
         }
 
-        await trackingService.sendError(e)
         await TrackingEitriAnalytics.sendEvent({
             command: "push-version",
             success: false,

package/src/service/Server.js

@@ -11,6 +11,7 @@ const TERMINAL_PRINTER_NAME = 'terminal'
 let serverInstance
 const requestListenerHelper  = require('../helpers/request-listener-helper')
 const CliLogin = require('./CliLogin')
+const cors = require("cors")
 
 
 const expressRateLimiter = rateLimit({
@@ -223,7 +224,10 @@ class Server {
             }
         })
 
-        serverInstance.get('/cli-login', async (req, res) => {
+        const myRouteOptions = {
+            origin: '*',
+        }
+        serverInstance.get('/cli-login', cors(myRouteOptions) ,async (req, res) => {
             const {email, credential} = req?.query || {}
             res.send('hello world')
             await new CliLogin().saveCredentials({

package/bitbucket-pipelines.toBeChanged.yml

@@ -1,64 +0,0 @@
-image: node:14
-pipelines:
-  default:
-    - step: &runDitto
-        name: Run Ditto
-        script:
-          - pipe: atlassian/trigger-pipeline:4.2.1
-            variables:
-              BITBUCKET_USERNAME: $BITBUCKET_USERNAME
-              BITBUCKET_APP_PASSWORD: $BITBUCKET_APP_PASSWORD
-              REPOSITORY: "ditto-e2e"
-              BRANCH_NAME: "develop"
-              PIPELINE_VARIABLES: >
-                [{
-                  "key": "AME_APP_TOOLS_BRANCH",
-                  "value": "$BITBUCKET_BRANCH"
-                }]
-    - step: &test
-        name: Construção e teste
-        caches:
-          - node
-        script:
-          - npm i ame-app-tools -g
-          - echo $USER_AME_CONF > ~/.ame.conf.js
-          - yarn && yarn test-ame
-    - step: &syncGithub
-        name: Sincronizando Github
-        script:
-          - git fetch --unshallow || true # Ignorar erros, por exemplo em casos em que a branch nao exista
-          - git remote add github git@github.com:AmeDigital/$BITBUCKET_REPO_SLUG.git
-          - git pull github $BITBUCKET_BRANCH  || true # Ignorar erros, por exemplo em casos em que a branch nao exista
-          - git push github $BITBUCKET_BRANCH:$BITBUCKET_BRANCH
-          - git push origin $BITBUCKET_BRANCH:$BITBUCKET_BRANCH
-    - step: &npmPublish
-        name: Publicação no NPM
-        caches:
-          - node
-        script:
-          - yarn
-          - echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc
-          - node publisher.js
-
-  branches:
-    "**":
-      - parallel:
-          - step: *test
-          - step: *runDitto
-
-      # A logica do publisher.js so permitira publicar alphas e betas nas feature branches
-      - step: *npmPublish
-    master:
-      - step: *test
-      - step: *npmPublish
-      - step:
-          name: Documentação
-          caches:
-            - node
-            - pip
-          script:
-            - cd docsify
-            - curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
-            - unzip -qq awscliv2.zip
-            - ./aws/install
-            - aws s3 --region "us-east-1" sync . s3://ame-app-tools-documentation --cache-control "public, max-age=0" --delete --acl public-read