wordjelly-auth 1.2.6 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed99b909d845c1b58ae7ba9cb2001ff13393c8b2
-  data.tar.gz: 79dc45fb85d5c0eb1903551da31bdde8c42cf40d
+  metadata.gz: 3e0e0e81fba4206adc54d59022e756fbdeea1d46
+  data.tar.gz: 2ecb5c4c7d96c64d1a3987f0cbd952e4c8641644
 SHA512:
-  metadata.gz: 363a176574715a842f40fca2aa57a0f8d9dbec28752ef27e68c73249e547a7153b1877fa055f0f711b2797764909a7a883ef94b887a4d84514e0a2e2f7ab8eb5
-  data.tar.gz: 73cfe19dfba421533665e78d4cb503e3cccef9cb8ab701760c63f9b5117dcea5d79ecc5a0f169be7fdce00630ac3be14597edfb7138569ffab995881ff632c0d
+  metadata.gz: f81bb12a5ef0b516b59f63067856458e0d67eb7f33824ee3d736c70b8668deab09284f511e955585a4f61e6b572e0a703776705cadedc9638fb5fd8c0aba3ea9
+  data.tar.gz: be8bbf3fd3e795912add7f278860ee4f94bdac9c0100b86896e7f36d9b6e9aed050b70387d17885a458054923e427f96ee2f3a30fbf6dd675c600a488ce8211e

data/app/assets/stylesheets/auth/overrides.scss

@@ -35,3 +35,11 @@ label{
 .parallax-container {
     height: 200px !important;
 }
+
+/* In order to place the tracking correctly */
+/* for the barcode scanner overlay, from qagga */
+canvas.drawing, canvas.drawingBuffer {
+    position: absolute;
+    left: 0;
+    top: 0;
+}

data/app/controllers/auth/authenticated_controller.rb

@@ -144,6 +144,9 @@ class Auth::AuthenticatedController < Auth::ApplicationController
 	        format.json do 
 	          render :nothing => true, :status => 204
 	        end
+	        format.js do 
+	        	render 'destroy'
+	        end
 	      else
 	        format.json do 
 	          render json: {
@@ -151,6 +154,9 @@ class Auth::AuthenticatedController < Auth::ApplicationController
 	            errors: @model.errors
 	          }.to_json
 	        end
+	        format.js do 
+	        	render 'destroy'
+	        end
 	      end
 	    end
 	end

data/app/controllers/auth/concerns/shopping/cart_controller_concern.rb

@@ -37,6 +37,7 @@ module Auth::Concerns::Shopping::CartControllerConcern
    
     @auth_shopping_cart.save
     @auth_shopping_cart.prepare_cart
+    @auth_shopping_cart.process_items
     respond_with @auth_shopping_cart
   end
 
@@ -48,11 +49,9 @@ module Auth::Concerns::Shopping::CartControllerConcern
     
     @auth_shopping_cart = add_owner_and_signed_in_resource(@auth_shopping_cart)
 
-    puts 'the auth shopping cart signed in resource is:' 
-    puts @auth_shopping_cart.signed_in_resource
-
     @auth_shopping_cart.save
     @auth_shopping_cart.prepare_cart
+    @auth_shopping_cart.process_items
     respond_with @auth_shopping_cart
   end
 
@@ -67,7 +66,11 @@ module Auth::Concerns::Shopping::CartControllerConcern
   ## returns all the carts of the user.
   ## basically all his orders.
   def index
-    @auth_shopping_carts = @auth_shopping_cart_class.where(:resource_id => lookup_resource.id.to_s)
+    query_clause = {:resource_id => lookup_resource.id.to_s}
+    query_clause.merge({:personality_id => @auth_shopping_cart_params[:personality_id]}) if @auth_shopping_cart_params[:personality_id]
+    @auth_shopping_carts = @auth_shopping_cart_class.where(query_clause)
+    @auth_shopping_carts = @auth_shopping_carts.to_a
+    @auth_shopping_carts.map{|c| c.prepare_cart}
     respond_with @auth_shopping_carts
   end
 
@@ -97,9 +100,9 @@ module Auth::Concerns::Shopping::CartControllerConcern
 
   private
 
-  ##override this def in your controller, and add attributes to transaction:[], each of the attributes in the transaction key will be cycled through, and if those fields exist on the cart_item, then they will be set.
+  ## and for add owner resource also , modify right now
   def permitted_params
-    params.permit({cart: [:personality_id, :place_id, :discount_id,:name, :notes, {:add_cart_item_ids => []},{:remove_cart_item_ids => []}]},:id)
+    params.permit({cart: [:payment_stage, :resource_id,:personality_id, :place_id, :discount_id,:name, :notes, {:add_cart_item_ids => []},{:remove_cart_item_ids => []}]},:id)
   end
 
 end

data/app/controllers/auth/concerns/shopping/cart_item_controller_concern.rb

@@ -40,7 +40,7 @@ module Auth::Concerns::Shopping::CartItemControllerConcern
    
     check_for_create(@auth_shopping_cart_item)
     @auth_shopping_cart_item = add_owner_and_signed_in_resource(@auth_shopping_cart_item)
-     
+
     @auth_shopping_cart_item.save
 
     respond_with @auth_shopping_cart_item
@@ -52,7 +52,7 @@ module Auth::Concerns::Shopping::CartItemControllerConcern
     @auth_shopping_cart_item.assign_attributes(@auth_shopping_cart_item_params)
     @auth_shopping_cart_item = add_owner_and_signed_in_resource(@auth_shopping_cart_item)  
     @auth_shopping_cart_item.save
-    puts @auth_shopping_cart_item.errors.full_messages.to_s
+    
     respond_with @auth_shopping_cart_item
   end
 
@@ -89,11 +89,10 @@ module Auth::Concerns::Shopping::CartItemControllerConcern
   ##
   ##
   ############################################################
-  ## need to add this to the route.
-  ## and need to provide a link to this, and that's the end of this part.
-  def create_package_items
+  
+  def create_many_items
     cart_items = []
-    params[:product_ids].each do |product_id|
+    params[:cart_item][:product_ids].each do |product_id|
       cart_item = Auth.configuration.cart_item_class.constantize.new(product_id: product_id)
       cart_item.resource_id = lookup_resource.id.to_s
       cart_item.resource_class = lookup_resource.class.name.to_s
@@ -162,6 +161,8 @@ module Auth::Concerns::Shopping::CartItemControllerConcern
 
     elsif action_name.to_s == "create_multiple"
       params.permit({discount: [:id, {:product_ids => []}]})
+    elsif action_name.to_s == "create_many_items"
+      params.permit({:cart_item => [:product_ids]})
     else
 
       params.permit({cart_item: [:product_id,:discount_code,:quantity]},:id)

data/app/controllers/auth/concerns/shopping/payment_controller_concern.rb

@@ -28,8 +28,8 @@ module Auth::Concerns::Shopping::PaymentControllerConcern
   end
 
   def new
-    puts "these are payment attributes"
-    puts @auth_shopping_payment.attributes.to_s
+   # puts "these are payment attributes"
+   # puts @auth_shopping_payment.attributes.to_s
     @auth_shopping_payment = add_owner_and_signed_in_resource(@auth_shopping_payment)
     @auth_shopping_payment.set_cart(@auth_shopping_payment.cart_id)
   end

data/app/controllers/auth/concerns/shopping/personality_controller_concern.rb

@@ -45,9 +45,9 @@ module Auth::Concerns::Shopping::PersonalityControllerConcern
     respond_with @auth_shopping_personality 
   end
 
-  ##should show those cart items which do not have a parent_id.
-  ##since these are the pending cart items.
-  ##all remaining cart items have already been assigned to carts
+  ## will have to have this lookup resource part here.
+  ## what if we want to create items for the user
+  ## 
   def index
     @auth_shopping_personalities = @auth_shopping_personality_class.find_personalities({:resource => lookup_resource}).page 1
     respond_with @auth_shopping_personalities
@@ -81,7 +81,7 @@ module Auth::Concerns::Shopping::PersonalityControllerConcern
   ## this permitted params is overridden in the dummy app, and as a result throws unpermitted parameters for the daughter app parameters, even though they are subsequently permitted, since super is called first.
   def permitted_params
 
-    params.permit({personality: [:date_of_birth, :fullname, :sex]},:id, :query_string)
+    params.permit({personality: [:date_of_birth, :fullname, :sex, :referred_by, :referrer_contact_number]},:id, :query_string)
     
   end
 

data/app/controllers/auth/concerns/shopping/product_controller_concern.rb

@@ -9,10 +9,12 @@ module Auth::Concerns::Shopping::ProductControllerConcern
   end
 
   def initialize_vars
-    puts "came to initialize vars"
+    #puts "came to initialize vars"
   	instantiate_shopping_classes
     @auth_shopping_product_params = permitted_params.fetch(:product,{})
-    puts "current signed in resource: #{current_signed_in_resource}"
+    #puts "product params:"
+    #puts @auth_shopping_product_params.to_s
+    #puts "current signed in resource: #{current_signed_in_resource}"
     @auth_shopping_product = params[:id] ? @auth_shopping_product_class.find_self(params[:id],current_signed_in_resource) : @auth_shopping_product_class.new(@auth_shopping_product_params)
   end
   
@@ -22,7 +24,6 @@ module Auth::Concerns::Shopping::ProductControllerConcern
     @auth_shopping_product = add_owner_and_signed_in_resource(@auth_shopping_product,{:owner_is_current_resource => true})
     @auth_shopping_product.save
     respond_with @auth_shopping_product
-    
   end
 
   def update
@@ -30,6 +31,7 @@ module Auth::Concerns::Shopping::ProductControllerConcern
     @auth_shopping_product = add_owner_and_signed_in_resource(@auth_shopping_product,{:owner_is_current_resource => true})
     @auth_shopping_product.assign_attributes(@auth_shopping_product_params)
     @auth_shopping_product.save
+    puts @auth_shopping_product.errors.full_messages
     respond_with @auth_shopping_product
     
   end
@@ -103,15 +105,14 @@ module Auth::Concerns::Shopping::ProductControllerConcern
 
   end
 
-  ## first create a new product with a bundle.
-  ## so let me modify that part first.
+
   def permitted_params 
-  	pr = params.permit({:product => [:name,:price,:bundle_name]})
+    bar_code_params = [:name,:price,:bundle_name,:create_from_product_id] + Auth::Shopping::BarCode.allow_params
+  	params.permit({:product => bar_code_params},:id)
   end
 
-
-  
-
+  ## so give a button called create product from this product
+  ## it should be a partial with a form.
 
 end
 

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

@@ -122,7 +122,7 @@ module Auth::Concerns::TokenConcern
     proxy_resource_id = params[:proxy_resource_id] || session[:proxy_resource_id]
     proxy_resource_class = params[:proxy_resource_class] || session[:proxy_resource_class]
     
-    ## if these are not provided or set, and if the resource is an admin, then the admin becomes the proxy_resource
+    
     proxy_resource_id = current_signed_in_resource.id.to_s if (current_signed_in_resource.is_admin? && proxy_resource_id.nil?)
 
     proxy_resource_class = current_signed_in_resource.class.to_s if (current_signed_in_resource.is_admin? && proxy_resource_class.nil?)
@@ -183,6 +183,7 @@ module Auth::Concerns::TokenConcern
 
   ## this is used as a before_filter.
   def is_admin_user
+    not_found("not authorized") unless current_signed_in_resource
     not_found("You don't have sufficient privileges to complete that action") if !current_signed_in_resource.is_admin?
   end
 

data/app/controllers/auth/images_controller.rb

@@ -2,5 +2,5 @@ class Auth::ImagesController < Auth::AuthenticatedController
     
   include Auth::Images::ImagesHelper
 
-
+  
 end

data/app/controllers/auth/profiles_controller.rb

@@ -17,6 +17,7 @@ class Auth::ProfilesController < Auth::ApplicationController
 		@profile_resource = nil
 		@all_params = permitted_params.deep_symbolize_keys
 		
+		## okay let's see how to switch to that user.
 		
 	  	if collection = @all_params[:resource]
 	  		
@@ -36,6 +37,7 @@ class Auth::ProfilesController < Auth::ApplicationController
 	## this method needs token authentication, or for the user to be authenticated.
 	## this method also needs an :id, hence the profile_resource is returned.
 	## so what if i sign in as one user,and send in the id of another user?, no because we use the find_resource method, which also considers the current_signed_in_Resource.
+	## now suppose we need to change something, so in show profiles, we will give this method, in the view, to update a signature
 	def show
 		@profile_resource
 	end
@@ -94,11 +96,14 @@ class Auth::ProfilesController < Auth::ApplicationController
 	## params[:proxy_resource_id] and params[:proxy_resource_class]
 	def set_proxy_resource
 		not_found("that user doesn't exist") unless @profile_resource
-		session[:proxy_resource_id] = @profile_resource.id.to_s
-		session[:proxy_resource_class] = @profile_resource.class.name.to_s
-		#puts "the session variables set are as follows:"
-		#puts session[:proxy_resource_id]
-		#puts session[:proxy_resource_class]
+		if params[:unset_proxy]
+			## this unsets the proxy user.
+			session[:proxy_resource_id] = nil
+			session[:proxy_resource_class] = nil
+		else
+			session[:proxy_resource_id] = @profile_resource.id.to_s
+			session[:proxy_resource_class] = @profile_resource.class.name.to_s
+		end
 	end
 
 
@@ -143,7 +148,7 @@ class Auth::ProfilesController < Auth::ApplicationController
 	  		end
 	  		## resource has to be passed as well.
 	  		## it is a plural, downcase like "users"
-	  		filters << [:resource,:api_key,:current_app_id,:id]
+	  		filters << [:resource,:api_key,:current_app_id,:id,:unset_proxy]
 	  		params.permit(filters)
 		end
 

data/app/controllers/auth/search_controller.rb

@@ -50,6 +50,9 @@ class Auth::SearchController < ApplicationController
 			puts result.to_s	
 		end
 
+		
+
+
 		respond_with @search_results
 	end
 

data/app/controllers/auth/shopping/bar_codes_controller.rb

@@ -0,0 +1,109 @@
+class Auth::Shopping::BarCodesController < Auth::Shopping::ShoppingController
+
+	## for barcodes only SHOW and INDEX and NEW routes are defined.
+	## only these actions need an authenticated user to be present for them to be executed.
+    ## NEW CAN BE ACCESSED BY ANY USER ,NOT NECESSARILY AN AUTHENTICATED USER OR ANYTHING.
+    CONDITIONS_FOR_TOKEN_AUTH = [:index,:show]
+    TCONDITIONS = {:only => CONDITIONS_FOR_TOKEN_AUTH}
+    ##this ensures api access to this controller.
+    include Auth::Concerns::DeviseConcern
+    include Auth::Concerns::TokenConcern
+    before_filter :do_before_request , TCONDITIONS
+    before_filter :is_admin_user, {:only => [:index]}
+
+    def new
+
+    end
+
+    def index
+        page_number = params[:page_number].nil? ? 1 : params[:page_number]
+        page_size = params[:page_size].nil? ? 10 : params[:page_size]
+        ## max page size.
+        page_size = 50 if page_size > 50
+
+        skips = page_size * (page_num - 1)
+
+        @bar_codes = Auth::Shopping::BarCode.all.skip(skips).limit(page_size)
+
+
+        respond_to do |format|
+
+        end
+
+
+    end
+
+    ## then you pass in a parameter like that.
+    ## if force_show is true, then it will 
+    def show
+
+        begin
+    	   @bar_code = Auth::Shopping::BarCode.find(params[:id])
+           @bar_code.assign_attributes(get_model_params)
+    	rescue Mongoid::Errors::DocumentNotFound
+           
+            @bar_code = Auth::Shopping::BarCode.new
+            @bar_code.errors.add(:_id,"not found")
+        end
+    	
+    	@bar_code.set_assigned_object if (@bar_code.errors.full_messages.empty?)
+
+    	respond_to do |format|
+            format.js do 
+              ## render a partial which will deal with all these eventualities.  
+              render :partial => "show"
+            end
+    		format.html do 
+                if get_model_params[:force_show]
+    			    render 'auth/shopping/bar_codes/show'
+                else
+                    ## now let me first make a show view.
+                    if @bar_code.errors.empty?
+                        unless @bar_code.assigned_to_object.primary_link.blank?
+                            
+                            redirect_to @bar_code.assigned_to_object.primary_link
+                        else
+                            @bar_code.errors.add(:_id,"no primary link defined on the assigned object")
+                            render 'auth/shopping/bar_codes/show'
+                        end
+                    else
+                        render 'auth/shopping/bar_codes/show'
+                    end
+                end
+    		end
+    		format.json do 
+               
+                if get_model_params[:force_show]
+                    
+                    render :json => {bar_code: @bar_code}, status: 200
+                else
+
+                    if @bar_code.errors.empty?
+                        if @bar_code.assigned_to_object
+                			unless @bar_code.assigned_to_object.primary_link.blank?
+                                ## it should have its primary link.
+                                render :json => {redirect_to: @bar_code.assigned_to_object.primary_link}
+                			else
+                                @bar_code.errors.add(:_id,"no primary link defined on the assigned object")
+                                render :json => {bar_code: @bar_code, errors: @bar_code.errors}, status: 422
+                			end
+                        else
+                            render :json => {bar_code: @bar_code}, status: 200
+                        end
+                    else
+                        render :json => {bar_code: @bar_code, errors: @bar_code.errors}, status: 422
+                    end
+                end
+    		end
+    	end
+    end
+
+    def permitted_params
+    	params.permit({bar_code: [:bar_code_tag,:force_show,:go_to_next_step]}, :id, :page_number, :page_size)
+    end
+
+    def get_model_params
+    	permitted_params.fetch(:bar_code,{})
+    end
+
+end

data/app/jobs/otp_job.rb

@@ -5,7 +5,7 @@ class OtpJob < ActiveJob::Base
   include Auth::JobExceptionHandler
 
   queue_as :default
-  self.queue_adapter = :delayed_job
+  self.queue_adapter = :inline
 
   ##we currently log all exceptions to redis.
   rescue_from(StandardError) do |exception|

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

@@ -7,29 +7,41 @@ module Auth::Concerns::EsConcern
 	end
 
 	included do 
-
+		include Mongoid::Elasticsearch
+		###########################################################
+		##
+		## PATCH BECAUSE ES 6.0 REMOVED MORE THAN ONE MAPPING TYPE PER INDEX, AND WE CANT HAVE SO MANY INDICES.
+		##
+		## the document type becomes the name of the collection singularized.
+		## this is used inside the mongoid-elasticsearch gem , instead of the conventional _type, to load the results back from es.
+		## the index_type is also set to this 
+		## okay let me get this out of the way
+		## have to pass in the index type.
+		## we keep that as the same all throughout.
+		###########################################################
 		## the page to which the user will be taken if they click on the suggestion.
 		## REQUIRED
 		field :primary_link, type: String
 
-
 		## key -> display name
 		## value -> hash
 		## value_key -> :url -> the url
 		## value_key -> :data -> hash of optional data-attributes.
 		field :secondary_links, type: Hash, default: {}
 
-
 		## now let us configure that bitch to show this bitch.
 		## REQUIRED
 		## array of tags on which to do the autocomplete
 		field :tags, type: Array, default: []
 
+		## masked tags
+		field :masked_tags, type: Array, default: []
+
 		## OPTIONAL
 		## an optional description that will be shown below the result in the autocomplete.
 		field :autocomplete_description, type: String 
 
-		AUTOCOMPLETE_INDEX_SETTINGS =
+		AUTOCOMPLETE_INDEX_SETTINGS ||=
 			{
 		        analysis:  {
 		            filter:  {
@@ -67,7 +79,7 @@ module Auth::Concerns::EsConcern
 		        }
 			}
 
-		AUTOCOMPLETE_INDEX_MAPPINGS = 
+		AUTOCOMPLETE_INDEX_MAPPINGS ||= 
 		{
             properties: {
             	tags:  {
@@ -80,29 +92,86 @@ module Auth::Concerns::EsConcern
                 },
                 resource_id: {
                 	type: "keyword"
+                },
+                document_type: {
+                	type: "keyword"
                 }
             }
         }
 
-        before_save do |document|
+        ###########################################################
+        ##
+        ##
+        ## CONSTANTS FOR SECONDARY LINKS, TO BE USED IN THE IMPLEMENTING MODELS.
+        ##
+        ##
+        ###########################################################
+
+        NEW ||= "Add New"
+        EDIT ||= "Edit"
+        SEE_ALL ||= "See All"
+        SEE_RELATED ||= "See Related"
+
+        ###########################################################
+        ##
+        ## the primary link, masked tags and tags must all three be prsent, before the document can be saved.
+        ##
+        ###########################################################
+        validates_presence_of :primary_link
+        validates_presence_of :tags
+
+        before_validation do |document|
         	document.set_primary_link
         	document.set_secondary_links
         	document.set_autocomplete_description
         	document.set_autocomplete_tags
+        	document.add_attributes_for_tags
         end
 
+        ## unless the document is embedded, it will be added to the index after save
+        ## if the document is embedded, it can only be added to the es_index, through the controller create/update actions.
+        after_save do |document|
+			unless document.class.embedded?
+				document.es_update
+			end
+		end
+    
+		field :public, type:String, default: "no"
 
+		def es_concern_attributes
+			["tags","autocomplete_description"]
+		end
 
-		field :public, type:String, default: "no"
+		## the tags field should be cleared and reassmebled
+		## its that simple.
 
+		def attributes_for_tags
+			[]
+		end
 
+		## this is all that is needed to add these tags.
+		def add_attributes_for_tags
+			self.attributes_for_tags.each do |k|
+				self.tags << self.send("#{k}").to_s
+			end
+		end
+
+
+		## so lets see if this even works.
 		def self.create_es_index(definition)
 			## check the presence of a resource_id and a resource_class
 			#raise "Please define a resource_id field on this model to use it with elasticsearch, this field should be a string" unless self.respond_to? :resource_id
 			#raise "Please define a resource_class field on this model as well." unless self.respond_to? :resource_class
 			definition ||= {}
+			## so we are going to overwrite the document here
+			## and we are adding a document_type.
+			## 
+			#definition.merge!({:index_type => "pathofast_document"})
+			## now let me create only one index
+			## the problem is that does it somehow help to know what should be the type
+			## will have to modify the gem to set the default type as document or something
+			## then we can add the document type internally.
 			if Auth.configuration.use_es == true
-				include Mongoid::Elasticsearch
 				elasticsearch! (
 						definition
 					)
@@ -110,16 +179,19 @@ module Auth::Concerns::EsConcern
 		
 		end	
 
+=begin 
+		def as_indexed_json(options={})
+			{
+				tags: self.tags,
+				public: self.public,
+				document_type: Auth::OmniAuth::Path.pathify(self.class.name.to_s),
+				resource_id: self.resource_id,
+				resource_class: self.resource_class
+			}
+		end
+=end	
 	end
 
-	def as_indexed_json(options={})
-		{
-			tags: self.tags,
-			public: self.public,
-			resource_id: self.resource_id,
-			resource_class: self.resource_class
-		}
-	end
 
 
 	def set_autocomplete_tags
@@ -146,13 +218,18 @@ module Auth::Concerns::EsConcern
 		
 		human_readable = self.created_at.strftime("%B %-d %Y")
 		self.tags << human_readable unless self.tags.include? human_readable		
+		self.masked_tags << human_readable unless self.tags.include? human_readable
+		
 	end
 
 	def clear_autocomplete_data
 		self.primary_link = nil
 		self.secondary_links.clear
 		self.autocomplete_description = nil
+		self.masked_tags.clear
 		self.tags.clear
 	end
 
+	
+
 end