horse_power 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9442e28cc073d758e9835dceb9193ff27e48534f
-  data.tar.gz: 5ae049d0df4c3869d9a366900dc301dd0bee3cc1
+  metadata.gz: 11e5b8359c276a69382c43a467a1ee120f97dc1f
+  data.tar.gz: e7047dbdde2d4bbacfe43acf58b5a9247c2bb5a5
 SHA512:
-  metadata.gz: d2fbb5c843e3e78e9d1e5b8273696a3189636c889004d4da2f206869f71e7e5eb9cfae6873fcd490d251ffc5ee764252e71ee5e8e71306621dad9e28e73a2288
-  data.tar.gz: 794855f0154eed79f46daac8a8b20f8a8e597696b0f160c31f384a831088d31aa33013f402e539dbf0f7fee1cdd126cd4296da287da8b13c7c97b286de1fed8e
+  metadata.gz: 80e6e5f6920474876c9af613824bba5d75f235655762de48c81672f6f585923dd9a5c337ff2add1c54440d3c890c3085175d52f0a1800940d83df3dd3ad01700
+  data.tar.gz: c3c4fd4d3318b4c3f7f395e58f36c4439b888795f2ead55b967487080fd0597a7630be9c877dd2517abf4720370a54b7f4149b04fa9427e3fed4a482a9eea3dd

data/lib/generators/horse_power/user/templates/tokenhash.rb

@@ -27,14 +27,33 @@ but the db token was not yet expired.
 			instance_hash["current_token"] = nil
 			instance_hash["auth_token"] = token["auth_token"]
 			return instance_hash
-		rescue ::JWT::DecodeError, ::JWT::ExpiredSignature
-			# Try Arcadex token
-			instance_hash = ::Arcadex::Authentication.get_instance(params,request,::Settings.token_header)
-			if !instance_hash.nil?
-				instance_hash["auth_token"] = nil
-			end
-			return instance_hash
+		rescue ::JWT::ExpiredSignature
+			return handle_expired(auth_token_obj)
+		rescue ::JWT::DecodeError
+			return handle_abnormal(params,request)
+		end
+	end
+
+	private
+
+	def self.handle_expired(auth_token_obj)
+		# Token expired, destroy arcadex token
+		jwt = ::JWT.decode(auth_token_obj,::Rails.application.secrets.secret_key_base,true,{verify_expiration: false})
+		token = jwt[0]
+		db_token = ::Arcadex::Find.find_token_by_auth_token(token["auth_token"])
+		if !db_token.nil?
+			db_token.destroy
+		end
+		return nil
+	end
+
+	def self.handle_abnormal(params,request)
+		# Try Arcadex token
+		instance_hash = ::Arcadex::Authentication.get_instance(params,request,::Settings.token_header)
+		if !instance_hash.nil?
+			instance_hash["auth_token"] = nil
 		end
+		return instance_hash
 	end
 
 end

data/lib/horse_power/version.rb

@@ -1,3 +1,3 @@
 module HorsePower
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: horse_power
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Cleophus Robinson IV