salesforceapi-rest 0.0.2 → 0.0.3

data/lib/salesforceapi-rest.rb

@@ -26,28 +26,20 @@ module Salesforceapi
         headers (auth_setting)
       end
 
-      def initialize(oauth_token, instance_uri, metadata_uri, api_version = "v21.0")
-        @oauth_token = oauth_token
-        @instance_uri = instance_uri
+      def initialize(refresh_token, metadata_uri, client_id, client_secret)
+        @refresh_token = refresh_token
+        @client_id = client_id
+        @client_secret = client_secret
         @metadata_uri = metadata_uri
-        @api_version = api_version ? api_version : "v21.0"  #take a dynamic api server version
-        @full_url = instance_uri + "/services/data/#{api_version}/sobjects"
+        @api_version = "v21.0"
         @ssl_port = 443  # TODO, right SF use port 443 for all HTTPS traffic.
 
-
-        # To be used by HTTParty
-        @auth_header = {
-          "Authorization" => "OAuth " + @oauth_token,
-          "content-Type" => 'application/json'
-        }
-
-        self.class.base_uri @instance_uri
-
       end
 
 
       def create(object, attributes)
 
+        config_authorization!
         path = "/services/data/#{@api_version}/sobjects/#{object}/"
         target = @instance_uri + path
 
@@ -68,6 +60,7 @@ module Salesforceapi
 
       def describe(object)
         path = "/services/data/#{@api_version}/sobjects/#{object}/describe"
+        config_authorization!
         target = @instance_uri + path
 
         self.class.base_uri @instance_uri
@@ -83,6 +76,7 @@ module Salesforceapi
 
       def resources
         path = "/services/data/#{@api_version}"
+        config_authorization!
         target = @instance_uri + path
 
         self.class.base_uri @instance_uri
@@ -96,25 +90,42 @@ module Salesforceapi
         end
       end
 
+      def config_authorization!
+        target = target = "https://login.salesforce.com/services/oauth2/token?grant_type=refresh_token&client_id=#{@client_id}&client_secret=#{@client_secret}&refresh_token=#{@refresh_token}"
+        resp = SalesforceApi::Request.do_request("POST", target, {"content-Type" => 'application/json'}, nil)
+        if (resp.code != 200) || !resp.success?
+          message = ActiveSupport::JSON.decode(resp.body)["error_description"]
+          SalesforceApi::Errors::ErrorManager.raise_error(message, 401)
+        else
+          response = ActiveSupport::JSON.decode(resp.body)
+        end
+        @instance_uri = response['instance_url']
+        @access_token = response['access_token']
+        @auth_header = {
+          "Authorization" => "OAuth " + @access_token,
+          "content-Type" => 'application/json'
+        }
+      end
+
 
       def add_custom_field(attributes)
+        config_authorization!
         auth_header = {
-          "Authorization" => "OAuth " + @oauth_token,
+          "Authorization" => "OAuth " + @access_token,
           'Connection' => 'Keep-Alive',
           'Content-Type' => 'text/xml',
           'SOAPAction' => '""'
         }
+
         self.class.base_uri @metadata_uri
 
-        data = (Envelope % [@oauth_token, custom_fields_xml(attributes)])
+        data = (Envelope % [@access_token, custom_fields_xml(attributes)])
         resp = SalesforceApi::Request.do_request("POST", @metadata_uri, auth_header, data.lstrip)
 
         xml_response = Crack::XML.parse(resp.body)
 
         if resp.code != 200
-          message = xml_response["soapenv:Envelope"]["soapenv:Body"]["soapenv:Fault"]["faultstring"]
-          SalesforceApi::Errors::ErrorManager.raise_error("HTTP code " + resp.code.to_s + ": " + message, resp.code)
-
+          SalesforceApi::Errors::ErrorManager.raise_error("HTTP code " + resp.code.to_s + " xml response: " + resp.body, resp.code)
         else
           return xml_response
         end

data/lib/salesforceapi-rest/version.rb

@@ -1,5 +1,5 @@
 module Salesforceapi
   module Rest
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salesforceapi-rest
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: