collavre_completion_api 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c722b5ce20cb6dceec074e389ac7d88a973caa0855212c9a9f553c2eee495ae1
-  data.tar.gz: b04400dd54db5ffe107d88eceb7f79ae4cb0c23b0f67749a175e9a770c892da5
+  metadata.gz: dc50b74db9b7b24ba288392fb8c5a4b269727228829dcf91a0196236f0a5c352
+  data.tar.gz: 5bdad75265afa2f8eae040d22069e8370cb771afd5bc2abccc380a47d2a9def5
 SHA512:
-  metadata.gz: f1329384805d5ec00be758352969e1e45cc93bbfd5674b757eb2f9d6acce1f2b3f08f610cfd8e2b025c96465de13b1f692afd83995fc1501c176feb6c413ef3a
-  data.tar.gz: 7fe0bb705db919ce3e44615ce20fbb1d30ddc6f3754dee2a001078f8fe18eb37b36728de42db257ec0a9bed02add44ac0d76ab8e1cb57fddbd2d79362d04af5b
+  metadata.gz: 2abccff570987512417cdc2d41f22a7b05177b7bf4bcdb6e44bd47f7b87560d35aa9fe8332ecf7f7abf60d9f3e9f8083605a209394cc915e7362f24188b34605
+  data.tar.gz: 96578d0b13a218be1f72a1086d0e7ecf6fd7ce8a3fb391750b24073602fa29403e251e5c1163d2f084a866404ee8f2dc905fcb908504e43d3c2f005d4657fe86

data/app/controllers/collavre_completion_api/api/v1/base_controller.rb

@@ -17,7 +17,7 @@ module CollavreCompletionApi
             return
           end
 
-          unless authenticate_oauth(token)
+          unless find_user_by_bearer_token(token)
             render json: { error: { message: "Invalid authentication token", type: "invalid_request_error",
                                     code: "invalid_token" } },
                    status: :unauthorized
@@ -25,17 +25,10 @@ module CollavreCompletionApi
           end
         end
 
-        def authenticate_oauth(token)
-          access_token = Doorkeeper::AccessToken.by_token(token)
-          return false unless access_token&.accessible?
-
-          user = Collavre::User.find_by(id: access_token.resource_owner_id)
-          return false unless user
-
-          Collavre::Current.user = user
-          true
-        end
-
+        # Bearer-auth helpers are kept inline here (rather than shared via the
+        # core Collavre::Api::Authenticatable concern) so this engine stays
+        # loadable under USE_COLLAVRE_GEM=true, where core resolves to a
+        # published collavre gem that may predate the concern.
         def extract_bearer_token
           auth_header = request.headers["Authorization"]
           return nil unless auth_header&.start_with?("Bearer ")
@@ -43,6 +36,19 @@ module CollavreCompletionApi
           auth_header.sub("Bearer ", "")
         end
 
+        def find_user_by_bearer_token(token)
+          return nil if token.blank?
+
+          access_token = Doorkeeper::AccessToken.by_token(token)
+          return nil unless access_token&.accessible?
+
+          user = Collavre::User.find_by(id: access_token.resource_owner_id)
+          return nil unless user
+
+          Collavre::Current.user = user
+          user
+        end
+
         def current_user
           Collavre::Current.user
         end

data/lib/collavre_completion_api/version.rb

@@ -1,3 +1,3 @@
 module CollavreCompletionApi
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collavre_completion_api
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Collavre