amazon_auth 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1dbb0da03518895958625aac116361d7066be7cc
-  data.tar.gz: b84f4bc692e5d72c30490b1a16f01ae5c63b0f60
+SHA256:
+  metadata.gz: 7da5d38fe75349e2e609f1acdef47b251a0a3353ba9693ac7a3961848bdaa645
+  data.tar.gz: 28faf4af2fbd6084d62a9bfe9dd8c7b94b200d5cca9b7a8fb14d4d569975284e
 SHA512:
-  metadata.gz: 8195b7eed62aaee754064d81f730c9fd693da277de2b61aea7a3e0790003f471929f7f33f366b01e115cff56b422983baf8616b23869d65db599efe36fe7b3b8
-  data.tar.gz: 74ea3466c4edbad675f93d1ae6bfa909550fcc2105982f9a7af9ca03d2ec6474eb463deade4448d31c87058e6760d9fda012e329839b7de7baa72d40e58825b5
+  metadata.gz: 9cee30a8fb0c0955acc36341d980ca9d5545e162199164f2e9f46140e415fcd3e36f92c5910b32c2ec2d1ef64a9e2d20d85b0d63032d28b2a484cb93c7a3fd2d
+  data.tar.gz: 8b3655e0a60e5c36686714ba8e98aa1eb5939a1a6358de45b2237a26be58628855c79e4c2802061ca54c4b3b0fa77fa648ecda7d08c27153cea81f8eb6e4c523

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
@@ -12,7 +11,7 @@ module AmazonAuth
 
     def wait_for_selector(selector, options = {})
       options.fetch(:wait_time, 3).times do
-        if session.first(selector)
+        if session.first(selector, minimum: 0)
           break
         else
           sleep(1)
@@ -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,13 +49,22 @@ 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') && session.first('#ap_email').value.blank?
+      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
       session.first('#signInSubmit').click
       log "Clicked signInSubmit"
@@ -97,13 +105,22 @@ module AmazonAuth
       session.has_selector?('#auth-captcha-image-container')
     end
 
+    def find_sign_in_link
+      link = links_for('a').find{|l| l =~ %r{\A/gp/navigation/redirector.html} }
+      return link if link
+      m = session.html.match(%r{'(/gp/navigation/redirector.html[^']+)'})
+      return m[1] if m
+      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
+    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.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon_auth
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Kazuho Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-09 00:00:00.000000000 Z
+date: 2020-09-05 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.13
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Login amazon.