myob-api 0.8 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd7d16454a5dd331bfb7ead95ff73e6bca504987
-  data.tar.gz: 354d7ee0fdfa37a0d467afb72742f50982a1e725
+  metadata.gz: 811d5f79a8b26836ec00106c574f869b682521b6
+  data.tar.gz: d662c42c636b9558fcecb5230f7e1a4bcabdae35
 SHA512:
-  metadata.gz: f509295319d486f9d2a13f726e575d7500af66cafa96a8d4b0d33d4a5f2f27d2bec0551871cbc42ec20aece085ccd68fdca279a03d8eb185e7ec107f883f1107
-  data.tar.gz: 77e5b218728121d9e7bc75651152746ecaa4b08828af61b1f1453ba273719a25d4385cda1d7730e629c608505fcb1d77d448e588187fb295a9839b72b1306506
+  metadata.gz: 07626d4621630fa176b4d10a63fe008ca3aeb2ab0a195d3ed0b238e4a1d73f4bd5e230b4eaf263cd0e2ef84193ef29e6f52eaa09a0c3b6691df6db6f619c2f2a
+  data.tar.gz: bc89612b051e0c05cf64302fce29cacbcbcc6a536a7d70bb07a20c798c9a32b0ec28051e84a6ab8529046454f557d4729beac5b5b6997cffe6418795ed1c5742

data/lib/myob/api/client.rb

@@ -40,20 +40,35 @@ module Myob
       end
 
       def headers
-        {
-          'x-myobapi-key'     => @consumer[:key],
-          'x-myobapi-version' => 'v2',
-          'x-myobapi-cftoken' => @current_company_file[:token] || '',
-          'Content-Type'      => 'application/json'
-        }
+        token = @current_company_file[:token]
+        if token.nil? || token == ''
+          # if token is blank assume we are using federated login - http://myobapi.tumblr.com/post/109848079164/2015-1-release-notes
+          {
+            'x-myobapi-key'     => @consumer[:key],
+            'x-myobapi-version' => 'v2',
+            'Content-Type'      => 'application/json'
+          }
+        else
+          {
+            'x-myobapi-key'     => @consumer[:key],
+            'x-myobapi-version' => 'v2',
+            'x-myobapi-cftoken' => token,
+            'Content-Type'      => 'application/json'
+          }
+        end
       end
 
       def select_company_file(company_file)
         company_file_id = (self.company_file.all.find {|file| file['Name'] == company_file[:name]} || [])['Id']
         if company_file_id
+          token = company_file[:token]
+          if (!token || token == '') && company_file[:username] && company_file[:username] != '' && company_file[:password] && company_file[:password] != ''
+            # if we have been given login details, encode them into a token
+            token = Base64.encode64("#{company_file[:username]}:#{company_file[:password]}")
+          end
           @current_company_file = {
             :id    => company_file_id,
-            :token => company_file[:token] || Base64.encode64("#{company_file[:username]}:#{company_file[:password]}"),
+            :token => token
           }
         end
       end

data/lib/myob/api/version.rb

@@ -1,5 +1,5 @@
 module Myob
   module Api
-    VERSION = "0.8"
+    VERSION = "0.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: myob-api
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: '0.9'
 platform: ruby
 authors:
 - David Lumley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: MYOB AccountRight Live API V2