amazon_auth 0.4.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ea1813a746339a62a99590ceb61c86c4e26a50b1
-  data.tar.gz: 71a1511fe0582cf36b1a3226a6efca496cdaf755
+SHA256:
+  metadata.gz: a45eff39c70d3750f6bb7edd67f68ae06f9e8b8290601aa4fe30f4ac89f3ec9c
+  data.tar.gz: d22f3c9195a3120b5f900824357093003b3c2760c8d3ff9d1a17d323ce5cc8ed
 SHA512:
-  metadata.gz: ed72f566bc716cc31fccbae412889faa255fb1cdb93247d3328ecd5cd2d21b0a94d6d0ce0f1f9d44fabe87dfc90dd765b6d85324c83f5b4f03034478f1943a29
-  data.tar.gz: 651537cd232764dbfe1fe6f2eab87197e4f55b9cfea98ad3b022be0452ddf8005f91e6eb8f622930406e96100d8c51888eedc556cd4ae9d41b313dc0d7e62185
+  metadata.gz: 4fc2ef8f1b551796f6b3efb359987db8a48d05ce51d75d055275c639dd950e51d8f99a90fe5afc4b646940b9bb142b49adc984ee2a922d1b0d2c7cbbc988e022
+  data.tar.gz: 2571de906fdc1470088cb9e71db7d6ac87748e649f6be73beceede17447865e5f597ad9f1cf44edd5748db747e7b15bf45daaf9eb5887d9306472766bdb25b89

data/.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
-before_install: gem install bundler -v 1.14.6
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
+before_install: gem install bundler

data/Rakefile

@@ -3,4 +3,4 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/amazon_auth.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'amazon_auth/version'

data/exe/amazon_auth

@@ -3,12 +3,10 @@
 require_relative "../lib/amazon_auth"
 require 'highline/import'
 
-result = []
-
-domain = ask("Enter your amazon domain: ") { |q| q.echo = true ; q.default = AmazonInfo.domain }
+domain = ask("Enter your amazon domain: ") { |q| q.echo = true; q.default = AmazonInfo.domain }
 login = ask("Enter your #{domain} username: ") { |q| q.echo = true }
 passwd = ask("Enter your #{domain} password: ") { |q| q.echo = "*" }
-salt = ask("Enter your salt: ") { |q| q.default = AmazonAuth::Converter.default_salt ; q.echo = true }
+salt = ask("Enter your salt: ") { |q| q.default = AmazonAuth::Converter.default_salt; q.echo = true }
 
 raise "Empty login or password" if login.to_s.size == 0 || passwd.to_s.size == 0
 

data/lib/amazon_auth/extensions/common_extension.rb

@@ -1,6 +1,5 @@
 module AmazonAuth
   module CommonExtension
-
     def log(message)
       return unless (@options[:debug] || @options[:verbose])
       puts "[#{Time.current.strftime('%Y-%m-%d %H:%M:%S')}] #{message}" +

data/lib/amazon_auth/extensions/session_extension.rb

@@ -1,6 +1,5 @@
 module AmazonAuth
   module SessionExtension
-
     def doc
       Nokogiri.HTML(session.html)
     end
@@ -30,7 +29,7 @@ module AmazonAuth
       session.visit url
       debug "Visiting #{url}"
       restore_cookies if keep_cookie?
-      if (link = links_for('a').find{|link| link =~ %r{\A/gp/navigation/redirector.html} })
+      if (link = find_sign_in_link)
         debug "link: [#{link}]"
         session.visit(link)
       end
@@ -50,11 +49,20 @@ module AmazonAuth
     end
 
     def submit_signin_form
-      session.first('.cvf-account-switcher-profile-details').click if session.has_selector?('.cvf-account-switcher-profile-details')
+      # Click account switcher if it is displayed
+      dom_account_switcher = '.cvf-account-switcher-profile-details, .cvf-account-switcher-claim'
+      session.first(dom_account_switcher).click if session.has_selector?(dom_account_switcher)
+
       debug "Begin submit_signin_form"
       unless session.has_selector?('#signInSubmit')
-        log "signInSubmit button not found in this page"
-        return false
+        if session.has_selector?('input#continue') && session.has_selector?('input#ap_email')
+          log "Found a form which asks only email"
+          session.fill_in 'ap_email', with: login
+          session.first('input#continue').click
+        else
+          log "signInSubmit button not found in this page"
+          return false
+        end
       end
       session.fill_in 'ap_email', with: login if session.first('#ap_email', minimum: 0) && session.first('#ap_email').value.blank?
       session.fill_in 'ap_password', with: password
@@ -97,13 +105,32 @@ module AmazonAuth
       session.has_selector?('#auth-captcha-image-container')
     end
 
-    private
+    def find_sign_in_link
+      m1 = session.html.match(%r{(/ap/signin[^'"]+)['"]})
+      return CGI.unescapeHTML(m1[1]) if m1
 
-      def login
-        options.fetch(:login, Converter.decode(ENV['AMAZON_USERNAME_CODE']))
+      # Maybe the following patterns are deprecated
+      link = links_for('a').find{|l| l =~ %r{\A/gp/navigation/redirector.html} }
+      if link
+        debug "Found a link [#{link}]"
+        return link
       end
-      def password
-        options.fetch(:password, Converter.decode(ENV['AMAZON_PASSWORD_CODE']))
+      m2 = session.html.match(%r{'(/gp/navigation/redirector.html[^']+)'})
+      if m2
+        debug "Found a link (.html.match) [#{m2[1]}]"
+        return m2[1]
       end
+      nil
+    end
+
+    private
+
+    def login
+      options.fetch(:login, Converter.decode(ENV['AMAZON_USERNAME_CODE']))
+    end
+
+    def password
+      options.fetch(:password, Converter.decode(ENV['AMAZON_PASSWORD_CODE']))
+    end
   end
 end

data/lib/amazon_auth/version.rb

@@ -1,3 +1,3 @@
 module AmazonAuth
-  VERSION = "0.4.3"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon_auth
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Kazuho Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -196,8 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Login amazon.