wordjelly-auth 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ac17e12221c3274d725f27b95cf9fa0d3ea8a98
-  data.tar.gz: e78a749457a99aaefb28a15ddc40b7617cef59f1
+  metadata.gz: 7cb43cf177bb80797b7011f1850899c05597bd76
+  data.tar.gz: 6ce499feaf489e896da3c2ef53c36d64415b8d4d
 SHA512:
-  metadata.gz: 0f7e55a531f0176e53eefd7f8fa87da1fb9522aff92e275dca339abee9aa9be255967813e32638a3be3708e797fa501f79516daeb32f3a3d9872266b910f92b3
-  data.tar.gz: 75cd846d6a1baf40106fd97b152a0530d0814d72c56b4f76aea98552d7a8fcb91cdba0512cdacc287af91c4825e29ef609602013c1c3f53d96ae4657b83a1cf7
+  metadata.gz: 4a4b57e6403f995eef6067bb91c68ada767461eab3305a8cafa341e4070364e7f18876d041a51ae7fc1c7f2ddf9f76eba08d8cad6a092a761ef6e3dacc2e5032
+  data.tar.gz: 8a4c2ffcfddb90d7462ffe57a76302b2db6a5a56531f9bc6258c7e7a702dc78d904da91f3613515a91e34191ec0bd40740d44df56def5cad221dd09697884070

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

@@ -140,7 +140,10 @@ module Auth::Concerns::OmniConcern
            redirect_to omniauth_failed_path_for("no_resource"), :notice => "No resource was specified in the omniauth callback request." and return 
           else
             resource_klazz = request.env["devise.mapping"].to
-           
+            
+            puts "request env."
+            puts request.env.to_s
+
             omni_hash = get_omni_hash
             
             puts "the omni hash is:"

data/app/controllers/auth/endpoints_controller.rb

@@ -0,0 +1,19 @@
+class Auth::EndpointsController < Auth::ApplicationController
+
+	
+	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
+		
+
+	def create
+		
+	end
+
+	def permitted_params
+		params.require(:endpoint).permit(:android_token,:ios_token)
+	end
+
+end

data/app/controllers/auth/profiles_controller.rb

@@ -12,7 +12,7 @@ class Auth::ProfilesController < Auth::ApplicationController
 	before_action :is_admin_user, :only => [:set_proxy_user]
 	
 	def initialize_vars
-		puts "---------------------------------------------------"
+		
 		@resource_params = {}
 		@profile_resource = nil
 		@all_params = permitted_params.deep_symbolize_keys
@@ -45,15 +45,26 @@ class Auth::ProfilesController < Auth::ApplicationController
 	## expected params hash:
 	##{:resource => "users", :user => {:admin,:request_send_reset_password_link}, :id}
 	def update
+
+		puts "the profile resource is:"
+		puts @profile_resource.to_s
+
 		check_for_update(@profile_resource)
 		
-		if @resource_params[:admin]
-			@profile_resource.admin = @resource_params[:admin]
-		end
+		#if @resource_params[:admin]
+		#	@profile_resource.admin = @resource_params[:admin]
+		#end
 
-		if @resource_params[:created_by_admin]
-			@profile_resource.created_by_admin = @resource_params[:created_by_admin]
-		end
+		#if @resource_params[:created_by_admin]
+		#	@profile_resource.created_by_admin = @resource_params[:created_by_admin]
+		#end
+
+		## so not only this but i need a basic endpoint as well
+		## to add endpoints.
+		## okay so will need another endpoint model for that purpose.
+		## so first let me finish this.
+
+		@profile_resource.assign_attributes(@resource_params)
 
 		@profile_resource.m_client = self.m_client
 		
@@ -133,13 +144,22 @@ class Auth::ProfilesController < Auth::ApplicationController
 			## we also want to allow to set :created_by_admin => true, 
 			## so that is also enabled, if the user is an admin,
 	  		Auth.configuration.auth_resources.keys.each do |model|
-	  			if current_signed_in_resource && current_signed_in_resource.is_admin?
-	  				filters << {model.downcase.to_sym => [:admin,:created_by_admin]}
+	  			if current_signed_in_resource  
+	  				if current_signed_in_resource.is_admin?
+	  					filters << {model.downcase.to_sym => [:admin,:created_by_admin]}
+	  				else
+	  					filters << {model.downcase.to_sym => [:android_token, :ios_token]}
+	  				end
 	  			end
 	  		end
+	  		## resource has to be passed as well.
+	  		## it is a plural, downcase like "users"
 	  		filters << [:resource,:api_key,:current_app_id,:id]
 	  		params.permit(filters)
 		end
+
+		## if the user is not an admin, then 
+
 	end
 
 	##@used_in : profiles_controller

data/app/controllers/auth/registrations_controller.rb

@@ -44,7 +44,9 @@ class Auth::RegistrationsController < Devise::RegistrationsController
 	    resource.m_client = self.m_client
 	 	resource.set_client_authentication
 	 	## end.
+	 	
 	    resource_updated = update_resource(resource, account_update_params)
+	    
 	    yield resource if block_given?
 	    if resource_updated
 	      if is_flashing_format?

data/app/models/auth/concerns/shopping/product_concern.rb

@@ -156,13 +156,11 @@ module Auth::Concerns::Shopping::ProductConcern
 				
 					all_cycles_valid = true
 					product.cycles.each do |cycle|
-				
+
 						all_cycles_valid = cycle.requirements_satisfied(epoch + cycle.time_since_prev_cycle.minutes*60,location_id)
 								
 					end
 
-					## just because the cycles are valid, it means we have workers, but how many?
-					## that also has to be returned by the cycle validity statements
 
 					if all_cycles_valid == true
 						cycle_chain = []
@@ -179,6 +177,8 @@ module Auth::Concerns::Shopping::ProductConcern
 
 								minutes[epoch_at_which_to_add].cycles << cycle_to_add
 
+
+
 								cycle_chain << cycle_to_add.id.to_s
 							else
 								#raise "necessary minute not in range."

data/app/models/auth/concerns/user_concern.rb

@@ -118,7 +118,9 @@ module Auth::Concerns::UserConcern
 
 		## if a or b or c.
 		after_save :send_reset_password_link
-		
+			
+
+		before_save :refresh_endpoints
 		#######################################################
 		#
 		#
@@ -129,6 +131,8 @@ module Auth::Concerns::UserConcern
 
 		field :cycle_types, type: Hash
 
+		
+
 		#######################################################
 		#
 		#
@@ -284,8 +288,21 @@ module Auth::Concerns::UserConcern
 			  field :identities,          type: Array, default: [Auth::Identity.new.attributes.except("_id")]
 		  end
 
-		  
-		  
+		  	
+		  ###############################################
+		  ##
+		  ## NOTIFICATION SUPPORT.
+		  ##
+		  ## this is permitted by default.
+		  ## and i have to add this as an update feature.
+		  ## that it adds the gcm_token 
+		  ###############################################
+		  field :android_token, type: String
+		  field :android_endpoint, type: String
+		  field :ios_token, type: String
+		  field :ios_endpoint, type: String
+
+		 
 
 	    end
 
@@ -368,9 +385,11 @@ module Auth::Concerns::UserConcern
 		## if the current signed in resource is not admin, then _id is instead searched for using the current_signed_in_resource => basically will only return the user that is signed in.
 
 		def find_resource(_id,resource)
+
 			conditions = {:_id => _id}
 			conditions[:_id] = resource.id.to_s if !resource.is_admin?
 			all = self.where(conditions)
+			
 			return all.first if all.size > 0 
 			return nil
 		end
@@ -535,13 +554,13 @@ module Auth::Concerns::UserConcern
 		##first find out if there is already a client for this user id.
 		c = Auth::Client.new(:api_key => SecureRandom.hex(32), :resource_id => self.id)
 
-		puts "Came to create a client."
+		#puts "Came to create a client."
 
 		c.versioned_create({:resource_id => self.id})
 		op_count = 10
 
-		puts "-------CREATED A CLIENT AS FOLLOWS:-----------"
-		puts c.attributes.to_s
+		#puts "-------CREATED A CLIENT AS FOLLOWS:-----------"
+		#puts c.attributes.to_s
 
 		while(true)
 			
@@ -777,11 +796,6 @@ module Auth::Concerns::UserConcern
 		name
 	end
 	
-
-	def has_gcm_token
-		false
-	end
-
 	## this method is to be overridden, it returns the value of the admin_variable.
 	## it can be used to decide if the user is an admin.
 	## @used_in : payment_concern in the refund_callback 
@@ -799,7 +813,25 @@ module Auth::Concerns::UserConcern
 
 
 	
+	####################################################################
+	###
+	###
+	### GCM - AMAZON ENDPOINT
+	###
+	###
+	####################################################################
+	def refresh_endpoints
+		puts "called refresh end points."
+		puts self.android_token
+		if self.android_token_changed?
+			endpoint = Auth::Endpoint.new
+			endpoint.android_token = self.android_token
+			self.android_endpoint = endpoint.set_android_endpoint
+		end
+		## now have to make an endpoints controller.
+	end
 
-	
+	## after this we have notification dispatch and scheduling logic based on the instructions and cycles.
+	## this has to also be finished today.
 	
 end

data/app/models/auth/endpoint.rb

@@ -0,0 +1,24 @@
+class Auth::Endpoint
+	
+	include Mongoid::Document
+		
+	field :android_endpoint, type: String
+	field :ios_endpoint, type: String
+	field :android_token, type: String
+
+	def set_android_endpoint
+		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
+		else
+			nil
+		end
+	end
+
+	def set_ios_endpoint
+
+	end
+
+
+
+end

data/app/models/auth/work/cycle.rb

@@ -98,10 +98,7 @@ class Auth::Work::Cycle
 
 	def requirements_satisfied(epoch,location_id)
 		
-		#puts "came to requirements satisfied"
-		Auth.configuration.location_class.constantize.all.each do |l|
-			puts l.attributes.to_s
-		end
+		
 		location = Auth.configuration.location_class.constantize.find(location_id)
 		
 		#puts "location found :#{location}"
@@ -151,6 +148,8 @@ class Auth::Work::Cycle
 			
 			schedule_for_object = schedule.for_object_class.constantize.find(schedule.for_object_id)
 			
+			## the object should also carry its own type as well.
+			
 			schedule_for_object.cycle_types.keys.each do |type|
 				#req[type] = req[type] - 1 if req[type]
 				available_resources[type] = 0 unless available_resources[type]

data/app/models/auth/work/minute.rb

@@ -8,6 +8,42 @@ class Auth::Work::Minute
 	
 	field :geom, type: Array
 
+	## this includes workers and entities, and actually anything that could be needed for the cycle.
+	field :entity_types, type: Hash, default: {}
+
+	## next step is to pull correctly.
+	## so this done.
+	def update_entity_types
+		#puts "came to update entity types"
+		applicable_schedules = Auth::Work::Schedule.collection.aggregate([
+			{
+				"$match" => {
+					"$and" => [
+						{
+							"start_time" => {
+								"$lte" => self.time
+							}
+						},
+						{
+							"end_time" => {
+								"$gte" => self.time
+							}
+						}
+					]
+				}
+			}
+		])
+
+		applicable_schedules.each do |schedule|
+			sched = Auth::Work::Schedule.new(schedule)
+			object = sched.for_object_class.constantize.find(sched.for_object_id)
+			object.cycle_types.keys.each do |k|
+				self.entity_types[k]+=1 if self.entity_types[k]
+				self.entity_types[k]= 1 unless self.entity_types[k]
+			end
+		end
+
+	end
 
 	## returns all minutes which have affected cycles , only containing the affected cycles.
 	## does not consider the cycle chains.
@@ -208,11 +244,7 @@ class Auth::Work::Minute
 		cycles_to_pull.flatten	
 	end
 
-	## this will block the transporter and rewire his availability for all subsequent and prior minutes.
-	## this i have to do today.
-	def update_transporter
-
-	end
+	
 
 	## okay first do what can be predictable done.
 	## that means the partials in the views.

data/config/initializers/aws.rb

@@ -0,0 +1,6 @@
+$sns_client = nil
+if ENV["AWS_ACCESS_KEY_ID"] && ENV["AWS_SECRET_ACCESS_KEY"] && ENV["AWS_REGION"]
+	$sns_client = Aws::SNS::Client.new
+else
+	Rails.logger.error("Please set AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY and AWS_REGION in your env vars, to use the sns_client. :initializers/aws.rb")
+end

data/config/initializers/omniauth.rb

@@ -105,8 +105,6 @@ module OmniAuth
   module Strategies
   	OAuth2.class_eval do 
 
-  		
-
   		def callback_phase # rubocop:disable AbcSize, CyclomaticComplexity, MethodLength, PerceivedComplexity
   			
 	        error = request.params["error_reason"] || request.params["error"]
@@ -204,12 +202,13 @@ module OmniAuth
     GoogleOauth2.class_eval do 
 
 
-    	
-
+ 
     	def custom_build_access_token
-    		#puts "Came to custome build access token."
-    		#puts "is the request xhr?"
-    		#puts request.xhr?
+    		puts "params are:"
+    		puts request.params.to_s
+    		puts "Came to custome build access token."
+    		puts "is the request xhr?"
+    		puts request.xhr?
     		access_token =
     		if verify_id_token(request.params['id_token'])
     			## ANDROID APP USES THIS 
@@ -217,9 +216,11 @@ module OmniAuth
     			##refer to 
     			##@link: https://developers.google.com/identity/sign-in/android/backend-auth
     			##@ref: also refer to the signInActivity.java in the android app, where we pass in 'id_token.'
+    			puts "id token is verified."
     			::OAuth2::AccessToken.new(client,"")
 	        elsif request.xhr? && request.params['code']
 	          ##THIS IS FOR WEB BASED JAVASCRIPT API.
+	          puts "web javascript"
 	          verifier = request.params['code']
 	          client.auth_code.get_token(verifier, get_token_options('postmessage'), deep_symbolize(options.auth_token_params || {}))
 	        elsif request.params['code'] && request.params['redirect_uri']
@@ -231,8 +232,8 @@ module OmniAuth
 	          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."
+	          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.
@@ -251,8 +252,6 @@ module OmniAuth
 
 	          	verifier = request.params["code"]
 
-	          
-
 	          	client.auth_code.get_token(verifier, get_token_options(url_to_pass_as_callback), deep_symbolize(options.auth_token_params))
 	        	#client.auth_code.get_token(verifier, get_token_options(url_to_pass_as_callback), deep_symbolize(options.auth_token_params))
 	        end
@@ -266,18 +265,20 @@ module OmniAuth
     	private 
     	
     	def verify_id_token(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."
 	        	true
 	        else
+	        	puts "could not verify/"
 	        	false
 	        end