databasedotcom 1.1.4 → 1.1.5

data/lib/databasedotcom/client.rb

@@ -29,6 +29,8 @@ module Databasedotcom
     attr_accessor :username
     # The SalesForce password
     attr_accessor :password
+    # The SalesForce organization id for the authenticated user's Salesforce instance
+    attr_reader :org_id
 
     # Returns a new client object. _options_ can be one of the following
     #
@@ -86,8 +88,7 @@ module Databasedotcom
     # Raises SalesForceError if an error occurs
     def authenticate(options = nil)
       if user_and_pass?(options)
-        req = Net::HTTP.new(self.host, 443)
-        req.use_ssl=true
+        req = https_request(self.host)
         user = self.username || options[:username]
         pass = self.password || options[:password]
         path = "/services/oauth2/token?grant_type=password&client_id=#{self.client_id}&client_secret=#{client_secret}&username=#{user}&password=#{pass}"
@@ -100,7 +101,7 @@ module Databasedotcom
         parse_auth_response(result.body)
       elsif options.is_a?(Hash)
         if options.has_key?("provider")
-          @user_id = options["extra"]["user_hash"]["user_id"] rescue nil
+          parse_user_id_and_org_id_from_identity_url(options["uid"])
           self.instance_url = options["credentials"]["instance_url"]
           self.oauth_token = options["credentials"]["token"]
           self.refresh_token = options["credentials"]["refresh_token"]
@@ -117,6 +118,11 @@ module Databasedotcom
       self.oauth_token
     end
 
+    # The SalesForce organization id for the authenticated user's Salesforce instance
+    def org_id
+      @org_id ||= query_org_id # lazy query org_id when not set by login response
+    end
+
     # Returns an Array of Strings listing the class names for every type of _Sobject_ in the database. Raises SalesForceError if an error occurs.
     def list_sobjects
       result = http_get("/services/data/v#{self.version}/sobjects")
@@ -327,7 +333,7 @@ module Databasedotcom
 
     def ensure_expected_response(expected_result_class)
       response = yield
-      
+
       unless response.is_a?(expected_result_class || Net::HTTPSuccess)
         if response.is_a?(Net::HTTPUnauthorized)
           if self.refresh_token
@@ -349,13 +355,13 @@ module Databasedotcom
           end
 
           if response.is_a?(Net::HTTPSuccess)
-            response = yield 
+            response = yield
           end
         end
-        
-        raise SalesForceError.new(response) unless response.is_a?(expected_result_class ||  Net::HTTPSuccess) 
+
+        raise SalesForceError.new(response) unless response.is_a?(expected_result_class ||  Net::HTTPSuccess)
       end
-      
+
       response
     end
 
@@ -375,7 +381,7 @@ module Databasedotcom
       base_url = options[:host] ? "https://#{options[:host]}" : self.instance_url
       puts "***** REQUEST: #{path.include?(':') ? path : URI.join(base_url, path)}#{options[:data] ? " => #{options[:data]}" : ''}" if self.debugging
     end
-    
+
     def uri_escape(str)
       URI.escape(str.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
     end
@@ -469,12 +475,22 @@ module Databasedotcom
     def user_and_pass?(options)
       (self.username && self.password) || (options && options[:username] && options[:password])
     end
-    
+
+    def parse_user_id_and_org_id_from_identity_url(identity_url)
+      m = identity_url.match(/\/id\/([^\/]+)\/([^\/]+)$/)
+      @org_id = m[1] rescue nil
+      @user_id = m[2] rescue nil
+    end
+
     def parse_auth_response(body)
       json = JSON.parse(body)
-      @user_id = json["id"].match(/\/([^\/]+)$/)[1] rescue nil
+      parse_user_id_and_org_id_from_identity_url(json["id"])
       self.instance_url = json["instance_url"]
       self.oauth_token = json["access_token"]
     end
+
+    def query_org_id
+      query("select id from Organization")[0]["Id"]
+    end
   end
 end

data/lib/databasedotcom/version.rb

@@ -1,3 +1,3 @@
 module Databasedotcom
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

metadata

@@ -2,7 +2,7 @@
 name: databasedotcom
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors: 
 - Glenn Gillen, Danny Burkes & Richard Zhao
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-12 00:00:00 Z
+date: 2011-10-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post