better_record 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff5b45bbb88e2c69ea34a18d4558c3347c8436d78bd3b840e8b1593e886ef98a
-  data.tar.gz: a224ba7363f4ad63f3b8adf4d4cb4dfea548e679d453453b29aaabddffe1f262
+  metadata.gz: 0c74ce4cc2b32ee6daae476f67ee6ef3a8c3446749eb7a62bac00d9b3acca5d4
+  data.tar.gz: 0c7275ae95cda50bd041deaedf8cadfe1f39998f9bd2f75912b7dcfb750fcf6e
 SHA512:
-  metadata.gz: cd607cccce38fa0c4b7a5f2af1884ae45eaedd89a21569dea5c96c3035f5baffe459e25369b63825f9eed203c501743322066c25751fec38cb95e74d313d514d
-  data.tar.gz: 4e09e671517071cb94030f732851b7ba8b8ce3786d19647a6e008f76854758da625db822c92ebcae6317449821b3a682d2f70dfb7eb7c1eff6117fb002d9ccc1
+  metadata.gz: d4ca2c297bd1c0b56edee22fd172257c4fb709796ee3f87a93cea0a006f2aa59d38ec0901e1a28ff0c64c16491d554f4ab53905c2ff9698f7c9fc49aeb556658
+  data.tar.gz: ec802533dc25ae1639a91c51e6f3d6b0eb373d6d5d174951a13e345a4850a593ab80a5e0ccf0aa61350bab21ba319967ca2934c0e486fe6d1f57ae0d71edfead

data/lib/better_record.rb

@@ -19,6 +19,7 @@ module BetterRecord
     :layout_template,
     :app_domain_name,
     :after_login_path,
+    :use_bearer_token,
     :session_class,
     :session_column,
     :session_data,
@@ -49,6 +50,7 @@ module BetterRecord
   self.layout_template = (ENV.fetch('BR_LAYOUT_TEMPLATE') { 'better_record/layout' }).to_s
   self.app_domain_name = (ENV.fetch('APP_DOMAIN_NAME') { 'non_existant_domain.com' }).to_s
   self.after_login_path = (ENV.fetch('BR_AFTER_LOGIN_PATH') { nil })
+  self.use_bearer_token = Boolean.strict_parse(ENV.fetch('BR_USE_BEARER_TOKEN') { false })
   self.session_column = (ENV.fetch('BR_SESSION_COLUMN') { :id }).to_sym
   self.session_authenticate_method = (ENV.fetch('BR_SESSION_AUTHENTICATE_METHOD') { :authenticate }).to_sym
   self.certificate_session_column = (ENV.fetch('BR_CERTIFICATE_SESSION_COLUMN') { :certificate }).to_sym

data/lib/better_record/concerns/controllers/authenticatable.rb

@@ -5,28 +5,14 @@ require 'active_support/concern'
 module BetterRecord
   module Authenticatable
     extend ActiveSupport::Concern
-    include BetterRecord::JWT::ControllerMethods
 
     included do
+      include BetterRecord::JWT::ControllerMethods
       before_action :check_user
-    end
-
-    def method_missing(method, *args)
-      begin
-        if BetterRecord.attributes[method.to_sym]
-          m = method.to_sym
-          self.class.define_method m do
-            BetterRecord.__send__ m
-          end
-          BetterRecord.__send__ m
-        else
-          raise NoMethodError
-        end
-      rescue NoMethodError
-        super(method, *args)
+      if use_bearer_token
+        after_action :set_auth_header
       end
     end
 
-
   end
 end

data/lib/better_record/concerns/controllers/sessionable.rb

@@ -5,31 +5,41 @@ require 'active_support/concern'
 module BetterRecord
   module Sessionable
     extend ActiveSupport::Concern
-    include BetterRecord::JWT::ControllerMethods
 
     included do
+      include BetterRecord::JWT::ControllerMethods
       skip_before_action :check_user, raise: false
-    end
 
-    def new
-      session[:referrer] ||= request.referrer
-      p session[:referrer], request.referrer
-      if (header_hash = request.headers.to_h.deep_symbolize_keys)[:HTTP_X_SSL_CERT].present?
-        create_session_from_certificate(header_hash[:HTTP_X_SSL_CERT])
-        redirect_to (session.delete(:referrer) || __send__(after_login_path) || root_path)
-      end
-    end
+      def new
+        session[:referrer] ||= request.referrer unless use_bearer_token
 
-    def create
-      if(user = session_class.__send__(session_authenticate_method, params))
-        session[:better_record] = create_jwt(user)
+        if (header_hash = request.headers.to_h.deep_symbolize_keys)[:HTTP_X_SSL_CERT].present?
+          create_session_from_certificate(header_hash[:HTTP_X_SSL_CERT])
+          return respond_to_login
+        end
       end
-      respond_to do |format|
-        format.json
-        format.html do
-          return redirect_to (session.delete(:referrer) || __send__(after_login_path) || root_path)
+
+      def create
+        if(user = session_class.__send__(session_authenticate_method, params))
+          current_token = create_jwt(user)
+          set_user(user)
         end
+        return respond_to_login
       end
+
+      private
+        def respond_to_login
+          respond_to do |format|
+            format.json
+            format.html do
+              return redirect_to (
+                (!use_bearer_token && session.delete(:referrer)) ||
+                __send__(after_login_path) ||
+                root_path
+              )
+            end
+          end
+        end
     end
   end
 end

data/lib/better_record/jwt.rb

@@ -60,6 +60,24 @@ module BetterRecord
     end
 
     module ControllerMethods
+      include ActionController::HttpAuthentication::Token::ControllerMethods
+
+      def method_missing(method, *args)
+        begin
+          if BetterRecord.attributes[method.to_sym]
+            m = method.to_sym
+            self.class.define_method m do
+              BetterRecord.__send__ m
+            end
+            BetterRecord.__send__ m
+          else
+            raise NoMethodError
+          end
+        rescue NoMethodError
+          super(method, *args)
+        end
+      end
+
       protected
         def check_user
           if logged_in?
@@ -68,7 +86,7 @@ module BetterRecord
               if  !data[:created_at] ||
                   (data[:created_at].to_i > 14.days.ago.to_i)
                 if user = session_class.find_by(session_column => data[:user_id])
-                  session[:current_user] = create_jwt(user, data) if data[:created_at] < 1.hour.ago
+                  current_token = create_jwt(user, data) if data[:created_at] < 1.hour.ago
                   set_user(user)
                 else
                   throw 'User Not Found'
@@ -77,7 +95,7 @@ module BetterRecord
                 throw 'Token Expired'
               end
             rescue
-              session.delete(:current_user)
+              current_token = nil
               BetterRecord::Current.drop_values
             end
           end
@@ -105,7 +123,8 @@ module BetterRecord
               user = user.__send__(certificate_session_user_method)
             end
 
-            session[:current_user] = create_jwt(user, { has_certificate: true })
+            current_token = create_jwt(user, { has_certificate: true })
+            set_user(user)
           end
         end
 
@@ -114,11 +133,39 @@ module BetterRecord
         end
 
         def current_user_session_data
-          logged_in? ? JWT.decode(session[:current_user]).deep_symbolize_keys : {}
+          logged_in? ? JWT.decode(current_token).deep_symbolize_keys : {}
         end
 
         def logged_in?
-          session[:current_user].present?
+          current_token.present?
+        end
+
+        def current_token
+          if use_bearer_token
+            @current_token ||= authenticate_with_http_token do |token, **options|
+              token
+            end
+          else
+            @current_token ||= session[:current_user]
+          end
+        end
+
+        def current_token=(value)
+          @current_token = value
+          if use_bearer_token
+            set_auth_header
+          else
+            if value.blank?
+              session.delete(:current_user)
+            else
+              session[:current_user] = value
+            end
+          end
+          @current_token
+        end
+
+        def set_auth_header
+          response.set_header("AUTH_TOKEN", current_token)
         end
 
         def set_user(user)

data/lib/better_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BetterRecord
-  VERSION = '0.8.4'
+  VERSION = '0.8.5'
 end

data/lib/generators/better_record/setup/templates/initializer.rb

@@ -12,6 +12,7 @@ module BetterRecord
   #                  layout_template: BR_LAYOUT_TEMPLATE                   #
   #                  app_domain_name: APP_DOMAIN_NAME                      #
   #                 after_login_path: BR_AFTER_LOGIN_PATH                  #
+  #                 use_bearer_token: BR_USE_BEARER_TOKEN                  #
   #                   session_column: BR_SESSION_COLUMN                    #
   #      session_authenticate_method: BR_SESSION_AUTHENTICATE_METHOD       #
   #       certificate_session_column: BR_CERTIFICATE_SESSION_COLUMN        #
@@ -59,6 +60,9 @@ module BetterRecord
 
   # OPTIONAL #
 
+  # set to true to use Auth headers instead of session cookies
+  # self.use_bearer_token = true
+
   # self.after_login_path = Rails.application.routes.url_helpers.root_path
 
   # self.session_column = :uuid

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Sampson Crowley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-24 00:00:00.000000000 Z
+date: 2018-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails