fix: restore signup via cli

Author: Unitech

lib/API/pm2-plus/PM2IO.js

@@ -126,7 +126,7 @@ module.exports = class PM2ioHandler {
           if (res !== true) {
             this.authenticate()
           } else {
-            this.createBucket(this.createBucketHandler)
+            this.createBucket(this.createBucketHandler.bind(this))
           }
         }).catch(err => {
           console.error(`${cst.PM2_IO_MSG_ERR} Failed to create to the bucket: ${err.message}`)
@@ -173,7 +173,7 @@ module.exports = class PM2ioHandler {
           }
           const targetURL = `https://app.pm2.io/#/bucket/${bucket._id}`
           console.log(`${cst.PM2_IO_MSG} Please follow the popup or go to this URL :`, '\n', '    ', targetURL)
-          open(targetURL)
+          this.open(targetURL)
           return process.exit(0)
         })
       }
@@ -230,7 +230,7 @@ module.exports = class PM2ioHandler {
 
   static createBucketHandler (err, bucket) {
     if (err) {
-      console.error(`${cst.PM2_IO_MSG_ERR} Failed to connect to the bucket: ${err.message}`)
+      console.trace(`${cst.PM2_IO_MSG_ERR} Failed to connect to the bucket: ${err.message}`)
       if (bucket) {
         console.error(`${cst.PM2_IO_MSG_ERR} You can retry using: pm2 plus link ${bucket.secret_id} ${bucket.public_id}`)
       }
@@ -241,17 +241,13 @@ module.exports = class PM2ioHandler {
       return process.exit(0)
     }
     console.log(`${cst.PM2_IO_MSG} Successfully connected to bucket ${bucket.name}`)
-    console.log(`${cst.PM2_IO_MSG} You can use the web interface over there: https://app.pm2.io/#/bucket/${bucket._id}`)
+    var targetURL = `https://app.pm2.io/#/bucket/${bucket._id}`
+    console.log(`${cst.PM2_IO_MSG} You can use the web interface over there: ${targetURL}`)
+    this.open(`https://app.pm2.io/`)
     return process.exit(0)
   }
 
   static createBucket (cb) {
-    console.log(`${cst.PM2_IO_MSG} It seems that you don't have any bucket to monitor your app currently.`)
-    console.log(`${cst.PM2_IO_MSG} Note: A bucket is like a organization in PM2 Plus where you connect multiples servers to it.`)
-    // currently we redirect on the UI
-    console.log(`${cst.PM2_IO_MSG} We have disabled new bucket creation via the cli for now. You should go to https://app.pm2.io to continue`)
-    return process.exit(0)
-
     console.log(`${cst.PM2_IO_MSG} By default we allow you to trial PM2 Plus for 14 days without any credit card.`)
     // do not create a bucket by default, we need their authorization
     promptly.confirm(`${cst.PM2_IO_MSG} Do you want to create a new bucket and launch the trial ? (y/n)`, (err, value) => {
@@ -263,7 +259,8 @@ module.exports = class PM2ioHandler {
       this.io.bucket.create({
         name: 'PM2 Plus Monitoring'
       }).then(res => {
-        const bucket = res.data
+        const bucket = res.data.bucket
+
         this.io.bucket.billing.startTrial(bucket._id, {
           plan: 'plus_8'
         }).then(res => {
@@ -345,25 +342,11 @@ module.exports = class PM2ioHandler {
       this.io.user.retrieve().then(res => {
         const user = res.data
 
-        if (typeof user.email_token === 'string') {
-          console.log(`${cst.PM2_IO_MSG} You need to validate your email, you should have received an email at ${user.email}`)
-          console.log(`${cst.PM2_IO_MSG} You can also contact us to get help: [email protected]`)
-          process.stdout.write(`${cst.PM2_IO_MSG} Waiting for validation `)
-          const interval = setInterval(() => {
-            this.io.user.retrieve().then(res => {
-              const tmpUser = res.data
-              if (tmpUser.email_token === null) {
-                console.log(`\n${cst.PM2_IO_MSG} Successfully validated`)
-                clearInterval(interval)
-                this.connectToBucket(this.createBucketHandler)
-              } else {
-                process.stdout.write('.')
-              }
-            })
-          }, 2000)
-        } else {
-          this.connectToBucket(this.createBucketHandler)
-        }
+        this.io.user.retrieve().then(res => {
+          const tmpUser = res.data
+          console.log(`${cst.PM2_IO_MSG} Successfully validated`)
+          this.connectToBucket(this.createBucketHandler.bind(this))
+        })
       })
     })
   }

lib/API/pm2-plus/auth-strategies/WebAuth.js

@@ -124,9 +124,6 @@ module.exports = class WebStrategy extends AuthStrategy {
       res.write(`
         <head>
           <script>
-            setTimeout(function () {
-              window.location = 'https://pm2.io/doc/en/plus/quick-start/'
-            }, 5000)
           </script>
         </head>
         <body>