wordjelly-auth 1.5.7 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df4832de0bbfda0dc48e6f1c939321a85d780113
-  data.tar.gz: 85d6e0d4b1494ad79b1e46f36dd85aa11330fce0
+  metadata.gz: a4c7a6fa2414fecf2cf21099f1feee06e5194cde
+  data.tar.gz: 315f03e8fb5a9ae0915685ccc843b0a2664ce4f8
 SHA512:
-  metadata.gz: 151a9f9930a7a7e24be4d55a27ff6ef98fe7478db9621233463b772ef56d3f98aee377afb8b289f61c11abf895d1387125df6df8cf487aa8e058ffa5948adc29
-  data.tar.gz: 2acdfb6e97c4b1c37064a30cb6a8b6547bfb23863d0d0ff2a5d975fbdd0f72aa3faeaa752ade71436ef869fa00125c285e04d08308bfee6fa8e9fc349ea5d28f
+  metadata.gz: 142f82330d3e22094fc4ceb62cf8c60bc4badd3f975b1630e1ea7138cb281a1c6e2ccb8bcd6a9a4f639a4c1282f2f785d265060d03380b065a63b1553ff2ef84
+  data.tar.gz: 5a4934e0d8af79042352195173f0b527e18f58e89604f6f40409ac4dad2a7d9ff6ce31bd0f001d359b09fa1f124c95e8c47fa60a93b4bc18e2e192228ee7d209

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

@@ -72,7 +72,7 @@ module Auth::Concerns::DeviseConcern
 
     def set_client
 	    
-        puts "came to set client -------!!!!!!!!!!!!! "
+        #puts "came to set client -------!!!!!!!!!!!!! "
 	    if session[:client]
 	      
 	      
@@ -108,7 +108,7 @@ module Auth::Concerns::DeviseConcern
             
 	        if session[:client] = Auth::Client.find_valid_api_key_and_app_id(api_key, current_app_id)
 	          	    
-                puts "found valid client."
+                #puts "found valid client."
                 request.env["omniauth.model"] = path
                 
                 self.m_client = Auth::Client.find_valid_api_key_and_app_id(api_key, current_app_id)
@@ -139,11 +139,11 @@ module Auth::Concerns::DeviseConcern
 	    	else
                 #puts "action name is something else."
 		    	if session[:client].nil?
-                    puts "cient is nil so rendering nothing."
+                    #puts "cient is nil so rendering nothing."
 		      		#render :nothing => true , :status => :unauthorized
 		      	    head :unauthorized
                 else
-                    puts " -------- have A VALID CLIENT WITH JSON --------- "
+                    #puts " -------- have A VALID CLIENT WITH JSON --------- "
                 end
 	      	end
         else
@@ -182,16 +182,16 @@ module Auth::Concerns::DeviseConcern
   
     def do_before_request
        
-       puts "DO BEFORE REQUEST"
+       #puts "DO BEFORE REQUEST"
        clear_client_and_redirect_url
         
-       puts "SET CLIENT"
+       #puts "SET CLIENT"
        set_client
         
-       puts "SET REDIRECT"
+       #puts "SET REDIRECT"
        set_redirect_url
 
-       puts "PROTECT JSON"
+       #puts "PROTECT JSON"
        protect_json_request
 
     end

data/app/jobs/otp_job.rb

@@ -83,7 +83,9 @@ class OtpJob < ActiveJob::Base
         notification.send_email(resource) do 
           JSON.generate(email.message.mailgun_variables)      
         end
-      
+        
+        ## so basically we call deliver now 
+        ## inside the background job.
         email.deliver_now
   	
       end

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

@@ -27,7 +27,7 @@ module Auth::Concerns::UserConcern
 
 		USER_INFO_FIELDS = ["name","image_url"]
 
-		PUBLICLY_VISIBLE_FIELD_NAMES = ["email","additional_login_param"]
+		PUBLICLY_VISIBLE_FIELD_NAMES = ["id","email","additional_login_param","name","image_url"]
 
 		include MongoidVersionedAtomic::VAtomic
 		
@@ -591,24 +591,30 @@ module Auth::Concerns::UserConcern
 	## this is needed in 
 	def as_json(options={})
 		
-		## basically here the problem is that if the user himself is searching for his own record, then it is trying to return the authentication token.
-		## 
+		## so if this does not work, then we go forward.
 		
 		json = {:nothing => true}
 		
 		if (!self.destroyed? && options[:otp_verification].nil?)
 			
-			if self.m_client.current_app_id && at_least_one_authentication_key_confirmed? && self.errors.empty?
-			 		
-			 		json = {}
-		     		json[:es] = self.client_authentication[self.m_client.current_app_id]
-		     		json[:authentication_token] = self.authentication_token
-
-		     		unless options[:show_id].nil?
-		     			json[:id] = self.id.to_s
-		     			json[:admin] = self.admin.to_s
-		     		end
-		     	
+			if self.m_client.blank?
+				json = {}
+				PUBLICLY_VISIBLE_FIELD_NAMES.each do |fname|
+					json[fname.to_sym] = self.send(fname) unless self.send(fname).blank?
+				end
+			else
+				if self.m_client.current_app_id && at_least_one_authentication_key_confirmed? && self.errors.empty?
+				 		
+				 		json = {}
+			     		json[:es] = self.client_authentication[self.m_client.current_app_id]
+			     		json[:authentication_token] = self.authentication_token
+
+			     		unless options[:show_id].nil?
+			     			json[:id] = self.id.to_s
+			     			json[:admin] = self.admin.to_s
+			     		end
+			     	
+			 	end
 		 	end
 		 	if self.errors.full_messages.size > 0
 		 	 	json[:errors] = self.errors.full_messages