healthier 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 711f2ef8a3f208c3e4a4cc710fc86f73ff049a1734e0726caca32ef2d3c597f0
-  data.tar.gz: ceb81192506fb5d7132840da224ac48bdb6f31d216dc2867da3d2afca0bd5576
+  metadata.gz: 9b9085660c0bf98cddf325db77e9d7f7a655c34e4af17e0febcc2d0468d42a10
+  data.tar.gz: b4cbbda7e758b1375c07d3ff98efa31ac85a52a9ede9c67dd2a06a95c75f9103
 SHA512:
-  metadata.gz: 4c2b4a07809bdb88f6bd292ba9b284c5b6612ca525c0929341d4757aa01a6b98a56c3c0e60a160859e8e1b93d7c41cf13dfe9f1946997ec038b15d46b3516b8f
-  data.tar.gz: 8b260ec426e1544f745843ede0eaa38719aa08dd75636aa6a839a65412b7308d8bc2f0a90eba950779b76571d6b8117b9cb73de389861f24f6307fe335cc4731
+  metadata.gz: 522eea93d714a4afe55e18f20be294674a3406915b31c858567471117aa6e9089d8a8269517efb6bd2b8c29a70d895109e1047a93c7ec68a739d856b8656d6a2
+  data.tar.gz: 65e6082188ace39b2013404301fa137596b501d0f301fa0679697311038217642a08e29a7b5786fb406fdecf54016d90d49e6f652e90b89a9ae101b2db29448a

data/app/controllers/healthier/application_controller.rb

@@ -3,12 +3,5 @@
 module Healthier
   # ApplicationController
   class ApplicationController < ActionController::Base
-    include ActionController::HttpAuthentication::Basic::ControllerMethods
-
-    before_action :authenticate_request
-
-    def authenticate_request
-      BasicAuthService.authorize(self)
-    end
   end
 end

data/app/controllers/healthier/checks_controller.rb

@@ -3,8 +3,22 @@
 module Healthier
   # Controller for performing health checks
   class ChecksController < ApplicationController
+    include ActionController::HttpAuthentication::Basic::ControllerMethods
+
+    before_action :authenticate_request
+
     def ping
       render json: Healthier::Engine.ping!
     end
+
+    protected
+
+    def authenticate_request
+      api_authenticator.authenticate
+    end
+
+    def api_authenticator
+      Healthier::ApiAuthenticator.new(self)
+    end
   end
 end

data/lib/healthier/api_authenticator.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Healthier
+  # Engine
+  class ApiAuthenticator
+    attr_accessor :controller
+
+    def initialize(controller)
+      @controller = controller
+    end
+
+    def authenticate
+      send("authenticate_with_#{Healthier.auth_mechanism}")
+    end
+
+    def authenticate_with_bearer_token
+      controller.authenticate_with_http_token do |token, _options|
+        ENV['BEARER_TOKEN'] == token
+      end
+    end
+
+    def authenticate_with_basic_auth
+      controller.authenticate_or_request_with_http_basic do |username, password|
+        username == ENV['USERNAME'] && password == ENV['PASSWORD']
+      end
+    end
+  end
+end

data/lib/healthier/version.rb

@@ -2,5 +2,5 @@
 
 module Healthier
   # MAJOR.MINOR.PATCH
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/healthier.rb

@@ -2,6 +2,7 @@
 
 require 'healthier/version'
 require 'healthier/engine'
+require 'healthier/api_authenticator'
 
 # Healthier
 module Healthier
@@ -10,5 +11,6 @@ module Healthier
   end
 
   mattr_accessor :healthier, default: -> { YAML.load_file(Rails.root.join('config/healthier.yml')) }
+  mattr_accessor :auth_mechanism, default: 'basic_auth'
   mattr_accessor :depends_on, default: {}
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: healthier
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Nima Yonten
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2023-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,10 +36,10 @@ files:
 - Rakefile
 - app/controllers/healthier/application_controller.rb
 - app/controllers/healthier/checks_controller.rb
-- app/services/basic_auth_service.rb
 - config/routes.rb
 - lib/generators/healthier/config_generator.rb
 - lib/healthier.rb
+- lib/healthier/api_authenticator.rb
 - lib/healthier/engine.rb
 - lib/healthier/version.rb
 - lib/tasks/healthier_tasks.rake

data/app/services/basic_auth_service.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-# This module authenticates the API with Basic Auth
-class BasicAuthService
-  def self.authorize(controller)
-    controller.authenticate_or_request_with_http_basic do |username, password|
-      username == ENV['USERNAME'] && password == ENV['PASSWORD']
-    end
-  end
-end