lib/gooddata/bricks/middleware/gooddata_middleware.rb in gooddata-0.6.10 vs lib/gooddata/bricks/middleware/gooddata_middleware.rb in gooddata-0.6.11
- old
+ new
@@ -14,19 +14,21 @@
protocol_name = 'GDC_PROTOCOL'
server_name = 'GDC_HOSTNAME'
project_id = params['GDC_PROJECT_ID']
fail 'SST (SuperSecureToken) not present in params' if params[token_name].nil?
+
server = if !params[protocol_name].empty? && !params[server_name].empty?
"#{params[protocol_name]}://#{params[server_name]}"
end
- fail 'GoodData username is missing. Expected param :GDC_USERNAME' if params['GDC_USERNAME'].nil?
- fail 'GoodData password is missing. Expected param :GDC_PASSWORD' if params['GDC_PASSWORD'].nil?
-
- client = GoodData.connect(params['GDC_USERNAME'], params['GDC_PASSWORD'], :server => server)
+ client = if params['GDC_USERNAME'].nil? || params['GDC_PASSWORD'].nil?
+ GoodData.connect(sst_token: params['GDC_SST'], server: server)
+ else
+ GoodData.connect(params['GDC_USERNAME'], params['GDC_PASSWORD'], server: server)
+ end
GoodData.logger = logger
- GoodData.with_project(project_id, :client => client) do |p|
+ GoodData.with_project(project_id, :client => client) do |_p|
@app.call(params)
end
end
end
end