file upload v2

Author: monkeyWzr

lib/slack/web/api/endpoints/files.rb

@@ -183,6 +183,71 @@ def files_sharedPublicURL(options = {})
           def files_upload(options = {})
             post('files.upload', options)
           end
+
+          #
+          # Uploads or creates a file (V2).
+          #
+          # @option options [string] :content
+          #   File contents via a POST variable. If omitting this parameter, you must provide a file.
+          # @option options [file] :file
+          #   File contents via multipart/form-data. If omitting this parameter, you must submit content.
+          #
+          # params for files_getUploadURLExternal:
+          #
+          # @option options [string] :filename
+          #   Name of the file being uploaded.
+          # @option options [string] :alt_txt
+          #   Description of image for screen-reader.
+          # @option options [string] :snippet_type
+          #   Syntax type of the snippet being uploaded.
+          #
+          # params for files_completeUploadExternal:
+          #
+          # @option options [Object] :channel_id
+          #   Channel ID where the file will be shared. If not specified the file will be private.
+          # @option options [string] :initial_comment
+          #   The message text introducing the file in specified channels.
+          # @option options [string] :thread_ts
+          #   Provide another message's ts value to upload this file as a reply. Never use a reply's ts value; use its parent instead.
+          #
+          # @see https://api.slack.com/messaging/files#uploading_files
+          # @see https://github.com/slackapi/node-slack-sdk/blob/96d846a79878f0d33893d14a9942ed9c4f678f2d/packages/web-api/src/WebClient.ts#L495
+          # @see https://github.com/slackapi/python-slack-sdk/blob/a7223d9852de8a4ef9156552d7c50a92ec92669e/slack_sdk/web/client.py#L3737
+          def files_upload_v2(options = {})
+            file = ::Faraday::UploadIO.new(StringIO.new(options[:content]), 'text/plain') if options[:content]
+            file ||= options[:file]
+            if file.nil?
+              raise(
+                ArgumentError, 'Either a file or content field is required for valid file upload. You must supply one'
+              )
+            end
+            # step 1: get upload url
+            response = files_getUploadURLExternal(
+              length: file.size, **options.slice(:filename, :length, :alt_txt, :snippet_type)
+            )
+            upload_url = response[:upload_url]
+            file_id = response[:file_id]
+
+            file = ::Faraday::UploadIO.new(StringIO.new(options[:content]), 'text/plain') if options[:content]
+            file ||= options[:file]
+            if file.nil?
+              raise(
+                ArgumentError, 'Either a file or content field is required for valid file upload. You must supply one'
+              )
+            end
+
+            # step 2: upload file
+            post(
+              upload_url,
+              { file: file }
+            )
+
+            # step 3: complete upload
+            files_completeUploadExternal(
+              files: [{ id: file_id, title: options[:filename] }].to_json,
+              **options.slice(:channel_id, :initial_comment, :thread_ts)
+            )
+          end
         end
       end
     end

lib/slack/web/faraday/connection.rb

@@ -9,7 +9,7 @@ def connection
           @connection ||=
             begin
               options = {
-                headers: { 'Accept' => 'application/json; charset=utf-8' }
+                headers: { 'Accept' => 'application/json, text/plain; charset=utf-8' }
               }
 
               options[:headers]['User-Agent'] = user_agent if user_agent
@@ -26,7 +26,7 @@ def connection
                 connection.request :url_encoded
                 connection.use ::Slack::Web::Faraday::Response::RaiseError
                 connection.response :mashify, mash_class: Slack::Messages::Message
-                connection.response :json, content_type: /\b*$/
+                connection.response :json, content_type: /\b*json$/
                 connection.use ::Slack::Web::Faraday::Response::WrapError
                 connection.response :logger, logger if logger
                 connection.adapter adapter

lib/slack/web/faraday/response/raise_error.rb

@@ -7,6 +7,20 @@ class RaiseError < ::Faraday::Middleware
           def on_complete(env)
             raise Slack::Web::Api::Errors::TooManyRequestsError, env.response if env.status == 429
 
+            if env.body.is_a?(String)
+              handle_non_json_response(env)
+            else
+              handle_json_response(env)
+            end
+          end
+
+          private
+
+          def handle_non_json_response(env)
+            raise Slack::Web::Api::Errors::ServerError.new('request failed!', env.response) unless env.success?
+          end
+
+          def handle_json_response(env)
             return unless env.success?
 
             body = env.body

spec/slack/web/faraday/response/raise_error_spec.rb

@@ -82,5 +82,24 @@
         )
       end
     end
+
+    context 'with a non-JSON 200 response' do
+      let(:body) { 'OK - 9' }
+
+      it 'raises a ServerError' do
+        expect(raise_error_obj.on_complete(env)).to be_nil
+      end
+    end
+
+    context 'with a non-JSON failed response' do
+      let(:body) { 'not json' }
+      let(:env) { double status: status, response: response, body: body, success?: false }
+
+      it 'raises a ServerError' do
+        expect { raise_error_obj.on_complete(env) }.to(
+          raise_error(Slack::Web::Api::Errors::ServerError, 'request failed!')
+        )
+      end
+    end
   end
 end