4me-sdk 1.1.5 → 2.0.0.pre.rc.1

data/lib/sdk4me/client/multipart.rb

@@ -8,7 +8,7 @@ require 'mime/types'
 # Created:: 22 Feb 2008
 module Sdk4me
   module Multipart
-    VERSION = "1.0.0" unless const_defined?(:VERSION)
+    VERSION = '1.0.0'.freeze unless const_defined?(:VERSION)
 
     # Formats a given hash as a multipart form post
     # If a hash value responds to :string or :read messages, then it is
@@ -16,10 +16,10 @@ module Sdk4me
     # to be a string
     class Post
       # We have to pretend like we're a web browser...
-      USERAGENT = "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-us) AppleWebKit/523.10.6 (KHTML, like Gecko) Version/3.0.4 Safari/523.10.6" unless const_defined?(:USERAGENT)
-      BOUNDARY = '0123456789ABLEWASIEREISAWELBA9876543210' unless const_defined?(:BOUNDARY)
-      CONTENT_TYPE = "multipart/form-data; boundary=#{ BOUNDARY }" unless const_defined?(:CONTENT_TYPE)
-      HEADER = { 'Content-Type' => CONTENT_TYPE, 'User-Agent' => USERAGENT } unless const_defined?(:HEADER)
+      USERAGENT = "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-us) AppleWebKit/523.10.6 (KHTML, like Gecko) Version/3.0.4 Safari/523.10.6 4me/#{Sdk4me::Client::VERSION}".freeze unless const_defined?(:USERAGENT)
+      BOUNDARY = '0123456789ABLEWASIEREISAWELBA9876543210'.freeze unless const_defined?(:BOUNDARY)
+      CONTENT_TYPE = "multipart/form-data; boundary=#{BOUNDARY}".freeze unless const_defined?(:CONTENT_TYPE)
+      HEADER = { 'Content-Type' => CONTENT_TYPE, 'User-Agent' => USERAGENT }.freeze unless const_defined?(:HEADER)
 
       def self.prepare_query(params)
         fp = []
@@ -33,24 +33,22 @@ module Sdk4me
         end
 
         # Assemble the request body using the special multipart format
-        query = fp.map{ |p| "--#{BOUNDARY}\r\n#{p.to_multipart}" }.join  + "--#{BOUNDARY}--"
-        return query, HEADER
+        query = fp.map { |p| "--#{BOUNDARY}\r\n#{p.to_multipart}" }.join + "--#{BOUNDARY}--"
+        [query, HEADER]
       end
     end
 
-    private
-
     # Formats a basic string key/value pair for inclusion with a multipart post
     class StringParam
       attr_accessor :k, :v
 
-      def initialize(k, v)
-        @k = k
-        @v = v
+      def initialize(key, value)
+        @k = key
+        @v = value
       end
 
       def to_multipart
-        return %(Content-Disposition: form-data; name="#{CGI::escape(k.to_s)}"\r\n\r\n#{v}\r\n)
+        %(Content-Disposition: form-data; name="#{CGI.escape(k.to_s)}"\r\n\r\n#{v}\r\n)
       end
     end
 
@@ -59,17 +57,17 @@ module Sdk4me
     class FileParam
       attr_accessor :k, :filename, :content
 
-      def initialize(k, filename, content)
-        @k = k
+      def initialize(key, filename, content)
+        @k = key
         @filename = filename
         @content = content
       end
 
       def to_multipart
         # If we can tell the possible mime-type from the filename, use the first in the list; otherwise, use "application/octet-stream"
-        mime_type = MIME::Types.type_for(filename)[0] || MIME::Types["application/octet-stream"][0]
-        return %(Content-Disposition: form-data; name="#{CGI::escape(k.to_s)}"; filename="#{filename}"\r\nContent-Type: #{ mime_type.simplified }\r\n\r\n#{ content }\r\n)
+        mime_type = MIME::Types.type_for(filename)[0] || MIME::Types['application/octet-stream'][0]
+        %(Content-Disposition: form-data; name="#{CGI.escape(k.to_s)}"; filename="#{filename}"\r\nContent-Type: #{mime_type.simplified}\r\n\r\n#{content}\r\n)
       end
     end
   end
-end
+end

data/lib/sdk4me/client/response.rb

@@ -1,19 +1,13 @@
 module Sdk4me
   class Response
+    attr_reader :request, :response
+    alias raw response
+
     def initialize(request, response)
       @request = request
       @response = response
     end
 
-    def request
-      @request
-    end
-
-    def response
-      @response
-    end
-    alias_method :raw, :response
-
     def body
       @response.body
     end
@@ -22,16 +16,17 @@ module Sdk4me
     # If the response is not +valid?+ it is a Hash with 'message' and optionally 'errors'
     def json
       return @json if defined?(@json)
+
       # no content, no JSON
       if @response.code.to_s == '204'
         data = {}
       elsif @response.body.blank?
         # no body, no json
-        data = {message: @response.message.blank? ? 'empty body' : @response.message.strip}
+        data = { message: @response.message.blank? ? 'empty body' : @response.message.strip }
       end
       begin
         data ||= JSON.parse(@response.body)
-      rescue ::Exception => e
+      rescue StandardError => e
         data = { message: "Invalid JSON - #{e.message} for:\n#{@response.body}" }
       end
       # indifferent access to hashes
@@ -57,22 +52,31 @@ module Sdk4me
     def valid?
       message.nil?
     end
-    alias_method :success?, :valid?
+    alias success? valid?
+
+    # +true+ in case of a HTTP 5xx error
+    def failure?
+      !success? && (@response.code.to_s.blank? || @response.code.to_s =~ /5\d\d/)
+    end
 
     # retrieve a value from the resource
     # if the JSON value is an Array a array with the value for each resource will be given
     # @param keys: a single key or a key-path separated by comma
     def[](*keys)
       values = json.is_a?(Array) ? json : [json]
-      keys.each { |key| values = values.map{ |value| value.is_a?(Hash) ? value[key] : nil} }
+      keys.each { |key| values = values.map { |value| value.is_a?(Hash) ? value[key] : nil } }
       json.is_a?(Array) ? values : values.first
     end
 
     # The nr of resources found
     def size
-      @size ||= message ? 0 : json.is_a?(Array) ? json.size : 1
+      @size ||= if message
+                  0
+                else
+                  json.is_a?(Array) ? json.size : 1
+                end
     end
-    alias :count :size
+    alias count size
 
     # pagination - per page
     def per_page
@@ -98,12 +102,12 @@ module Sdk4me
     # Link: <https://api.4me.com/v1/requests?page=1&per_page=25>; rel="first", <https://api.4me.com/v1/requests?page=2&per_page=25>; rel="prev", etc.
     def pagination_link(relation)
       # split on ',' select the [url] in '<[url]>; rel="[relation]"', compact to all url's found (at most one) and take the first
-      (@pagination_links ||= {})[relation] ||= @response.header['Link'] && @response.header['Link'].split(/,\s*<?/).map{ |link| link[/^\s*<?(.*?)>?;\s*rel="#{relation.to_s}"\s*$/, 1] }.compact.first
+      (@pagination_links ||= {})[relation] ||= @response.header['Link'] && @response.header['Link'].split(/,\s*<?/).map { |link| link[/^\s*<?(.*?)>?;\s*rel="#{relation}"\s*$/, 1] }.compact.first
     end
 
     # pagination urls (relative paths without server) - relations :first, :prev, :next, :last
     def pagination_relative_link(relation)
-      (@pagination_relative_links ||= {})[relation] ||= pagination_link(relation) && pagination_link(relation)[/^https?:\/\/[^\/]*(.*)/, 1]
+      (@pagination_relative_links ||= {})[relation] ||= pagination_link(relation) && pagination_link(relation)[%r{^https?://[^/]*(.*)}, 1]
     end
 
     # +true+ if the response is invalid because of throttling
@@ -112,12 +116,11 @@ module Sdk4me
     end
 
     def retry_after
-      @current_page ||= @response.header['Retry-After'].to_i
+      @retry_after ||= @response.header['Retry-After'].to_i
     end
 
     def to_s
       valid? ? json.to_s : message
     end
-
   end
 end

data/lib/sdk4me/client/version.rb

@@ -1,5 +1,5 @@
 module Sdk4me
   class Client
-    VERSION = '1.1.5'
+    VERSION = '2.0.0-rc.1'.freeze
   end
 end

data/spec/lib/sdk4me/attachments_spec.rb

@@ -1,178 +1,342 @@
 require 'spec_helper'
+require 'tempfile'
 
 describe Sdk4me::Attachments do
-
-  before(:each) do
-    @client = Sdk4me::Client.new(api_token: 'secret', max_retry_time: -1)
-    @attachments = Sdk4me::Attachments.new(@client)
+  def attachments(authentication, path)
+    @client = if authentication == :api_token
+                Sdk4me::Client.new(api_token: 'secret', max_retry_time: -1)
+              else
+                Sdk4me::Client.new(access_token: 'secret', max_retry_time: -1)
+              end
+    Sdk4me::Attachments.new(@client, path)
   end
 
-  context 'upload_attachments!' do
-    it 'should not do anything when no :attachments are present' do
-      expect(@attachments.upload_attachments!('/requests', {status: :in_progress})).to be_nil
+  def credentials(authentication)
+    if authentication == :api_token
+      { basic_auth: %w[secret x] }
+    else
+      { headers: { 'Authorization' => 'Bearer secret' } }
     end
+  end
 
-    it 'should not do anything when :attachments is nil' do
-      expect(@attachments.upload_attachments!('/requests', {attachments: nil})).to be_nil
-    end
+  %i[api_token access_token].each do |authentication|
+    context "#{authentication} -" do
+      context 'upload_attachments! -' do
+        context 'field attachments' do
+          it 'should not do anything when no attachments are present' do
+            a = attachments(authentication, '/requests')
+            expect(@client).not_to receive(:send_file)
+            a.upload_attachments!({ status: :in_progress })
+          end
 
-    it 'should not do anything when :attachments is empty' do
-      expect(@attachments.upload_attachments!('/requests', {attachments: []})).to be_nil
-      expect(@attachments.upload_attachments!('/requests', {attachments: [nil]})).to be_nil
-    end
+          it 'should not do anything when attachments is nil' do
+            a = attachments(authentication, '/requests')
+            expect(@client).not_to receive(:send_file)
+            a.upload_attachments!({ note_attachments: nil })
+          end
 
-    it 'should show a error if no attachment may be uploaded' do
-      stub_request(:get, 'https://api.4me.com/v1/sites/1?attachment_upload_token=true').with(basic_auth: ['secret', 'x']).to_return(body: {name: 'site 1'}.to_json)
-      expect_log('Attachments not allowed for /sites/1', :error)
-      expect(@attachments.upload_attachments!('/sites/1', {attachments: ['file1.png']})).to be_nil
-    end
+          it 'should not do anything when attachments is empty' do
+            a = attachments(authentication, '/requests')
+            expect(@client).not_to receive(:send_file)
+            a.upload_attachments!({ note_attachments: [] })
+            a.upload_attachments!({ note_attachments: [nil] })
+          end
 
-    it 'should raise an exception if no attachment may be uploaded' do
-      stub_request(:get, 'https://api.4me.com/v1/sites/1?attachment_upload_token=true').with(basic_auth: ['secret', 'x']).to_return(body: {name: 'site 1'}.to_json)
-      message = 'Attachments not allowed for /sites/1'
-      expect{ @attachments.upload_attachments!('/sites/1', {attachments: ['file1.png'], attachments_exception: true}) }.to raise_error(::Sdk4me::UploadFailed, message)
-    end
+          it 'should raise an error if no attachment provider can be determined' do
+            a = attachments(authentication, '/requests')
+            expect(@client).not_to receive(:send_file)
+            stub_request(:get, 'https://api.4me.com/v1/attachments/storage').with(credentials(authentication)).to_return(status: 404, body: { message: 'Not Found' }.to_json)
+            expect_log('GET request to api.4me.com:443/v1/attachments/storage failed: 404: Not Found', :error)
+            expect_log('Attachment upload failed: No provider found', :error)
+            expect { a.upload_attachments!({ note_attachments: ['file1.png'] }) }.to raise_error(::Sdk4me::UploadFailed, 'Attachment upload failed: No provider found')
+          end
 
-    it 'should add /new to the path for new records' do
-      stub_request(:get, 'https://api.4me.com/v1/sites/new?attachment_upload_token=true').with(basic_auth: ['secret', 'x']).to_return(body: {missing: 'storage'}.to_json)
-      expect_log('Attachments not allowed for /sites', :error)
-      expect(@attachments.upload_attachments!('/sites', {attachments: ['file1.png']})).to be_nil
-    end
+          it 'should upload' do
+            a = attachments(authentication, '/requests')
+            resp = {
+              provider: 'local',
+              upload_uri: 'https://widget.example.com/attachments',
+              local: {
+                key: 'attachments/5/requests/000/000/777/abc/${filename}',
+                x_4me_expiration: '2020-11-01T23:59:59Z',
+                x_4me_signature: 'foobar'
+              }
+            }
+            stub_request(:get, 'https://api.4me.com/v1/attachments/storage').with(credentials(authentication)).to_return(status: 200, body: resp.to_json)
 
-    [ [:requests,          :note],
-      [:problems,          :note],
-      [:contracts,         :remarks],
-      [:cis,               :remarks],
-      [:flsas,             :remarks],
-      [:slas,              :remarks],
-      [:service_instances, :remarks],
-      [:service_offerings, :summary],
-      [:any_other_model,   :note]].each do |model, attribute|
-
-      it "should replace :attachments with :#{attribute}_attachments after upload at /#{model}" do
-        stub_request(:get, "https://api.4me.com/v1/#{model}/new?attachment_upload_token=true").with(basic_auth: ['secret', 'x']).to_return(body: {storage_upload: 'conf'}.to_json)
-        expect(@attachments).to receive(:upload_attachment).with('conf', 'file1.png', false).ordered{ 'uploaded file1.png' }
-        expect(@attachments).to receive(:upload_attachment).with('conf', 'file2.zip', false).ordered{ 'uploaded file2.zip' }
-        data = {leave: 'me alone', attachments: %w(file1.png file2.zip)}
-        @attachments.upload_attachments!("/#{model}", data)
-        expect(data[:attachments]).to be_nil
-        expect(data[:leave]).to eq('me alone')
-        expect(data[:"#{attribute}_attachments"]).to eq(['uploaded file1.png', 'uploaded file2.zip'].to_json)
-      end
-    end
+            expect(a).to(receive(:upload_attachment).with('/tmp/file1.png').ordered { { key: 'attachments/5/requests/000/000/777/abc/file1.png', filesize: 1234 } })
+            expect(a).to(receive(:upload_attachment).with('/tmp/file2.zip').ordered { { key: 'attachments/5/requests/000/000/777/abc/file2.zip', filesize: 9876 } })
 
-    it 'should set raise_exception flag to true when :attachments_exception is set' do
-      stub_request(:get, 'https://api.4me.com/v1/requests/new?attachment_upload_token=true').with(basic_auth: ['secret', 'x']).to_return(body: {storage_upload: 'conf'}.to_json)
-      expect(@attachments).to receive(:upload_attachment).with('conf', 'file1.png', true).ordered{ 'uploaded file1.png' }
-      data = {leave: 'me alone', attachments: 'file1.png', attachments_exception: true}
-      @attachments.upload_attachments!('/requests', data)
-      expect(data[:attachments]).to be_nil
-      expect(data[:attachments_exception]).to be_nil
-      expect(data[:leave]).to eq('me alone')
-      expect(data[:note_attachments]).to eq(['uploaded file1.png'].to_json)
-    end
-  end
+            data = { subject: 'Foobar', note_attachments: ['/tmp/file1.png', '/tmp/file2.zip'] }
+            a.upload_attachments!(data)
+            expect(data).to eq({ subject: 'Foobar', note_attachments: [
+                                 { filesize: 1234, key: 'attachments/5/requests/000/000/777/abc/file1.png' },
+                                 { filesize: 9876, key: 'attachments/5/requests/000/000/777/abc/file2.zip' }
+                               ] })
+          end
+        end
 
-  context 'upload_attachment' do
+        context 'rich text inline attachments' do
+          it 'should not do anything when no [note_attachments: <idx>] is present in the note' do
+            a = attachments(authentication, '/requests')
+            expect(@client).not_to receive(:send_file)
+            data = { note: '[note_attachments: foo]' }
+            a.upload_attachments!(data)
+            expect(data).to eq({ note: '[note_attachments: foo]' })
+          end
 
-    it 'should log an exception when the file could not be found' do
-      expect_log('Attachment upload failed: file does not exist: unknown_file', :error)
-      expect(@attachments.send(:upload_attachment, nil, 'unknown_file', false)).to be_nil
-    end
+          it 'should not do anything when note attachments is empty' do
+            a = attachments(authentication, '/requests')
+            expect(@client).not_to receive(:send_file)
+            data = { note: '[note_attachments: 0]' }
+            a.upload_attachments!(data)
+            expect(data).to eq({ note: '[note_attachments: 0]' })
+          end
 
-    it 'should raise an exception when the file could not be found' do
-      message = 'Attachment upload failed: file does not exist: unknown_file'
-      expect{ @attachments.send(:upload_attachment, nil, 'unknown_file', true) }.to raise_error(::Sdk4me::UploadFailed, message)
-    end
+          it 'should raise an error if no attachment provider can be determined' do
+            a = attachments(authentication, '/requests')
+            expect(@client).not_to receive(:send_file)
+            stub_request(:get, 'https://api.4me.com/v1/attachments/storage').with(credentials(authentication)).to_return(status: 404, body: { message: 'Not Found' }.to_json)
+            expect_log('GET request to api.4me.com:443/v1/attachments/storage failed: 404: Not Found', :error)
+            expect_log('Attachment upload failed: No provider found', :error)
+            data = {
+              note: '[note_attachments: 0]', note_attachments: ['/tmp/doesnotexist.log']
+            }
+            expect { a.upload_attachments!(data) }.to raise_error(::Sdk4me::UploadFailed, 'Attachment upload failed: No provider found')
+          end
 
-    context 'aws' do
-      before(:each) do
-        @aws_conf = {
-            provider: 'aws',
-            upload_uri: 'https://itrp.s3.amazonaws.com/',
-            access_key: 'AKIA6RYQ',
-            success_url: 'https://mycompany.4me.com/s3_success?sig=99e82e8a046',
-            policy: 'eydlgIH0=',
-            signature: 'nbhdec4k=',
-            upload_path: 'attachments/5/reqs/000/070/451/zxxb4ot60xfd6sjg/'
-        }
-        @key_template = 'attachments/5/reqs/000/070/451/zxxb4ot60xfd6sjg/${filename}'
-        @key = 'attachments/5/reqs/000/070/451/zxxb4ot60xfd6sjg/upload.txt'
-
-        @multi_part_body = "--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"Content-Type\"\r\n\r\napplication/octet-stream\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"x-amz-server-side-encryption\"\r\n\r\nAES256\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"key\"\r\n\r\nattachments/5/reqs/000/070/451/zxxb4ot60xfd6sjg/${filename}\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"AWSAccessKeyId\"\r\n\r\nAKIA6RYQ\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"acl\"\r\n\r\nprivate\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"signature\"\r\n\r\nnbhdec4k=\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"success_action_status\"\r\n\r\n201\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"policy\"\r\n\r\neydlgIH0=\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"file\"; filename=\"#{@fixture_dir}/upload.txt\"\r\nContent-Type: text/plain\r\n\r\ncontent\r\n--0123456789ABLEWASIEREISAWELBA9876543210--"
-        @multi_part_headers = {'Accept'=>'*/*', 'Content-Type'=>'multipart/form-data; boundary=0123456789ABLEWASIEREISAWELBA9876543210', 'User-Agent'=>'Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-us) AppleWebKit/523.10.6 (KHTML, like Gecko) Version/3.0.4 Safari/523.10.6'}
-      end
+          it 'should upload' do
+            a = attachments(authentication, '/requests')
+            resp = {
+              provider: 'local',
+              upload_uri: 'https://widget.example.com/attachments',
+              local: {
+                key: 'attachments/5/requests/000/000/777/abc/${filename}',
+                x_4me_expiration: '2020-11-01T23:59:59Z',
+                x_4me_signature: 'foobar'
+              }
+            }
+            stub_request(:get, 'https://api.4me.com/v1/attachments/storage').with(credentials(authentication)).to_return(status: 200, body: resp.to_json)
 
-      it 'should open a file from disk' do
-        expect(@attachments).to receive(:aws_upload).with(@aws_conf, @key_template, @key, kind_of(File))
-        expect(@attachments.send(:upload_attachment, @aws_conf, "#{@fixture_dir}/upload.txt", false)).to eq({key: @key, filesize: 7})
-      end
+            expect(a).to(receive(:upload_attachment).with('/tmp/file1.png').ordered { { key: 'attachments/5/requests/000/000/777/abc/file1.png', filesize: 1234 } })
+            expect(a).to(receive(:upload_attachment).with('/tmp/file2.jpg').ordered { { key: 'attachments/5/requests/000/000/777/abc/file2.jpg', filesize: 9876 } })
 
-      it 'should sent the upload to AWS' do
-        stub_request(:post, 'https://itrp.s3.amazonaws.com/').with(body: @multi_part_body, headers: @multi_part_headers).to_return(body: 'OK', status: 303, headers: {'Location' => 'https://mycompany.4me.com/s3_success?sig=99e82e8a046'})
-        stub_request(:get, "https://api.4me.com/v1/s3_success?sig=99e82e8a046&key=#{@key}").with(basic_auth: ['secret', 'x']).to_return(body: {}.to_json)
-        expect(@attachments.send(:upload_attachment, @aws_conf, "#{@fixture_dir}/upload.txt", false)).to eq({key: @key, filesize: 7})
-      end
+            data = {
+              subject: 'Foobar',
+              note: 'Foo [note_attachments: 0] Bar [note_attachments: 1]',
+              note_attachments: ['/tmp/file1.png', '/tmp/file2.jpg']
+            }
+            a.upload_attachments!(data)
 
-      it 'should report an error when AWS upload fails' do
-        stub_request(:post, 'https://itrp.s3.amazonaws.com/').with(body: @multi_part_body, headers: @multi_part_headers).to_return(body: %(<?xml version="1.0" encoding="UTF-8"?>\n<Error><Code>AccessDenied</Code><Message>Invalid according to Policy</Message><RequestId>1FECC4B719E426B1</RequestId><HostId>15+14lXt+HlF</HostId></Error>), status: 303, headers: {'Location' => 'https://mycompany.4me.com/s3_success?sig=99e82e8a046'})
-        expect_log("Attachment upload failed: AWS upload to https://itrp.s3.amazonaws.com/ for #{@key} failed: Invalid according to Policy", :error)
-        expect(@attachments.send(:upload_attachment, @aws_conf, "#{@fixture_dir}/upload.txt", false)).to be_nil
-      end
+            expect(data).to eq({
+                                 note: 'Foo ![](attachments/5/requests/000/000/777/abc/file1.png) Bar ![](attachments/5/requests/000/000/777/abc/file2.jpg)',
+                                 note_attachments: [
+                                   { filesize: 1234, inline: true, key: 'attachments/5/requests/000/000/777/abc/file1.png' },
+                                   { filesize: 9876, inline: true, key: 'attachments/5/requests/000/000/777/abc/file2.jpg' }
+                                 ],
+                                 subject: 'Foobar'
+                               })
+          end
+        end
 
-      it 'should report an error when 4me confirmation fails' do
-        stub_request(:post, 'https://itrp.s3.amazonaws.com/').with(body: @multi_part_body, headers: @multi_part_headers).to_return(body: 'OK', status: 303, headers: {'Location' => 'https://mycompany.4me.com/s3_success?sig=99e82e8a046'})
-        stub_request(:get, "https://api.4me.com/v1/s3_success?sig=99e82e8a046&key=#{@key}").with(basic_auth: ['secret', 'x']).to_return(body: {message: 'oops!'}.to_json)
-        expect_log('Request failed: oops!', :error)
-        expect_log("Attachment upload failed: 4me confirmation s3_success?sig=99e82e8a046 for #{@key} failed: oops!", :error)
-        expect(@attachments.send(:upload_attachment, @aws_conf, "#{@fixture_dir}/upload.txt", false)).to be_nil
-      end
+        context 'field attachments and rich text inline attachments' do
+          it 'should upload, and replace the data in place' do
+            a = attachments(authentication, '/requests')
+            resp = {
+              provider: 'local',
+              upload_uri: 'https://widget.example.com/attachments',
+              local: {
+                key: 'attachments/5/requests/000/000/777/abc/${filename}',
+                x_4me_expiration: '2020-11-01T23:59:59Z',
+                x_4me_signature: 'foobar'
+              }
+            }
+            stub_request(:get, 'https://api.4me.com/v1/attachments/storage').with(credentials(authentication)).to_return(status: 200, body: resp.to_json)
+
+            expect(a).to(receive(:upload_attachment).with('/tmp/file3.log').ordered { { key: 'attachments/5/requests/000/000/777/abc/file3.log', filesize: 5678 } })
+            expect(a).to(receive(:upload_attachment).with('/tmp/file1.png').ordered { { key: 'attachments/5/requests/000/000/777/abc/file1.png', filesize: 1234 } })
+            expect(a).to(receive(:upload_attachment).with('/tmp/file2.jpg').ordered { { key: 'attachments/5/requests/000/000/777/abc/file2.jpg', filesize: 9876 } })
+
+            data = {
+              subject: 'Foobar',
+              note: 'Foo [note_attachments: 2] Bar [note_attachments: 1]',
+              note_attachments: ['/tmp/file3.log', '/tmp/file1.png', '/tmp/file2.jpg']
+            }
+            a.upload_attachments!(data)
 
-      it 'should raise an exception when AWS upload fails' do
-        stub_request(:post, 'https://itrp.s3.amazonaws.com/').with(body: @multi_part_body, headers: @multi_part_headers).to_return(body: %(<?xml version="1.0" encoding="UTF-8"?>\n<Error><Code>AccessDenied</Code><Message>Invalid according to Policy</Message><RequestId>1FECC4B719E426B1</RequestId><HostId>15+14lXt+HlF</HostId></Error>), status: 303, headers: {'Location' => 'https://mycompany.4me.com/s3_success?sig=99e82e8a046'})
-        message = "Attachment upload failed: AWS upload to https://itrp.s3.amazonaws.com/ for #{@key} failed: Invalid according to Policy"
-        expect{ @attachments.send(:upload_attachment, @aws_conf, "#{@fixture_dir}/upload.txt", true) }.to raise_error(::Sdk4me::UploadFailed, message)
+            expect(data).to eq({
+                                 note: 'Foo ![](attachments/5/requests/000/000/777/abc/file2.jpg) Bar ![](attachments/5/requests/000/000/777/abc/file1.png)',
+                                 note_attachments: [
+                                   { filesize: 5678, key: 'attachments/5/requests/000/000/777/abc/file3.log' },
+                                   { filesize: 1234, inline: true, key: 'attachments/5/requests/000/000/777/abc/file1.png' },
+                                   { filesize: 9876, inline: true, key: 'attachments/5/requests/000/000/777/abc/file2.jpg' }
+                                 ],
+                                 subject: 'Foobar'
+                               })
+          end
+
+          it 'failed uploads' do
+            a = attachments(authentication, '/requests')
+            resp = {
+              provider: 'local',
+              upload_uri: 'https://widget.example.com/attachments',
+              local: {
+                key: 'attachments/5/requests/000/000/777/abc/${filename}',
+                x_4me_expiration: '2020-11-01T23:59:59Z',
+                x_4me_signature: 'foobar'
+              }
+            }
+            stub_request(:get, 'https://api.4me.com/v1/attachments/storage').with(credentials(authentication)).to_return(status: 200, body: resp.to_json)
+
+            expect_log('Attachment upload failed: file does not exist: /tmp/doesnotexist.png', :error)
+
+            data = {
+              subject: 'Foobar',
+              note: 'Foo [note_attachments: 2] Bar [note_attachments: 1]',
+              note_attachments: ['/tmp/doesnotexist.png']
+            }
+            expect { a.upload_attachments!(data) }.to raise_error(::Sdk4me::UploadFailed, 'Attachment upload failed: file does not exist: /tmp/doesnotexist.png')
+          end
+        end
       end
-    end
 
-    context '4me' do
-      before(:each) do
-        @sdk4me_conf = {
+      context :upload_attachment do
+        before(:each) do
+          resp = {
             provider: 'local',
-            upload_uri: 'https://api.4me.com/attachments',
-            upload_path: 'attachments/5/reqs/000/070/451/zxxb4ot60xfd6sjg/'
-        }
-        @key_template = 'attachments/5/reqs/000/070/451/zxxb4ot60xfd6sjg/${filename}'
-        @key = 'attachments/5/reqs/000/070/451/zxxb4ot60xfd6sjg/upload.txt'
-
-        @multi_part_body = "--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"Content-Type\"\r\n\r\napplication/octet-stream\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"file\"; filename=\"#{@spec_dir}/support/fixtures/upload.txt\"\r\nContent-Type: text/plain\r\n\r\ncontent\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"key\"\r\n\r\nattachments/5/reqs/000/070/451/zxxb4ot60xfd6sjg/${filename}\r\n--0123456789ABLEWASIEREISAWELBA9876543210--"
-        @multi_part_headers = {'Accept'=>'*/*', 'Content-Type'=>'multipart/form-data; boundary=0123456789ABLEWASIEREISAWELBA9876543210', 'User-Agent'=>'Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-us) AppleWebKit/523.10.6 (KHTML, like Gecko) Version/3.0.4 Safari/523.10.6'}
-      end
+            upload_uri: 'https://widget.example.com/attachments',
+            local: {
+              key: 'attachments/5/requests/000/000/777/abc/${filename}',
+              x_4me_expiration: '2020-11-01T23:59:59Z',
+              x_4me_signature: 'foobar'
+            }
+          }
+          stub_request(:get, 'https://api.4me.com/v1/attachments/storage').with(credentials(authentication)).to_return(status: 200, body: resp.to_json)
+        end
 
-      it 'should open a file from disk' do
-        expect(@attachments).to receive(:upload_to_4me).with(@sdk4me_conf, @key_template, @key, kind_of(File))
-        expect(@attachments.send(:upload_attachment, @sdk4me_conf, "#{@fixture_dir}/upload.txt", false)).to eq({key: @key, filesize: 7})
+        it 'should raise an error when the file could not be found' do
+          a = attachments(authentication, '/requests')
+          expect(@client).not_to receive(:send_file)
+          message = 'Attachment upload failed: file does not exist: /tmp/unknown_file'
+          expect_log(message, :error)
+          expect { a.send(:upload_attachment, '/tmp/unknown_file') }.to raise_error(::Sdk4me::UploadFailed, message)
+        end
       end
 
-      it 'should sent the upload to 4me' do
-        stub_request(:post, 'https://api.4me.com/v1/attachments').with(basic_auth: ['secret', 'x']).with(body: @multi_part_body, headers: @multi_part_headers).to_return(body: {}.to_json)
-        expect(@attachments.send(:upload_attachment, @sdk4me_conf, "#{@fixture_dir}/upload.txt", false)).to eq({key: @key, filesize: 7})
-      end
+      context :s3 do
+        before(:each) do
+          resp = {
+            provider: 's3',
+            upload_uri: 'https://example.s3-accelerate.amazonaws.com/',
+            s3: {
+              acl: 'private',
+              key: 'attachments/5/reqs/000/070/451/zxxb4ot60xfd6sjg/${filename}',
+              policy: 'eydlgIH0=',
+              success_action_status: 201,
+              x_amz_algorithm: 'AWS4-HMAC-SHA256',
+              x_amz_credential: 'AKIATRO999Z9E9D2EQ7B/20201107/us-east-1/s3/aws4_request',
+              x_amz_date: '20201107T000000Z',
+              x_amz_server_side_encryption: 'AES256',
+              x_amz_signature: 'nbhdec4k='
+            }
+          }
+          stub_request(:get, 'https://api.4me.com/v1/attachments/storage').with(credentials(authentication)).to_return(status: 200, body: resp.to_json)
+        end
+
+        it 'should upload a file from disk' do
+          Tempfile.create('4me_attachments_spec.txt') do |file|
+            file << 'foobar'
+            file.flush
+
+            a = attachments(authentication, '/requests')
+
+            stub_request(:post, 'https://example.s3-accelerate.amazonaws.com/')
+              .with(
+                body: "--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"Content-Type\"\r\n\r\napplication/octet-stream\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"acl\"\r\n\r\nprivate\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"key\"\r\n\r\nattachments/5/reqs/000/070/451/zxxb4ot60xfd6sjg/${filename}\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"policy\"\r\n\r\neydlgIH0=\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"success_action_status\"\r\n\r\n201\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"x_amz_algorithm\"\r\n\r\nAWS4-HMAC-SHA256\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"x_amz_credential\"\r\n\r\nAKIATRO999Z9E9D2EQ7B/20201107/us-east-1/s3/aws4_request\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"x_amz_date\"\r\n\r\n20201107T000000Z\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"x_amz_server_side_encryption\"\r\n\r\nAES256\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"x_amz_signature\"\r\n\r\nnbhdec4k=\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"file\"; filename=\"#{file.path}\"\r\nContent-Type: application/octet-stream\r\n\r\nfoobar\r\n--0123456789ABLEWASIEREISAWELBA9876543210--",
+                headers: {
+                  'Accept' => '*/*',
+                  'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+                  'Content-Type' => 'multipart/form-data; boundary=0123456789ABLEWASIEREISAWELBA9876543210',
+                  'User-Agent' => "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-us) AppleWebKit/523.10.6 (KHTML, like Gecko) Version/3.0.4 Safari/523.10.6 4me/#{Sdk4me::Client::VERSION}"
+                }
+              )
+              .to_return(status: 200, body: '', headers: {})
+
+            expect(a.send(:upload_attachment, file.path)).to eq({
+                                                                  key: "attachments/5/reqs/000/070/451/zxxb4ot60xfd6sjg/#{File.basename(file.path)}",
+                                                                  filesize: 6
+                                                                })
+          end
+        end
 
-      it 'should report an error when 4me upload fails' do
-        stub_request(:post, 'https://api.4me.com/v1/attachments').with(basic_auth: ['secret', 'x']).with(body: @multi_part_body, headers: @multi_part_headers).to_return(body: {message: 'oops!'}.to_json)
-        expect_log('Request failed: oops!', :error)
-        expect_log("Attachment upload failed: 4me upload to https://api.4me.com/attachments for #{@key} failed: oops!", :error)
-        expect(@attachments.send(:upload_attachment, @sdk4me_conf, "#{@fixture_dir}/upload.txt", false)).to be_nil
+        it 'should report an error when upload fails' do
+          Tempfile.create('4me_attachments_spec.txt') do |file|
+            file << 'foobar'
+            file.flush
+
+            a = attachments(authentication, '/requests')
+
+            stub_request(:post, 'https://example.s3-accelerate.amazonaws.com/')
+              .with(
+                body: "--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"Content-Type\"\r\n\r\napplication/octet-stream\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"acl\"\r\n\r\nprivate\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"key\"\r\n\r\nattachments/5/reqs/000/070/451/zxxb4ot60xfd6sjg/${filename}\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"policy\"\r\n\r\neydlgIH0=\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"success_action_status\"\r\n\r\n201\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"x_amz_algorithm\"\r\n\r\nAWS4-HMAC-SHA256\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"x_amz_credential\"\r\n\r\nAKIATRO999Z9E9D2EQ7B/20201107/us-east-1/s3/aws4_request\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"x_amz_date\"\r\n\r\n20201107T000000Z\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"x_amz_server_side_encryption\"\r\n\r\nAES256\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"x_amz_signature\"\r\n\r\nnbhdec4k=\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"file\"; filename=\"#{file.path}\"\r\nContent-Type: application/octet-stream\r\n\r\nfoobar\r\n--0123456789ABLEWASIEREISAWELBA9876543210--",
+                headers: {
+                  'Accept' => '*/*',
+                  'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+                  'Content-Type' => 'multipart/form-data; boundary=0123456789ABLEWASIEREISAWELBA9876543210',
+                  'User-Agent' => "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-us) AppleWebKit/523.10.6 (KHTML, like Gecko) Version/3.0.4 Safari/523.10.6 4me/#{Sdk4me::Client::VERSION}"
+                }
+              )
+              .to_return(status: 400, body: '<Error><Message>Foo Bar Failure</Message></Error>', headers: {})
+
+            key = "attachments/5/reqs/000/070/451/zxxb4ot60xfd6sjg/#{File.basename(file.path)}"
+            message = "Attachment upload failed: AWS S3 upload to https://example.s3-accelerate.amazonaws.com/ for #{key} failed: Foo Bar Failure"
+            # expect_log(message, :error)
+            expect { a.send(:upload_attachment, file.path) }.to raise_error(::Sdk4me::UploadFailed, message)
+          end
+        end
       end
 
-      it 'should raise an exception when 4me upload fails' do
-        stub_request(:post, 'https://api.4me.com/v1/attachments').with(basic_auth: ['secret', 'x']).with(body: @multi_part_body, headers: @multi_part_headers).to_return(body: {message: 'oops!'}.to_json)
-        expect_log('Request failed: oops!', :error)
-        message = "Attachment upload failed: 4me upload to https://api.4me.com/attachments for #{@key} failed: oops!"
-        expect{ @attachments.send(:upload_attachment, @sdk4me_conf, "#{@fixture_dir}/upload.txt", true) }.to raise_error(::Sdk4me::UploadFailed, message)
+      context '4me local' do
+        before(:each) do
+          resp = {
+            provider: 'local',
+            upload_uri: 'https://widget.example.com/attachments',
+            local: {
+              key: 'attachments/5/requests/000/000/777/abc/${filename}',
+              x_4me_expiration: '2020-11-01T23:59:59Z',
+              x_4me_signature: 'foobar'
+            }
+          }
+          stub_request(:get, 'https://api.4me.com/v1/attachments/storage').with(credentials(authentication)).to_return(status: 200, body: resp.to_json)
+        end
+
+        it 'should upload a file from disk' do
+          Tempfile.create('4me_attachments_spec.txt') do |file|
+            file << 'foobar'
+            file.flush
+
+            a = attachments(authentication, '/requests')
+
+            stub_request(:post, 'https://widget.example.com/attachments')
+              .with(
+                body: "--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"Content-Type\"\r\n\r\napplication/octet-stream\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"key\"\r\n\r\nattachments/5/requests/000/000/777/abc/${filename}\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"x_4me_expiration\"\r\n\r\n2020-11-01T23:59:59Z\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"x_4me_signature\"\r\n\r\nfoobar\r\n--0123456789ABLEWASIEREISAWELBA9876543210\r\nContent-Disposition: form-data; name=\"file\"; filename=\"#{file.path}\"\r\nContent-Type: application/octet-stream\r\n\r\nfoobar\r\n--0123456789ABLEWASIEREISAWELBA9876543210--",
+                headers: {
+                  'Accept' => '*/*',
+                  'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+                  'Authorization' => (authentication == :api_token ? 'Basic c2VjcmV0Ong=' : 'Bearer secret'),
+                  'Content-Type' => 'multipart/form-data; boundary=0123456789ABLEWASIEREISAWELBA9876543210',
+                  'User-Agent' => "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-us) AppleWebKit/523.10.6 (KHTML, like Gecko) Version/3.0.4 Safari/523.10.6 4me/#{Sdk4me::Client::VERSION}"
+                }
+              )
+              .to_return(status: 204, body: '', headers: {})
+
+            expect(a.send(:upload_attachment, file.path)).to eq({
+                                                                  key: "attachments/5/requests/000/000/777/abc/#{File.basename(file.path)}",
+                                                                  filesize: 6
+                                                                })
+          end
+        end
       end
     end
-
   end
 end