adops_report_scrapper 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edfa740c95e357d7bb46833be1c18bf610ea38af
-  data.tar.gz: 9370b7ba6a8f9bcf1066f8c904967866a54cb68c
+  metadata.gz: 2062161736aa199788f24a787649cc654fce4f67
+  data.tar.gz: dd424d62acb31fc097d8a4dd6951aa9b75e37d5b
 SHA512:
-  metadata.gz: e47ee08b90c72bcf731d1d2d8ac66cf3304a8b284c73e787bbad0d0823625603e676a224c00a5d4cd5a98d55c8f2c377926971434977d967bcc0aa993bd34e26
-  data.tar.gz: cf3eeb5ad64dd98de6a45958bef94c3106b5bbbcee97b7766687f6d74d3d1382f3a373ea89affa52158557bbaa0fd485e23519ec95372647366db0a19064cb89
+  metadata.gz: f8e3e4d325b51ff318ab3a944d2c2fbcdc29bd7583a0e5287000417fec93377fc7bc1f5ebdf5edd07894337c059bc6307efac91ec5edc88a5c3189bd203d065f
+  data.tar.gz: 9090366aabcb84f92dc3c86127059e5d29d70cac949a0a98c88b6dcca2759ad65dd29baa4042da5b555df047e13f159e329150bc05ac6e86ccb0acc4c2baba2d

data/CHANGELOG

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 0.2.9
+fix spotxchange
+
 ## 0.2.8
 implement spotxchange
 

data/lib/adops_report_scrapper/spotxchange_client.rb

@@ -12,8 +12,11 @@ class AdopsReportScrapper::SpotxchangeClient < AdopsReportScrapper::BaseClient
   private
 
   def init_client
-    fail 'please specify spotxchange oauth code' unless @options['code']
-    @code = @options['code']
+    fail 'please specify spotxchange oauth client_id' unless @options['client_id']
+    @client_id = @options['client_id']
+    fail 'please specify spotxchange oauth client_secret' unless @options['client_secret']
+    @client_secret = @options['client_secret']
+    super
   end
 
   def before_quit_with_error
@@ -22,7 +25,19 @@ class AdopsReportScrapper::SpotxchangeClient < AdopsReportScrapper::BaseClient
   def scrap
     date_str = @date.strftime('%Y-%m-%d')
 
-    body = { 'client_id' => @login, 'client_secret' => @secret, 'grant_type' => 'authorization_code', 'code' => @code }
+    @client.visit "https://publisher-api.spotxchange.com/oauth2/publisher/approval.html?client_id=#{@client_id}&response_type=code&state=xyz"
+    @client.click_button 'Accept'
+
+    @client.fill_in 'Username', :with => @login
+    @client.fill_in 'Password', :with => @secret
+    @client.click_button 'Login'
+
+    @client.click_button 'Accept'
+    sleep 1
+
+    code = URI::decode_www_form(URI.parse(@client.driver.network_traffic.last.url).query).to_h['code']
+
+    body = { 'client_id' => @client_id, 'client_secret' => @client_secret, 'grant_type' => 'authorization_code', 'code' => code }
     response = HTTPClient.post 'https://publisher-api.spotxchange.com/1.0/token', body
     token = JSON.parse(response.body)['value']['data']['access_token']
 

data/lib/adops_report_scrapper/version.rb

@@ -1,3 +1,3 @@
 module AdopsReportScrapper
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

data/secret.sample.yml

@@ -135,4 +135,5 @@ spotxchange:
   login: ------
   secret: ------
   options:
-    code: ------
+    client_id: ------
+    client_secret: ------

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adops_report_scrapper
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Stayman Hou