wordjelly-auth 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d62aee756204d076f7a26976465ac2b2c24100bc
-  data.tar.gz: c592d6dd129070328ee7218c50dba3e5ea252f72
+  metadata.gz: d7f68ae70754cc8efa81b6b9866a12c65a56bb5a
+  data.tar.gz: e12957b220ed838620e7e24d0747bd188b1bd509
 SHA512:
-  metadata.gz: 0343c951c0bfc1fb9786753a4519639ce41b80d00ac7037ee6c0adc7f0650b941f38af4ce16f916f937c7109416422b4e725d511fca9b0d8b11a0c526c90b3d2
-  data.tar.gz: 24b707c00cdfd659c7b01dea61b317e3070f6bc57c0bcac2bbecbef6ccff0cbd476e25debc8a5e76b307e4b34bad881e478c589d9d1338184d0ed30c4169f37e
+  metadata.gz: 9252a24504d1432d956f409ee724c11283f7ab3373c7843d8cda5717ad1dddcdd5d749c670ae85690c4a2e47cb3886054b7942149253887e510bdaea566268a1
+  data.tar.gz: cfdd5a20a608130f1b2733ba8a73aa93a44d9b355e0c22edc0651c024f44d486d6f31df039cf7fc356449149304f9d998c177265dd7feab505c92d41509b95ec

data/app/controllers/auth/concerns/omni_concern.rb

@@ -2,21 +2,26 @@ module Auth::Concerns::OmniConcern
 
   extend ActiveSupport::Concern
 
+
+
   included do
+    
     prepend_before_action :set_devise_mapping_for_omniauth, only: [:omni_common]
+    
     prepend_before_action :do_before_request, only: [:omni_common]
+    
     attr_accessor :resource
+    
     helper_method :omniauth_failed_path_for
-  end
 
-  
+    
+  end
 
 
   def set_devise_mapping_for_omniauth
     model = nil
     if !request.env["omniauth.model"].blank?
-      puts "the request env is:"
-      puts request.env["omniauth.model"]
+      
       request.env["omniauth.model"].scan(/omniauth\/(?<model>[a-zA-Z]+)\//) do |ll|
         jj = Regexp.last_match
         model = jj[:model]
@@ -141,8 +146,8 @@ module Auth::Concerns::OmniConcern
           else
             resource_klazz = request.env["devise.mapping"].to
             
-            puts "request env."
-            puts request.env.to_s
+           # puts "request env."
+           # puts request.env.to_s
 
             omni_hash = get_omni_hash
             

data/config/initializers/omniauth.rb

@@ -38,16 +38,35 @@ module OmniAuth
 	    	on_any_path?(request_paths)
 	    end
 
+	    def on_callback_path?
+	      
+	      on_path?(callback_path)
+	    end
+
+	    def on_path?(path)
+	      #puts "current path is: #{current_path}"
+	      path_without_extension = current_path.gsub(/\.json/,'')
+	      
+	      #puts "path without extension is :#{path_without_extension}"
+	      path_without_extension.casecmp(path).zero?
+	    end
 	
 	    ##modified to use Auth::OmniAuth::Path
 	    def callback_path
+	      
 	      @callback_path ||= begin
+	      	
 	        path = options[:callback_path] if options[:callback_path].is_a?(String)
 	        path ||= current_path if options[:callback_path].respond_to?(:call) && options[:callback_path].call(env)
 	        path ||= custom_path(:request_path)
 	        path ||= Auth::OmniAuth::Path.common_callback_path(name)
+	      	
+
 	        path
+	      
 	      end
+
+
 	    end
 
 	    ##request call - modified to setup the model.
@@ -80,9 +99,9 @@ module OmniAuth
 	    ##now the callback call
 	    # Performs the steps necessary to run the callback phase of a strategy.
 	    def callback_call
-	      #check_state
+
 	      setup_phase
-	      puts 'Callback phase initiated.'
+	      
 	      @env['omniauth.origin'] = session.delete('omniauth.origin')
 	      @env['omniauth.origin'] = nil if env['omniauth.origin'] == ''
 	      @env['omniauth.params'] = session.delete('omniauth.params') || {}
@@ -94,6 +113,26 @@ module OmniAuth
 	      OmniAuth.config.before_callback_phase.call(@env) if OmniAuth.config.before_callback_phase
 	      callback_phase
 	    end
+
+
+	    def call!(env) # rubocop:disable CyclomaticComplexity, PerceivedComplexity
+	      
+	      unless env['rack.session']
+	        error = OmniAuth::NoSessionError.new('You must provide a session to use OmniAuth.')
+	        raise(error)
+	      end
+
+	      @env = env
+	      @env['omniauth.strategy'] = self if on_auth_path?
+	      
+	      return mock_call!(env) if OmniAuth.config.test_mode
+	      return options_call if on_auth_path? && options_request?
+	      return request_call if on_request_path? && OmniAuth.config.allowed_request_methods.include?(request.request_method.downcase.to_sym)
+	      return callback_call if on_callback_path?
+	      return other_phase if respond_to?(:other_phase)
+	      @app.call(env)
+	    end
+
   end
   
 end
@@ -104,31 +143,24 @@ end
 module OmniAuth
   module Strategies
   	OAuth2.class_eval do 
-
   		def callback_phase # rubocop:disable AbcSize, CyclomaticComplexity, MethodLength, PerceivedComplexity
-  			puts "came to callback phase."
-  			puts "state is:"
-  			puts "in request params:"
-  			puts request.params["state"]
-  			puts "session omniauth state."
-  			puts session["omniauth.state"]
-  			puts "options provider ignores state is:"
-  			puts option.provider_ignores_state
+
+  			#puts request.inspect.to_s
+  			#puts request.params.to_s
 
 	        error = request.params["error_reason"] || request.params["error"]
-	        puts "error : #{error}"
+	        #puts "error : #{error}"
 	        if error
 	          fail!(error, CallbackError.new(request.params["error"], request.params["error_description"] || request.params["error_reason"], request.params["error_uri"]))
 	        elsif !options.provider_ignores_state  && (request.params["state"].to_s.empty? || request.params["state"] != session.delete("omniauth.state"))
 	          #puts "STATE ISSUES."
-	          puts "state is detected."
+	          #puts "state is detected."
 	          headers = Hash[*env.select {|k,v| k.start_with? 'HTTP_'}
 			  .collect {|k,v| [k.sub(/^HTTP_/, ''), v]}
 			  .collect {|k,v| [k.split('_').collect(&:capitalize).join('-'), v]}
 			  .sort
 			  .flatten]
-			  puts "headers accept is:"
-			  puts headers["Accept"]
+			  
 			  if headers["Accept"] == "application/json"
 			  	self.access_token = build_access_token
 		        self.access_token = access_token.refresh! if access_token.expired?
@@ -139,8 +171,7 @@ module OmniAuth
 	          end
 	        else
 	          #puts "didnt have any initial state issues."
-	          puts "no state"
-	          puts "going to build access token."
+	          
 	          self.access_token = build_access_token
 	          self.access_token = access_token.refresh! if access_token.expired?
 	          super
@@ -172,11 +203,18 @@ module OmniAuth
 	     end
   	end
   	Facebook.class_eval do 
-  		protected
+  		
   		def build_access_token
-  			if request.params["fb_exchange_token"]
+
+  			request.body.rewind
+  			hash = request.body.read
+  			request.body.rewind
+          	parsedForm = JSON.parse(hash) unless hash.blank?
+          	
+  			fb_exchange_token = request.params["fb_exchange_token"] || parsedForm["fb_exchange_token"]
+  			if fb_exchange_token
   				##make the get request.
-  				verify_exchange_token(request.params["fb_exchange_token"])
+  				verify_exchange_token(fb_exchange_token)
   			else
   				verifier = request.params["code"]
         		a_t = client.auth_code.get_token(verifier, {:redirect_uri => callback_url}.merge(token_params.to_hash(:symbolize_keys => true)), deep_symbolize(options.auth_token_params))
@@ -194,7 +232,14 @@ module OmniAuth
   		end
 
   		def with_authorization_code!
-  			if request.params.key?('code') || request.params.key?('fb_exchange_token')
+  			
+  			request.body.rewind
+  			hash = request.body.read
+  			request.body.rewind
+          	parsedForm = JSON.parse(hash) unless hash.blank?
+          	fb_exchange_token = request.params['fb_exchange_token'] || parsedForm['fb_exchange_token']
+
+  			if request.params.key?('code') || fb_exchange_token 
           		yield
 	        elsif code_from_signed_request = signed_request_from_cookie && signed_request_from_cookie['code']
 	          request.params['code'] = code_from_signed_request
@@ -211,23 +256,28 @@ module OmniAuth
 	            options.provider_ignores_state = original_provider_ignores_state
 	          end
 	        else
-	          raise NoAuthorizationCodeError, 'must pass either a `code` (via URL or by an `fbsr_XXX` signed request cookie)'
+	          raise StandardError, 'must pass either a `code` (via URL or by an `fbsr_XXX` signed request cookie)'
 	        end
   		end
 
   	end
     GoogleOauth2.class_eval do 
-
-
- 
+    	
     	def custom_build_access_token
-    		puts "params are:"
-    		puts request.params.to_s
-    		puts "Came to custome build access token."
-    		puts "is the request xhr?"
-    		puts request.xhr?
+    		#puts request.inspect.to_s
+    		#this is because of the read happening in that other def.
+    		
+  			request.body.rewind
+  			hash = request.body.read
+  			request.body.rewind
+          	parsedForm = JSON.parse(hash) unless hash.blank?
+          	
+    		
+    		id_token = request.params['id_token'] || parsedForm['id_token']
+    		access_token = request.params['access_token'] || parsedForm['access_token']
+
     		access_token =
-    		if verify_id_token(request.params['id_token'])
+    		if verify_id_token(id_token)
     			## ANDROID APP USES THIS 
     			##in this case the access token is pointless, because we dont really get any kind of access for the api, so we just build a dummy token to satisfy the way this method works, since the method is exepcte to return an access token.
     			##refer to 
@@ -244,13 +294,13 @@ module OmniAuth
 	          ## THIS IS FOR WEB BASED HTML API
 	          verifier = request.params['code']
 	          redirect_uri = request.params['redirect_uri']
-	          puts "verifier is: #{verifier}"
-	          puts "redirect url is: #{redirect_uri}"
-	          puts "getting token options: #{get_token_options(redirect_uri)}"
+	          #puts "verifier is: #{verifier}"
+	          #puts "redirect url is: #{redirect_uri}"
+	          #puts "getting token options: #{get_token_options(redirect_uri)}"
 	          client.auth_code.get_token(verifier, get_token_options(redirect_uri), deep_symbolize(options.auth_token_params || {}))
-	        elsif verify_token(request.params['access_token'])
-	          puts "came to option 4"
-	          puts "this is the access token passing verified."
+	        elsif verify_token(access_token)
+	          #puts "came to option 4"
+	          #puts "this is the access token passing verified."
 	          ::OAuth2::AccessToken.from_hash(client, request.params.dup)
 	        else
 	        	## ANDROID APP USES THIS IF THE REQUEST IS FOR OFFLINE ACCESS.
@@ -282,20 +332,20 @@ module OmniAuth
     	private 
     	
     	def verify_id_token(id_token)
-    		puts "id token is: #{id_token}"
+    		#puts "id token is: #{id_token}"
     		return false unless id_token
     		raw_response = client.request(:get, 'https://www.googleapis.com/oauth2/v3/tokeninfo',
                                       params: { id_token: id_token }).parsed
     		
 
-    		puts "verify id token raw response is:"
-    		puts raw_response
+    		#puts "verify id token raw response is:"
+    		#puts raw_response
         	if raw_response['aud'] == options.client_id || options.authorized_client_ids.include?(raw_response['aud'])
 	        	@raw_info ||= raw_response
-	        	puts "could verify."
+	        	#puts "could verify."
 	        	true
 	        else
-	        	puts "could not verify/"
+	        	#puts "could not verify/"
 	        	false
 	        end
 

data/lib/auth/version.rb

@@ -1,3 +1,3 @@
 module Auth
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end