wordjelly-auth 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cb43cf177bb80797b7011f1850899c05597bd76
-  data.tar.gz: 6ce499feaf489e896da3c2ef53c36d64415b8d4d
+  metadata.gz: 4d20b2fcd50ad02956b13be49b0ba68bbb9e2c7e
+  data.tar.gz: b4396d3e38c252a7428cec1e6c8b09b40139ca2c
 SHA512:
-  metadata.gz: 4a4b57e6403f995eef6067bb91c68ada767461eab3305a8cafa341e4070364e7f18876d041a51ae7fc1c7f2ddf9f76eba08d8cad6a092a761ef6e3dacc2e5032
-  data.tar.gz: 8a4c2ffcfddb90d7462ffe57a76302b2db6a5a56531f9bc6258c7e7a702dc78d904da91f3613515a91e34191ec0bd40740d44df56def5cad221dd09697884070
+  metadata.gz: bde2aa36e8ef34c8cfef1652a88a9da1f6b0f0089d818aebf36620b6003618bbf5df098d71b1cfc8630117e2e8033b46d9afb2168cfea85c5f26c50424581815
+  data.tar.gz: beb36a2874a51032543449918b38bd3225d5a40c0b1e4073ce114b9421f92102dd85a90a9fbabac089437a049fc4a5958db31b1d04e5db5018d903c3159445f1

data/app/controllers/auth/application_controller.rb

@@ -12,7 +12,70 @@ module Auth
 	    end
   	end  
 
-  
+
+  	######################################################################
+  	##
+  	##
+  	## METHODS USED ON AUTHENTICATED_CONTROLLER, and some other controllers.
+  	##
+  	##
+  	######################################################################
+
+  	## @return[String] model_name : given a controller with name AssembliesController -> will return assembly
+	## will downcase and singularize the controller name.
+	def get_model_class_name
+		
+		class_name = nil
+
+		self.class.name.scan(/::(?<plural_controller_name>[A-Za-z]+)Controller$/) do |ll|
+
+			jj = Regexp.last_match
+			
+			plural_controller_name = jj[:plural_controller_name]
+
+			class_name = plural_controller_name.singularize.downcase
+
+		end
+
+		not_found("could not determine class name") unless class_name
+		
+		
+
+		return class_name
+	
+	end
+
+	def instantiate_classes
+
+		if Auth.configuration.send("#{get_model_class_name}_class")
+
+			begin
+				instance_variable_set("@model_class",Auth.configuration.send("#{get_model_class_name}_class").constantize)
+			rescue 
+				not_found("could not instantiate class #{get_model_class_name}")
+			end
+
+		else
+			not_found("#{get_model_class_name} class not defined in configuration")
+		end
+
+	end
+
+
+	def build_model_from_params
+      	pp = permitted_params
+      	puts "the permitted_params are:"
+      	puts permitted_params.to_s
+
+      	@model_params = pp.fetch(get_model_class_name.to_sym,{})
+      	puts "model params are:"
+      	puts @model_params.to_s
+
+      	@model = pp[:id] ?  @model_class.find_self(pp[:id],current_signed_in_resource) : @model_class.new(@model_params)
+
+	end
+
+
     def from_bson(bson_doc,klass)
 
 	 	if !bson_doc.nil?

data/app/controllers/auth/authenticated_controller.rb

@@ -18,59 +18,7 @@ class Auth::AuthenticatedController < Auth::ApplicationController
 
 
 
-	## @return[String] model_name : given a controller with name AssembliesController -> will return assembly
-	## will downcase and singularize the controller name.
-	def get_model_class_name
-		
-		class_name = nil
-
-		self.class.name.scan(/::(?<plural_controller_name>[A-Za-z]+)Controller$/) do |ll|
-
-			jj = Regexp.last_match
-			
-			plural_controller_name = jj[:plural_controller_name]
-
-			class_name = plural_controller_name.singularize.downcase
-
-		end
-
-		not_found("could not determine class name") unless class_name
-		
-		
-
-		return class_name
 	
-	end
-
-	def instantiate_classes
-
-		if Auth.configuration.send("#{get_model_class_name}_class")
-
-			begin
-				instance_variable_set("@model_class",Auth.configuration.send("#{get_model_class_name}_class").constantize)
-			rescue 
-				not_found("could not instantiate class #{get_model_class_name}")
-			end
-
-		else
-			not_found("#{get_model_class_name} class not defined in configuration")
-		end
-
-	end
-
-
-	def build_model_from_params
-      	pp = permitted_params
-      	puts "the permitted_params are:"
-      	puts permitted_params.to_s
-
-      	@model_params = pp.fetch(get_model_class_name.to_sym,{})
-      	puts "model params are:"
-      	puts @model_params.to_s
-
-      	@model = pp[:id] ?  @model_class.find_self(pp[:id],current_signed_in_resource) : @model_class.new(@model_params)
-
-	end
 
 
 	

data/app/controllers/auth/endpoints_controller.rb

@@ -1,15 +1,50 @@
 class Auth::EndpointsController < Auth::ApplicationController
 
-	
+	## responds only to json.
+	## got to add the thing to subscribe them to a topic as well.
+
 	include Auth::Concerns::DeviseConcern
 	
 	CONDITIONS_FOR_TOKEN_AUTH = [:create,:update,:destroy,:edit,:new,:index]
 	TCONDITIONS = {:only => CONDITIONS_FOR_TOKEN_AUTH}
 	before_filter :do_before_request , TCONDITIONS
-		
+	before_filter :instantiate_classes
+	before_filter :build_model_from_params 
+	before_filter(:only => [:create]){|c| check_for_create(@model)}		
+
+	## all i have to do now is set the routes
+	## and this should start saving endpoints automatically as needed.
+	## so now lets try to make a new endpoint.
+	## question is that what if that token already exists ?
+	## so i will do a find_one_and_update.
 
 	def create
+		or_clause = []
+		
+		or_clause << {
+			"android_token" => self.android_token
+		} if self.android_token
 		
+		or_clause << {
+			"ios_token" => self.ios_token
+		} if self.ios_token
+
+		returned_document = @model.class.where({
+			"$or" => or_clause
+		}).find_one_and_update(
+			{
+				"$set" => self.attributes,
+
+			},
+			{
+				:return_document => :after
+			}
+		)
+
+		respond_to do |format|
+	       format.json {render json: return_document.to_json, status: }
+	    end
+
 	end
 
 	def permitted_params

data/app/models/auth/endpoint.rb

@@ -5,8 +5,13 @@ class Auth::Endpoint
 	field :android_endpoint, type: String
 	field :ios_endpoint, type: String
 	field :android_token, type: String
+	field :ios_token, type: String
+
+	before_save :set_android_endpoint
+	before_save :set_ios_endpoint
 
 	def set_android_endpoint
+		return unless self.android_token
 		if response = $sns_client.create_platform_endpoint(platform_application_arn: ENV["ANDROID_ARN"], token: self.android_token, attributes: {})
 			self.android_endpoint = response.endpoint_arn
 			self.android_endpoint
@@ -16,9 +21,8 @@ class Auth::Endpoint
 	end
 
 	def set_ios_endpoint
-
+		return unless self.ios_token
 	end
 
 
-
 end

data/config/initializers/omniauth.rb

@@ -82,7 +82,7 @@ module OmniAuth
 	    def callback_call
 	      #check_state
 	      setup_phase
-	      log :info, 'Callback phase initiated.'
+	      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') || {}
@@ -106,17 +106,29 @@ module OmniAuth
   	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
+
 	        error = request.params["error_reason"] || request.params["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."
 	          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?
@@ -127,15 +139,20 @@ 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
 	        end
 	      rescue ::OAuth2::Error, CallbackError => e
+	      	puts "invalid creds."
 	        fail!(:invalid_credentials, e)
 	      rescue ::Timeout::Error, ::Errno::ETIMEDOUT => e
+	      	puts "timeout."
 	        fail!(:timeout, e)
 	      rescue ::SocketError => e
+	      	puts "socket error."
 	        fail!(:failed_to_connect, e)
 	    end
 	    

data/lib/auth/engine.rb

@@ -200,6 +200,10 @@ module Auth
 
     attr_accessor :currency
 
+    attr_accessor :endpoint_class
+
+    attr_accessor :endpoint_controller
+
     def initialize
       
 
@@ -409,7 +413,6 @@ module Auth
       ##
       ##
       ########################################################
-
       @image_class = "Auth::Image"
       @image_controller = "auth/images"
 
@@ -420,9 +423,18 @@ module Auth
       ##
       ########################################################
       @rolling_minutes = 30
-
       @currency = "INR"
 
+
+      ########################################################
+      ##
+      ## ENDPOINT CLASS.
+      ##
+      ########################################################
+      @endpoint_class = "Auth::Endpoint"
+      @endpoint_controller = "auth/endpoints"
+
+
     end
   end
   

data/lib/auth/rails/routes.rb

@@ -99,6 +99,8 @@ module ActionDispatch::Routing
 	      resources :admin_create_users, :controller => "auth/admin_create_users"
 
 	  	  resources :clients, :controller => "auth/clients", :as => "auth_clients"
+
+	  	  resources :endpoints, :controller => Auth.configuration.endpoint_controller
 		 
 		  resources :profiles, :controller => "auth/profiles" do 
 		  	collection do 
@@ -130,6 +132,8 @@ module ActionDispatch::Routing
 
 			 	 	if collection
 
+			 	 		## what about the route for this ?
+
 			 	 		
 
 			 	 		## okay so what and how much longer ?

data/lib/auth/version.rb

@@ -1,3 +1,3 @@
 module Auth
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end