Rubop + bug fixes (#9)

Author: scottrobertson

.rubocop.yml

@@ -19,4 +19,4 @@ Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: consistent_comma
 
 Layout/LineLength:
-  Max: 120
+  Max: 150

lib/tokenable/authable.rb

@@ -9,9 +9,6 @@ module Tokenable
   module Authable
     extend ActiveSupport::Concern
 
-    included do
-    end
-
     def user_signed_in?
       current_user.present?
     end
@@ -23,13 +20,23 @@ def current_user
     end
 
     def require_tokenable_user!
-      raise Tokenable::Unauthorized.new('User not found in JWT token') unless jwt_user_id
-      raise Tokenable::Unauthorized.new('User is not signed in') unless user_signed_in?
-      raise Tokenable::Unauthorized.new('Token verifier is invalid') if user_class.included_modules.include?(Tokenable::Verifier) && !current_user.valid_verifier?(jwt_verifier)
+      raise Tokenable::Unauthorized, 'User not found in JWT token' unless jwt_user_id
+      raise Tokenable::Unauthorized, 'User is not signed in' unless user_signed_in?
+      raise Tokenable::Unauthorized, 'Token verifier is invalid' unless valid_token?
     end
 
     private
 
+    def verifier_enabled?
+      user_class.included_modules.include?(Tokenable::Verifier)
+    end
+
+    def valid_token?
+      return true unless verifier_enabled?
+
+      current_user.valid_verifier?(jwt_verifier)
+    end
+
     def user_class
       Tokenable::Config.user_class
     end
@@ -42,16 +49,12 @@ def token_from_user(user)
       jwt_data = {
         data: {
           user_id: user.id,
-        }
+        },
       }
 
-      if jwt_expiry_time
-        jwt_data[:exp] = jwt_expiry_time
-      end
+      jwt_data[:exp] = jwt_expiry_time if jwt_expiry_time
 
-      if user_class.included_modules.include?(Tokenable::Verifier)
-        jwt_data[:data][:verifier] = user.current_verifier
-      end
+      jwt_data[:data][:verifier] = user.current_verifier if verifier_enabled?
 
       JWT.encode(jwt_data, jwt_secret, 'HS256')
     end
@@ -65,19 +68,19 @@ def jwt_verifier
     end
 
     def jwt
-      raise Tokenable::Unauthorized.new('Bearer token not provided') unless token_from_header.present?
+      raise Tokenable::Unauthorized, 'Bearer token not provided' unless token_from_header.present?
 
       @jwt ||= JWT.decode(token_from_header, jwt_secret, true, { algorithm: 'HS256' }).first.to_h
     rescue JWT::ExpiredSignature
-      raise Tokenable::Unauthorized.new('Token has expired')
+      raise Tokenable::Unauthorized, 'Token has expired'
     rescue JWT::VerificationError
-      raise Tokenable::Unauthorized.new('The tokenable secret used in this token does not match the one supplied in Tokenable::Config.secret')
+      raise Tokenable::Unauthorized, 'The tokenable secret used in this token does not match the one supplied in Tokenable::Config.secret'
     rescue JWT::DecodeError
-      raise Tokenable::Unauthorized.new('JWT exception thrown')
+      raise Tokenable::Unauthorized, 'JWT exception thrown'
     end
 
     def jwt_expiry_time
-      Tokenable::Config.lifespan
+      Tokenable::Config.lifespan ? Tokenable::Config.lifespan.from_now.to_i : nil
     end
 
     def jwt_secret

lib/tokenable/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tokenable
   class Config
     # How long should the token last before it expires?
@@ -15,13 +17,15 @@ class Config
     # We do this, as some of our defaults need to live in a Proc (as this library is loaded before Rails)
     # This means we can return the value when the method is called, instead of the Proc.
     def self.method_missing(method_name, *args, &block)
-      self.class_variable_defined?("@@#{method_name}") ? self.proc_reader(method_name) : super
+      class_variable_defined?("@@#{method_name}") ? proc_reader(method_name) : super
     end
 
-    private
+    def self.respond_to_missing?(method_name, include_private = false)
+      class_variable_defined?("@@#{method_name}") || super
+    end
 
     def self.proc_reader(key)
-      value = self.class_variable_get("@@#{key}")
+      value = class_variable_get("@@#{key}")
       value.is_a?(Proc) ? value.call : value
     end
   end

lib/tokenable/controllers/tokens_controller.rb

@@ -11,8 +11,8 @@ def create
       response = {
         data: {
           token: token_from_user(user),
-          user_id: user.id
-        }
+          user_id: user.id,
+        },
       }
 
       render json: response, status: 201

lib/tokenable/verifier.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Tokenable
   module Verifier
     extend ActiveSupport::Concern
 
     def valid_verifier?(verifier)
-      raise Tokenable::Unauthorized.new("#{verifier_key} field is missing") unless self.has_attribute?(verifier_key)
+      raise Tokenable::Unauthorized, "#{verifier_key} field is missing" unless has_attribute?(verifier_key)
 
       current_verifier == verifier
     end
@@ -17,7 +19,7 @@ def invalidate_tokens!
     end
 
     def issue_verifier!
-      self.update!(verifier_key => SecureRandom.uuid)
+      update!(verifier_key => SecureRandom.uuid)
       read_attribute(verifier_key)
     end