ipizza-omniauth-provider 0.1.5 → 0.2.0

data/lib/ipizza-omniauth-provider/version.rb

@@ -1,7 +1,7 @@
 module Ipizza
   module Omniauth
     module Provider
-      VERSION = '0.1.5'
+      VERSION = '0.2.0'
     end
   end
 end

data/lib/omniauth/strategies/ipizza.rb

@@ -19,26 +19,30 @@ module OmniAuth
       end
 
       def request_phase
-        if env['REQUEST_METHOD'] == 'GET'
-          get_credentials
-        else
+        if request.params['bank']
           provider = ipizza_provider_for(request.params['bank'])
-
-          req = provider.authentication_request
-          url = [req.service_url, Rack::Utils.build_query(req.request_params)] * '?'
-          
-          debug "Redirecting to #{url}"
           
-          redirect url
+          if provider
+            begin
+              req = provider.authentication_request
+            
+              url = [req.service_url, Rack::Utils.build_query(req.request_params)] * '?'
+        
+              debug "Redirecting to #{url}"
+        
+              redirect url
+            rescue => e
+              debug "Failed to create provider rquest: #{e.inspect}"
+              fail!(:internal_error, {'ipizza_error' => 'internal_error', 'message' => "Failed to create request for provider '#{request.params['bank']}'."})
+            end
+          else
+            fail!(:invalid_ipizza_provider, {'ipizza_error' => 'invalid_ipizza_provider', 'message' => "Invalid Ipizza provider '#{request.params['bank']}'"})
+          end
+        else
+          fail!(:bank_identifier_missing, {'ipizza_error' => 'bank_identifier_missing', 'message' => 'Bank identifier is missing'})
         end
       end
 
-      def get_credentials
-        OmniAuth::Form.build(@title) do
-          text_field 'Bank', 'bank'
-        end.to_response
-      end
-
       def callback_phase
         debug "Callback in iPizza authentication. Parameters: #{request.params.inspect}"
 
@@ -49,22 +53,27 @@ module OmniAuth
         
         if request.params['VK_SND_ID']
           provider = ipizza_provider_for(request.params['VK_SND_ID'])
-          resp = provider.authentication_response(request.params)
+          
+          if provider 
+            resp = provider.authentication_response(request.params)
         
-          if resp.valid? and resp.success?
-            @user_data = {'personal_code' => resp.info_social_security_id, 'name' => resp.info_name}
-            @env['omniauth.auth'] = auth_hash
+            if resp.valid? and resp.success?
+              @user_data = {'personal_code' => resp.info_social_security_id, 'name' => resp.info_name}
+              @env['omniauth.auth'] = auth_hash
             
-            debug "iPizza request was authenticated successfully. User data: #{auth_hash.inspect}"
+              debug "iPizza request was authenticated successfully. User data: #{auth_hash.inspect}"
             
-            call_app!
+              call_app!
+            else
+              debug 'Could not authenticate iPizza request'
+              fail!(:invalid_credentials, {'ipizza_error' => 'invalid_credentials', 'message' => 'Invalid bank response'})
+            end
           else
-            debug 'Could not authenticate iPizza request'
-            fail!(:invalid_credentials, {'error' => 'Invalid bank response'})
+            fail!(:invalid_ipizza_provider, {'ipizza_error' => 'invalid_ipizza_provider', 'message' => "Invalid Ipizza provider '#{request.params['VK_SND_ID']}'"})
           end
         else
           debug 'Did not recognize iPizza request'
-          fail(:invalid_credentials, {'error' => 'Bank request cancelled'})
+          fail!(:invalid_credentials, {'ipizza_error' => 'invalid_credentials', 'message' => 'Bank request cancelled'})
         end
       end
       
@@ -101,4 +110,4 @@ module OmniAuth
 
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ipizza-omniauth-provider
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Priit Haamer