shopify-cli 1.13.1 → 2.1.0

data/lib/{project_types/node → shopify-cli}/commands/populate/customer.rb

@@ -1,6 +1,6 @@
 require "shopify_cli"
 
-module Node
+module ShopifyCli
   module Commands
     class Populate
       class Customer < ShopifyCli::AdminAPI::PopulateResourceCommand
@@ -17,13 +17,7 @@ module Node
         def message(data)
           ret = data["customerCreate"]["customer"]
           id = ShopifyCli::API.gid_to_id(ret["id"])
-          @ctx.message(
-            "node.populate.customer.added",
-            ret["displayName"],
-            ShopifyCli::Project.current.env.shop,
-            admin_url,
-            id
-          )
+          @ctx.message("core.populate.customer.added", ret["displayName"], @shop, admin_url, id)
         end
       end
     end

data/lib/{project_types/node → shopify-cli}/commands/populate/draft_order.rb

@@ -1,6 +1,6 @@
 require "shopify_cli"
 
-module Node
+module ShopifyCli
   module Commands
     class Populate
       class DraftOrder < ShopifyCli::AdminAPI::PopulateResourceCommand
@@ -20,7 +20,7 @@ module Node
         def message(data)
           ret = data["draftOrderCreate"]["draftOrder"]
           id = ShopifyCli::API.gid_to_id(ret["id"])
-          @ctx.message("node.populate.draft_order.added", ShopifyCli::Project.current.env.shop, admin_url, id)
+          @ctx.message("core.populate.draft_order.added", @shop, admin_url, id)
         end
       end
     end

data/lib/{project_types/node → shopify-cli}/commands/populate/product.rb

@@ -1,6 +1,6 @@
 require "shopify_cli"
 
-module Node
+module ShopifyCli
   module Commands
     class Populate
       class Product < ShopifyCli::AdminAPI::PopulateResourceCommand
@@ -16,13 +16,7 @@ module Node
         def message(data)
           ret = data["productCreate"]["product"]
           id = ShopifyCli::API.gid_to_id(ret["id"])
-          @ctx.message(
-            "node.populate.product.added",
-            ret["title"],
-            ShopifyCli::Project.current.env.shop,
-            admin_url,
-            id
-          )
+          @ctx.message("core.populate.product.added", ret["title"], @shop, admin_url, id)
         end
       end
     end

data/lib/shopify-cli/commands/store.rb

@@ -0,0 +1,15 @@
+require "shopify_cli"
+
+module ShopifyCli
+  module Commands
+    class Store < ShopifyCli::Command
+      def call(_args, _name)
+        @ctx.puts(@ctx.message("core.store.shop", ShopifyCli::AdminAPI.get_shop_or_abort(@ctx)))
+      end
+
+      def self.help
+        ShopifyCli::Context.message("core.store.help", ShopifyCli::TOOL_NAME)
+      end
+    end
+  end
+end

data/lib/shopify-cli/commands/switch.rb

@@ -0,0 +1,39 @@
+require "shopify_cli"
+
+module ShopifyCli
+  module Commands
+    class Switch < ShopifyCli::Command
+      options do |parser, flags|
+        parser.on("--store=STORE") { |url| flags[:shop] = url }
+        # backwards compatibility allow 'shop' for now
+        parser.on("--shop=SHOP") { |url| flags[:shop] = url }
+      end
+
+      def call(*)
+        if Shopifolk.acting_as_shopify_organization?
+          @ctx.puts(@ctx.message("core.switch.disabled_as_shopify_org"))
+          return
+        end
+
+        shop = if options.flags[:shop]
+          Login.validate_shop(options.flags[:shop])
+        elsif (org_id = DB.get(:organization_id))
+          res = ShopifyCli::Tasks::SelectOrgAndShop.call(@ctx, organization_id: org_id)
+          res[:shop_domain]
+        else
+          AdminAPI.get_shop_or_abort(@ctx)
+          res = ShopifyCli::Tasks::SelectOrgAndShop.call(@ctx)
+          res[:shop_domain]
+        end
+        DB.set(shop: shop)
+        IdentityAuth.new(ctx: @ctx).reauthenticate
+
+        @ctx.puts(@ctx.message("core.switch.success", shop))
+      end
+
+      def self.help
+        ShopifyCli::Context.message("core.switch.help", ShopifyCli::TOOL_NAME)
+      end
+    end
+  end
+end

data/lib/shopify-cli/commands/system.rb

@@ -20,6 +20,7 @@ module ShopifyCli
         display_environment if show_all_details
 
         display_cli_constants(show_all_details)
+        display_shopify_store(show_all_details)
         display_cli_ruby(show_all_details)
         display_utility_commands(show_all_details)
         display_project_commands(show_all_details)
@@ -59,6 +60,17 @@ module ShopifyCli
         end
       end
 
+      def display_shopify_store(_show_all_details)
+        shop = if ShopifyCli::DB.exists?(:shop)
+          ShopifyCli::AdminAPI.get_shop_or_abort(@ctx)
+        else
+          @ctx.message("core.populate.error.no_shop", ShopifyCli::TOOL_NAME)
+        end
+
+        @ctx.puts("\n" + @ctx.message("core.system.shop_header"))
+        @ctx.puts("  " + shop)
+      end
+
       def display_cli_ruby(_show_all_details)
         rbconfig_constants = %w(host RUBY_VERSION_NAME)
 

data/lib/shopify-cli/commands/whoami.rb

@@ -0,0 +1,28 @@
+require "shopify_cli"
+
+module ShopifyCli
+  module Commands
+    class Whoami < ShopifyCli::Command
+      def call(_args, _name)
+        shop = ShopifyCli::DB.get(:shop)
+        org_id = ShopifyCli::DB.get(:organization_id)
+        org = ShopifyCli::PartnersAPI::Organizations.fetch(@ctx, id: org_id) unless org_id.nil?
+
+        output = if shop.nil? && org.nil?
+          @ctx.message("core.whoami.not_logged_in", ShopifyCli::TOOL_NAME)
+        elsif !shop.nil? && org.nil?
+          @ctx.message("core.whoami.logged_in_shop_only", shop)
+        elsif shop.nil? && !org.nil?
+          @ctx.message("core.whoami.logged_in_partner_only", org["businessName"])
+        else
+          @ctx.message("core.whoami.logged_in_partner_and_shop", shop, org["businessName"])
+        end
+        @ctx.puts(output)
+      end
+
+      def self.help
+        ShopifyCli::Context.message("core.whoami.help", ShopifyCli::TOOL_NAME)
+      end
+    end
+  end
+end

data/lib/shopify-cli/connect.rb

@@ -0,0 +1,32 @@
+require "shopify_cli"
+
+module ShopifyCli
+  class Connect
+    def initialize(ctx)
+      @ctx = ctx
+    end
+
+    def default_connect(project_type)
+      if Project.current&.env
+        @ctx.puts(@ctx.message("core.connect.already_connected_warning"))
+      end
+      org = ShopifyCli::Tasks::EnsureEnv.call(@ctx, regenerate: true)
+      write_cli_yml(project_type, org["id"]) unless Project.has_current?
+      api_key = Project.current(force_reload: true).env["api_key"]
+      get_app(org["apps"], api_key).first["title"]
+    end
+
+    def write_cli_yml(project_type, org_id)
+      ShopifyCli::Project.write(
+        @ctx,
+        project_type: project_type,
+        organization_id: org_id,
+      )
+      @ctx.done(@ctx.message("core.connect.cli_yml_saved"))
+    end
+
+    def get_app(apps, api_key)
+      apps.select { |app| app["apiKey"] == api_key }
+    end
+  end
+end

data/lib/shopify-cli/context.rb

@@ -61,9 +61,10 @@ module ShopifyCli
     # will return which operating system that the cli is running on [:mac, :linux]
     def os
       host = uname
-      return :mac if /darwin/.match(host)
-      return :linux if /linux/.match(host)
-      return :windows if /mingw32/.match(host)
+      return :mac if /darwin/i.match(host)
+      return :windows if /mswin|mingw|cygwin/i.match(host)
+      return :linux if /linux|bsd/i.match(host)
+      :unknown
     end
 
     # will return true if the cli is running on an apple computer.
@@ -81,6 +82,16 @@ module ShopifyCli
       os == :windows
     end
 
+    # will return true if the os is unknown
+    def unknown_os?
+      os == :unknown
+    end
+
+    # will return true if being launched from a tty
+    def tty?
+      $stdin.tty? && !testing?
+    end
+
     # will return true if the cli is being run from an installation, and not a
     # development instance. The gem installation will not have a 'test' directory.
     # See `#development?` for checking for development environment.
@@ -106,6 +117,12 @@ module ShopifyCli
       ENV["CI"]
     end
 
+    ##
+    # will return true if the cli is running with the DEBUG flag
+    def debug?
+      getenv("DEBUG")
+    end
+
     # get a environment variable value by name.
     #
     # #### Parameters
@@ -144,6 +161,19 @@ module ShopifyCli
       File.write(ctx_path(fname), content)
     end
 
+    # will read a file relative to the context root unless the file path is absolute.
+    #
+    # #### Parameters
+    # * `fname` - filename of the file that you are reading, relative to root unless it is absolute.
+    #
+    # #### Example
+    #
+    #   @ctx.read('file.txt')
+    #
+    def read(fname)
+      File.read(ctx_path(fname))
+    end
+
     # will read a binary file relative to the context root unless the file path is absolute.
     #
     # #### Parameters
@@ -286,6 +316,28 @@ module ShopifyCli
       puts(help)
     end
 
+    # will output to the console a link for the user to either copy/paste
+    # or click on.
+    #
+    # #### Parameters
+    # * `uri` - a http URI to open in a browser
+    #
+    def open_browser_url!(uri)
+      if tty?
+        if linux? && which("xdg-open")
+          system("xdg-open", uri.to_s)
+        elsif windows?
+          system("start \"\" \"#{uri}\"")
+        elsif mac?
+          system("open", uri.to_s)
+        else
+          open_url!(uri)
+        end
+      else
+        open_url!(uri)
+      end
+    end
+
     # will output a message, prefixed by a yellow star, indicating that task
     # started.
     #
@@ -305,6 +357,15 @@ module ShopifyCli
       Kernel.puts(CLI::UI.fmt(*args))
     end
 
+    # a wrapper around Kernel.warn to allow for easy formatting
+    #
+    # #### Parameters
+    # * `text` - a string message to output
+    #
+    def warn(*args)
+      Kernel.warn(CLI::UI.fmt(*args))
+    end
+
     # outputs a message, prefixed by a checkmark indicating that something completed
     #
     # #### Parameters
@@ -331,7 +392,7 @@ module ShopifyCli
     # * `text` - a string message to output
     #
     def debug(text)
-      puts("{{red:DEBUG}} #{text}") if getenv("DEBUG")
+      puts("{{red:DEBUG}} #{text}") if debug?
     end
 
     # proxy call to Context.message.

data/lib/shopify-cli/core/entry_point.rb

@@ -5,35 +5,16 @@ module ShopifyCli
     module EntryPoint
       class << self
         def call(args, ctx = Context.new)
-          # Check if the shim is set up by checking whether the old Finalizer FD exists
-          begin
-            is_shell_shim = false
-            IO.open(9) { is_shell_shim = true }
-          rescue Errno::EBADF
-            # This is expected if the descriptor doesn't exist
-          rescue ArgumentError => e
-            # This can happen on RVM, because it can use fd 9 itself and block access to it. That only happens if the fd
-            # did not exist beforehand, so that means there was no fd 9 before Ruby started.
-            unless e.message == "The given fd is not accessible because RubyVM reserves it"
-              raise e
-            end
-          end
-
-          if !ctx.testing? && is_shell_shim
-            ctx.puts(ctx.message("core.warning.shell_shim"))
-            return
-          end
-
           if ctx.development?
-            ctx.puts(
+            ctx.warn(
               ctx.message("core.warning.development_version", File.join(ShopifyCli::ROOT, "bin", ShopifyCli::TOOL_NAME))
             )
           elsif !ctx.testing?
             new_version = ctx.new_version
-            ctx.puts(ctx.message("core.warning.new_version", ShopifyCli::VERSION, new_version)) unless new_version.nil?
+            ctx.warn(ctx.message("core.warning.new_version", ShopifyCli::VERSION, new_version)) unless new_version.nil?
           end
 
-          ProjectType.load_type(Project.current_project_type)
+          ProjectType.load_all
 
           task_registry = ShopifyCli::Tasks::Registry
 

data/lib/shopify-cli/core/monorail.rb

@@ -90,7 +90,7 @@ module ShopifyCli
           {
             schema_id: INVOCATIONS_SCHEMA,
             payload: {
-              project_type: Project.current_project_type.to_s,
+              project_type: project_type_from_dir_or_cmd(commands[0]).to_s,
               command: commands.join(" "),
               args: args.join(" "),
               time_start: start_time,
@@ -104,7 +104,7 @@ module ShopifyCli
               is_employee: ShopifyCli::Shopifolk.acting_as_shopify_organization?,
             }.tap do |payload|
               payload[:api_key] = metadata.delete(:api_key)
-              payload[:partner_id] = metadata.delete(:organization_id)
+              payload[:partner_id] = metadata.delete(:organization_id) || ShopifyCli::DB.get(:organization_id)
               if Project.has_current?
                 project = Project.current(force_reload: true)
                 payload[:api_key] = project.env&.api_key
@@ -114,6 +114,10 @@ module ShopifyCli
             end,
           }
         end
+
+        def project_type_from_dir_or_cmd(command)
+          Project.current_project_type || (command unless ShopifyCli::Commands.core_command?(command)) || nil
+        end
       end
     end
   end

data/lib/shopify-cli/db.rb

@@ -42,7 +42,7 @@ module ShopifyCli
     #
     # #### Usage
     #
-    #   exists = ShopifyCli::DB.exists?('admin_access_token')
+    #   exists = ShopifyCli::DB.exists?('shopify_exchange_token')
     #
     def exists?(key)
       db.transaction(true) { db.root?(key) }
@@ -55,7 +55,7 @@ module ShopifyCli
     #
     # #### Usage
     #
-    #   ShopifyCli::DB.set(admin_access_token: 'token', metric_consent: true)
+    #   ShopifyCli::DB.set(shopify_exchange_token: 'token', metric_consent: true)
     #
     def set(**args)
       db.transaction do
@@ -80,7 +80,7 @@ module ShopifyCli
     #
     # #### Usage
     #
-    #   ShopifyCli::DB.get(:admin_access_token)
+    #   ShopifyCli::DB.get(:shopify_exchange_token)
     #
     def get(key)
       val = db.transaction(true) { db[key] }
@@ -95,7 +95,7 @@ module ShopifyCli
     #
     # #### Usage
     #
-    #   ShopifyCli::DB.del(:admin_access_token)
+    #   ShopifyCli::DB.del(:shopify_exchange_token)
     #
     def del(*args)
       db.transaction { args.each { |key| db.delete(key) } }

data/lib/shopify-cli/http_request.rb

@@ -1,4 +1,5 @@
 require "net/http"
+require "openssl"
 
 module ShopifyCli
   class HttpRequest
@@ -8,14 +9,29 @@ module ShopifyCli
         request(uri, body, headers, req)
       end
 
+      def put(uri, body, headers)
+        req = ::Net::HTTP::Put.new(uri.request_uri)
+        request(uri, body, headers, req)
+      end
+
       def get(uri, body, headers)
         req = ::Net::HTTP::Get.new(uri.request_uri)
         request(uri, body, headers, req)
       end
 
+      def delete(uri, body, headers)
+        req = ::Net::HTTP::Delete.new(uri.request_uri)
+        request(uri, body, headers, req)
+      end
+
       def request(uri, body, headers, req)
+        cert_store = OpenSSL::X509::Store.new
+        cert_store.set_default_paths
+
         http = ::Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
+        http.cert_store = cert_store
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE if ENV["SSL_VERIFY_NONE"]
 
         req.body = body unless body.nil?
         req["Content-Type"] = "application/json"