lib/gooddata/bricks/middleware/restforce_middleware.rb in gooddata-0.6.10 vs lib/gooddata/bricks/middleware/restforce_middleware.rb in gooddata-0.6.11

@@ -8,19 +8,20 @@
 module GoodData
   module Bricks
     class RestForceMiddleware < Bricks::Middleware
       DEFAULT_VERSION = '29.0'
 
-      def call(params)
-        username = params['salesforce_username']
-        password = params['salesforce_password']
-        token = params['salesforce_token']
-        client_id = params['salesforce_client_id']
-        client_secret = params['salesforce_client_secret']
-        oauth_refresh_token = params['salesforce_oauth_refresh_token']
-        host = params['salesforce_host']
-        version = params['salesforce_api_version'] || DEFAULT_VERSION
+      def self.create_client(params)
+        downloader_config = params['config']['downloader']['salesforce']
+        username = downloader_config['username']
+        password = downloader_config['password']
+        token = downloader_config['token']
+        client_id = downloader_config['client_id']
+        client_secret = downloader_config['client_secret']
+        oauth_refresh_token = downloader_config['oauth_refresh_token']
+        host = downloader_config['host']
+        version = downloader_config['api_version'] || DEFAULT_VERSION
 
         credentials = if username && password && token
                         {
                           :username => username,
                           :password => password,
@@ -32,20 +33,25 @@
                         }
                       end
 
         client = if credentials
                    credentials.merge!(
-                                        :client_id => client_id,
-                                        :client_secret => client_secret
-                                      )
+                     :client_id => client_id,
+                     :client_secret => client_secret
+                   )
                    credentials[:host] = host unless host.nil?
                    credentials[:api_version] = version
 
-                   Restforce.log = true if params['salesforce_client_logger']
+                   Restforce.log = true if params['GDC_LOGGER']
 
                    Restforce.new(credentials)
                  end
-        @app.call(params.merge('salesforce_client' => client))
+        params.merge('salesforce_client' => client)
+      end
+
+      def call(params)
+        params = self.class.create_client(params)
+        @app.call(params)
       end
     end
   end
 end