wordjelly-auth 1.4.8 → 1.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1bd487cfd90d83d849e828c1f4663fee4f42886302245a749ec6b24a52528a8
-  data.tar.gz: f45d4d12dda43daad3ef93991093f00424f35eaa26a17f5a3c257fdd934660c5
+  metadata.gz: 1ca38b4329d89f90793673c6d64b4ce7dd3aba5e729358c2fd78062d2125857d
+  data.tar.gz: b96bcca2319d39b9053ac397c592427fd738b9229484ebab19b95253bd22ed59
 SHA512:
-  metadata.gz: 9fb59025c76fca730389eeec63cefff8a8a02785ef9abb18a59b3884a27fa595b2f29d18ae90d8000bab79e542c4b5149910357c1171e731845227242f5815b2
-  data.tar.gz: 7956fd9bbb9fa262f4865bc9b5783a1250a1b116c53d18a53e67fcc9077092d616f163fc340397e2fbb840c9e47ca8e6717c8b668f17843b21bcd5c6d4571692
+  metadata.gz: 58ffe5cf4a8a233bb3665801428ed4261a82d1949633e854f723d9ab60dc7759ccd861f856cf771da7a0f9c3a9fbf6de8cfd9204a0b0632d763d03bc722a14ea
+  data.tar.gz: 76c0c19a7607b59100638c58149cfce7dba3f8b7b63678ec2823dd73ff0d29e706355f0bb7c8f76f4ebeb1eacbfe4578b621e1062784ef7baa0bc4f3a2d34dca

data/app/controllers/auth/profiles_controller.rb

@@ -1,6 +1,6 @@
 class Auth::ProfilesController < Auth::ApplicationController
 	
-	respond_to :json, :html, :json
+	respond_to :json, :html
 
 	CONDITIONS_FOR_TOKEN_AUTH = [:get_user_id,:show,:update,:set_proxy_resource, :edit]
 

data/config/initializers/omniauth.rb

@@ -414,6 +414,12 @@ module SimpleTokenAuthentication
 
 	module ActsAsTokenAuthenticatable
 
+		## if the skip_authentication_token_generation carries
+		## any value it will not regenerate the authentication token.
+		## this can be useful if you are updating the user, but not his 
+		## 
+		mattr_accessor :skip_authentication_token_regeneration
+
 		def regenerate_token
 			self.authentication_token = generate_authentication_token(token_generator)
 	      	raise "please set a field called: encrypted_authentication_token on your user model" unless self.respond_to? :encrypted_authentication_token
@@ -422,8 +428,11 @@ module SimpleTokenAuthentication
 		end
 
 		## CHANGE THE AUTHENTICATION TOKEN WHENEVER THE USER IS SAVED. IT DOESNT MATTER IF THERE IS AN EXISTING AUTHENTICATION TOKEN OR NOT.
+	   	## so this is happening, we will have to skip this hook.
+	   	## so we will have to mod this to check for an accessor.
+	   	## otherwise it will screw up totally.
 	    def ensure_authentication_token
-	      regenerate_token
+	      regenerate_token if self.skip_authentication_token_regeneration.blank?
 	    end
 	end
 
@@ -437,7 +446,7 @@ module SimpleTokenAuthentication
 		## to prevent that from happening, we ignore the fallback if we are already signed in.
 		def fallback!(entity, fallback_handler)
 		  
-		  puts "came to fallback!"
+		 # puts "came to fallback!"
 
       	  return if self.signed_in?
 
@@ -478,17 +487,17 @@ module SimpleTokenAuthentication
 
 	    def find_record_from_identifier(entity)
 	    	## you are supposed to find the record using one of the other parameters.
-	    	puts "came to find entity from identifier -----------------------------------"
+	    	#puts "came to find entity from identifier -----------------------------------"
 	    	additional_identifiers = entity.get_additional_identifiers_from_headers(self)
       		
-      		puts "additional_identifiers"
+      		#puts "additional_identifiers"
       		puts additional_identifiers
 	    	
 	    	app_id_value = additional_identifiers["X-User-Aid"]
 	    	user_es_value = additional_identifiers["X-User-Es"]
 	    	token = entity.get_token_from_params_or_headers(self)
 		   	
-		   	puts "token:#{token}"
+		   	#puts "token:#{token}"
 
 		    if token
 		    	

data/lib/auth/version.rb

@@ -1,3 +1,3 @@
 module Auth
-  VERSION = "1.4.8"
+  VERSION = "1.4.9"
 end