oa-webmoney 0.1.2 → 0.1.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 206a52b6f38d7d2a0cddb2c90f0b1061c83c3054
+  data.tar.gz: e2398d22d23aec51c170c9315cdbefbd9394ff22
+SHA512:
+  metadata.gz: ab50744c858e01b8ac1f973c0f6c49a2454dcd534acdb974a7eab293fffcd18389871de4716f5542f1c9127d64731d263f940e41dc3ea1dd0873b222b0cce3b9
+  data.tar.gz: 9f01a3bc1066a3d66a07dd4d0fb062bda212bb8cb1c220a9550ceb9669d05bf23af46756a63c9894775ac66aae98d5a15d97549bda1c429b59bed9dc90b145ef

data/README.md

@@ -32,6 +32,7 @@ devise.rb
         :app_rids => {
           'localhost'   => 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
           'example.com' => 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx' }},
+        :trusted_addr => %w(127.0.0.1 172.16.0.0/16)
       :env => Rails.env,
       :wm_instance => Rails.webmoney #optional, if you have already used webmoney gem instance in your app
 

data/lib/oa-webmoney/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Webmoney
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/lib/oa-webmoney/webmoney.rb

@@ -1,3 +1,4 @@
+require 'ipaddr'
 require 'omniauth'
 require 'webmoney'
 
@@ -39,11 +40,7 @@ module OmniAuth
         # 11
         :pwd_access_blocked   => "Password access to the service blocked",
         # 12
-        :user_blocked         => "The user is temporarily blocked. Probably made the selection Ticket",
-        # 201
-        :ip_differs           => "Ip address in the request differs from the address, which was an authorized user",
-
-        :canceled             => "Authorization was canceled by user"
+        :user_blocked         => "The user is temporarily blocked. Probably made the selection Ticket"
       }
 
       option :credentials
@@ -59,14 +56,9 @@ module OmniAuth
       end
 
       def callback_phase
-        if request.params["WmLogin_KeeperRetStr"] == "Canceled"
-          return fail!(:canceled, OmniAuth::Error.new(ERROR_MESSAGES[:canceled]))
-        end
-
-        # work around for local development
-        ip_to_check = [:development, :test].include?(options[:env].to_sym) ? extra[:WmLogin_UserAddress] : request.ip
+        return cancel_authentication! if cancel_authentication?
 
-        check_req_params = extra.merge({:remote_ip => ip_to_check})
+        check_req_params = extra.merge({:remote_ip => extra[:WmLogin_UserAddress]})
 
         options[:wm_instance] ||= WmLib.new(:wmid => options[:credentials][:site_holder_wmid])
 
@@ -103,6 +95,16 @@ module OmniAuth
         super
       end
 
+      def cancel_authentication!
+        r = Rack::Response.new
+        r.redirect "/"
+        r.finish
+      end
+
+      def cancel_authentication?
+        %w(Canceled LoggedOff).include?(request.params["WmLogin_KeeperRetStr"])
+      end
+
       def uid
         extra[:WmLogin_WMID]
       end

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: oa-webmoney
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.1.3
 platform: ruby
 authors:
 - Anton Orel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webmoney
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.12
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.rc.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.rc.2
 description: OmniAuth Webmoney Strategy
@@ -50,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGES
 - Gemfile
 - LICENSE
@@ -62,27 +57,26 @@ files:
 - oa-webmoney.gemspec
 homepage: http://github.com/skyeagle/oa-webmoney
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OmniAuth Webmoney Strategy
 test_files: []
 has_rdoc: