neetodeploy 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38aaafe1332d72299302a1e8e23b51c9bb331247855747ff89447a78e096c3db
-  data.tar.gz: de0682177ba35603b9a324557a7e3a1447595815895d01ce0b02790991e74236
+  metadata.gz: 57fdd1e09457ce272efda43c36489b14a986c28541901a1f2663a69e8252d89f
+  data.tar.gz: 1f7db1e2c215d6b169cf93833972f510b349e27a55a137bac87b22441c70bbb2
 SHA512:
-  metadata.gz: 61c4a3349bdcb2adea201d5df0111a4299532b4693280ad59466b827d0b6b6f4e96133671d65933de9ef9e1f06a04a63dcc89afca2dda50b0f41fd9db2aea4b6
-  data.tar.gz: 76de2334e8b337aff37239e8e167e27e05d75a6a6112e3b15e6e9480229a9c1d22ccc1dd9b70c6124408578f336df1047b6a25909bacbb43c6cd51e29828896b
+  metadata.gz: d7101aaa85fc0971619183648796c7e32f6df52f3a801c8fd6da8fcc61c9b6c1a36870113098287af5eb378cd44b7626a0a223006e0dbe4f009758df93a1c389
+  data.tar.gz: 312db594539b397fb47b89068707d8bdb6b9f1731aa23c61feff362564a68af1016241d4169f3bb6943e1ed04037387d0759136cfa3fe4a3ab89b0f131dbd718

data/lib/neeto_deploy/cli/base.rb

@@ -5,7 +5,7 @@ require_relative "../version"
 
 module NeetoDeploy
   class CLI
-    NEETO_DEPLOY_HOST = ENV["NEETO_DEPLOY_HOST"] || "https://neeto-engineering.neetodeploy.net" # TODO make this org generic
+    NEETO_DEPLOY_HOST = ENV["NEETO_DEPLOY_HOST"] || "https://app.neetodeploy.net"
     NEETO_DEPLOY_CLI_API_BASE_URL = "#{NEETO_DEPLOY_HOST}/api/cli/#{CLI_API_VERSION}"
 
     CLI_CONFIG_DIR = "~/.config/neetodeploy".freeze

data/lib/neeto_deploy/cli/login/base.rb

@@ -12,10 +12,11 @@ module NeetoDeploy
       class Base < CLI::Base
         include Constants
 
-        attr_accessor :login_token
+        attr_accessor :login_token, :org_subdomain
 
         def process!
           init_session
+          ask_for_org_subdomain
           show_login_link_and_open_in_browser
           wait_until_user_authenticates!
         end
@@ -27,14 +28,27 @@ module NeetoDeploy
             self.login_token = response["login_token"]
           end
 
+          def ask_for_org_subdomain
+            ui.say(
+              <<~EOF
+              Welcome to neetoDeploy CLI. To get started, we need your organization's subdomain.
+
+              If your organization URL is "myorg.neetodeploy.com", your organization subdomain is "myorg".
+              More information: https://help.neetodeploy.com/articles/neetodeploy-cli
+
+              EOF
+            )
+            self.org_subdomain = ui.ask("Please enter the subdomain of your organization:")
+          end
+
           def show_login_link_and_open_in_browser
             ui.say(
               <<~EOF
-              A webpage will be opened in a browser. If it didn't, please open this URL in browser:
-              #{session_login_url}
+              The login page will be opened in your browser. If it didn't, please open this URL in your browser:
+              #{session_login_url(org_subdomain)}
               EOF
             )
-            Launchy.open(session_login_url)
+            Launchy.open(session_login_url(org_subdomain))
           end
 
           def wait_until_user_authenticates!

data/lib/neeto_deploy/cli/login/constants.rb

@@ -11,8 +11,9 @@ module NeetoDeploy
           NEETO_DEPLOY_CLI_API_SESSIONS_URL
         end
 
-        def session_login_url
-          "#{NEETO_DEPLOY_CLI_API_BASE_URL}/sessions/#{login_token}/authenticate"
+        def session_login_url(org_subdomain)
+          org_url = NEETO_DEPLOY_HOST.sub("app.", "#{org_subdomain}.")
+          "#{org_url}/cli/login?token=#{login_token}"
         end
 
         def session_login_status_url

data/lib/neeto_deploy/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module NeetoDeploy
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
   CLI_API_VERSION = "v1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neetodeploy
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Subin Siby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-15 00:00:00.000000000 Z
+date: 2023-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv