horse_power 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff025ef2c76ca3e27f59c6fa8473ab267fc2c8e6
-  data.tar.gz: ab3cb1da09c35e2245f400a4112aee8cc5c758e4
+  metadata.gz: 4d38ab66e62fa078e82fc8290d67faa8adcf2842
+  data.tar.gz: f58d61a10861b6a9fc9e95ae705dc517c925b107
 SHA512:
-  metadata.gz: 236dd5f857239cc3e0d1408acfdd57f67e2cde30b82d8682950c69cf2d1362c864ba4e2efaaad9bc50e326c677432874dd8c6832710e4b8d0b47948b476eb262
-  data.tar.gz: 5e1f3548f28b0c8531d5de81fb82ad52b704c4097efabbc0397159887d0c81f282c102686add215ca396453d048a8b88a06f2e01d9d38e3b5ec9df62376051e5
+  metadata.gz: 30f683ea6e670a7007f1969cbb2b0a13676f9ce41a5d66152236e06ce8788c35b54b3f2def55b8391566b2559c0fe0fdc5bea9e7b6b066971f81966087a419a0
+  data.tar.gz: 748158b74f3dd373bd3506d67f1b8ab048919be09317dfd94a08b2602f8a1dcec30e84ca4a88520dedd6264d11a1729f16b0e57c50f46bdaa6eb0a195d4ac895

data/lib/generators/horse_power/app_environment/app_environment_generator.rb

@@ -22,7 +22,7 @@ module HorsePower
 	  	def createSettings
 	  		run "rails g rails_config:install"
 				prepend_to_file 'config/settings.yml' do
-"token_header: \"Authorization\"\nmain_api_header: \"Main-Api-Header\"\nexpire_time: 4000\n"
+"token_header: \"Authorization\"\nmain_api_header: \"Main-Api-Header\"\nexpire_time: 4000\nrevalidate_tokens: \"true\""
 				end
 				createEnvSettings
 	  	end

data/lib/generators/horse_power/setup/templates/application_controller.rb

@@ -25,11 +25,14 @@ class Api::V1::ApplicationController < ::ActionController::API
     end
 
     def set_hash
-      @instance_hash = ::TokenHash.decode(params,request)
+      @instance_hash = ::TokenHash.decode(params,request,response)
     end
 
     def current_user
       if !@instance_hash.nil?
+        if !@instance_hash["user_id"].nil?
+          @instance_hash["current_owner"] = ::User.find_by(id: @instance_hash["user_id"])
+        end
         return @instance_hash["current_owner"]
       else
         return nil

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

@@ -1,59 +1,66 @@
 class TokenHash
 
-=begin
-	Ideally, the expiration for the jwt token would be less than the db token,
-and we would return a new jwt token to the user if the current jwt token expired
-but the db token was not yet expired.
-=end
+  def self.encode(auth_token_hash,user_id)
+    obj = {}
+    obj["auth_token"] = auth_token_hash
+    obj["user_id"] = user_id
+    #Lasts a 4th of the time as the db tokens
+    obj["exp"] = ::Time.now.to_i() + ::Settings.expire_time*15
+    return ::JWT.encode(obj,::Rails.application.secrets.secret_key_base)
+  end
 
-	def self.encode(auth_token_hash,user_id)
-		obj = {}
-		obj["auth_token"] = auth_token_hash
-		obj["user_id"] = user_id
-		obj["exp"] = ::Time.now.to_i() + ::Settings.expire_time*60
-		return ::JWT.encode(obj,::Rails.application.secrets.secret_key_base)
-	end
+  def self.decode(params,request,response)
+    instance_hash = nil
+    auth_token_obj = ::Arcadex::Header.grab_param_header(params,request,::Settings.token_header,false)
+    begin
+      # Try JWT token
+      jwt = ::JWT.decode(auth_token_obj,::Rails.application.secrets.secret_key_base)
+      token = jwt[0]
+      return make_hash(token["user_id"],token["auth_token"])
+    rescue ::JWT::ExpiredSignature
+      return handle_expired(auth_token_obj,params,request,response)
+    rescue ::JWT::DecodeError
+      return handle_abnormal(auth_token_obj,params,request,response)
+    end
+  end
 
-	def self.decode(params,request)
-		instance_hash = nil
-		auth_token_obj = ::Arcadex::Header.grab_param_header(params,request,::Settings.token_header,false)
-		begin
-			# Try JWT token
-			jwt = ::JWT.decode(auth_token_obj,::Rails.application.secrets.secret_key_base)
-			token = jwt[0]
-			user = ::User.find_by(id: token["user_id"])
-			instance_hash = {}
-			instance_hash["current_owner"] = user
-			instance_hash["current_token"] = nil
-			instance_hash["auth_token"] = token["auth_token"]
-			return instance_hash
-		rescue ::JWT::ExpiredSignature
-			return handle_expired(auth_token_obj)
-		rescue ::JWT::DecodeError
-			return handle_abnormal(params,request)
-		end
-	end
+  def self.handle_expired(auth_token_obj,params,request,response)
+    # Token expired, destroy arcadex token
+    jwt = ::JWT.decode(auth_token_obj,::Rails.application.secrets.secret_key_base,true,{verify_expiration: false})
+    token = jwt[0]
+    # This is nil if the db_token is expired
+    db_token = ::Arcadex::Find.find_token_by_auth_token(token["auth_token"])
+    if db_token.nil?
+      return nil
+    else
+      if ::Settings.revalidate_tokens == "true"
+        # Send a new JWT back to the user since the db_token is still valid
+        new_token = encode(db_token.auth_token,token["user_id"])
+        response.headers[::Settings.token_header] = new_token
+        return make_hash(token["user_id"],token["auth_token"])
+      else
+        db_token.destroy
+        return nil
+      end
+    end
+  end
 
-	private
+  def self.handle_abnormal(auth_token_obj,params,request,response)
+    # 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
 
-	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
+  def self.make_hash(user_id,auth_token)
+    instance_hash = {}
+    instance_hash["current_owner"] = nil
+    instance_hash["current_token"] = nil
+    instance_hash["user_id"] = user_id
+    instance_hash["auth_token"] = auth_token
+    return instance_hash
+  end
 
 end

data/lib/horse_power/version.rb

@@ -1,3 +1,3 @@
 module HorsePower
-  VERSION = "0.9.0"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: horse_power
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Cleophus Robinson IV
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails