fix in acts_as_jwt_authenticatable: mattr_accessor to class method

Author: Alexei

lib/jwt_authentication/acts_as_jwt_authenticatable.rb

@@ -9,9 +9,6 @@ module ActsAsJwtAuthenticatable
       private :generate_authentication_token
       private :token_suitable?
       private :token_generator
-
-      mattr_accessor :jwt_timeout
-      mattr_accessor :jwt_timeout_remember_me
     end
 
     def ensure_authentication_token
@@ -40,7 +37,7 @@ def token_generator
     end
 
     def jwt_token(remember = false)
-      data = self.class.instance_variable_get("@jwt_key_fields").inject({}) { |hash, field| hash[field] = self.send field; hash }
+      data = self.class.jwt_key_fields.inject({}) { |hash, field| hash[field] = self.send field; hash }
       payload = {
           exp: (Time.now + jwt_session_duration(remember)).to_i,
           self.class.name.underscore => data
@@ -55,9 +52,21 @@ def jwt_session_duration(remember = false)
     module ClassMethods
       def acts_as_jwt_authenticatable(options = {})
         before_save :ensure_authentication_token
-        self.jwt_timeout_remember_me = options[:timeout_remember_me] || JwtAuthentication.jwt_timeout_remember_me
-        self.jwt_timeout = options[:timeout] || JwtAuthentication.jwt_timeout
-        self.instance_variable_set("@jwt_key_fields", options[:key_fields] || JwtAuthentication.key_fields)
+        @jwt_timeout_remember_me = options[:timeout_remember_me] || JwtAuthentication.jwt_timeout_remember_me
+        @jwt_timeout = options[:timeout] || JwtAuthentication.jwt_timeout
+        @jwt_key_fields = options[:key_fields] || JwtAuthentication.key_fields
+      end
+
+      def jwt_timeout
+        self.instance_variable_get("@jwt_timeout")
+      end
+
+      def jwt_timeout_remember_me
+        self.instance_variable_get("@jwt_timeout_remember_me")
+      end
+
+      def jwt_key_fields
+        self.instance_variable_get("@jwt_key_fields")
       end
     end
   end

lib/jwt_authentication/entity.rb

@@ -25,10 +25,6 @@ def token_param_name(controller)
       controller.jwt_models[name_underscore.to_sym][:param_name] || "#{name_underscore}_token"
     end
 
-    def key_fields
-      @model.instance_variable_get("@jwt_key_fields") || JwtAuthentication.key_fields
-    end
-
     def get_token_from_params_or_headers(controller)
       (controller.request.headers[token_header_name(controller)] || controller.params[token_param_name(controller)]).to_s
     end
@@ -37,7 +33,7 @@ def get_entity(controller)
       begin
         token = get_token_from_params_or_headers controller
         payload = JWT.decode(token, nil, false)[0]        # get payload; decode can riase: JWT::DecodeError
-        keys = model.instance_variable_get("@jwt_key_fields").inject({}) do |hash, field|
+        keys = model.jwt_key_fields.inject({}) do |hash, field|
           hash[field] = payload[name_underscore][field.to_s]
           hash
         end