the_garage 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22866c2b96913a0808dc58ee3c6616a1fa190bdd632d5cbcf23ba0781b5012fc
-  data.tar.gz: c05332be7ec143fe6aec9b52d9e982be382e45db5c1433c67127a69c692add79
+  metadata.gz: 80169386da45b2a7fa5b98e3f855e9df7a49e9fac6357cd894bc26eb24d45a95
+  data.tar.gz: 0d7dd3a20e97a8aeeebdd79e52b99e8ddf4291b6eba0885b1d7a5cf453265792
 SHA512:
-  metadata.gz: 9525bff41a05c514895634c65db08f5644b7c32e2e812f7935df9c7cb68b384d96e21e4bf8ccccc9dbc5561a85d889bd160ff679e9c5e2685a1b07f8c30ed874
-  data.tar.gz: dd942e114ef1fe840e0a145a3530dbe924970012d66fa7198dacb0409cc1447f36b6111bbb14fdde71ddee5341d76c8a87f4944e8ab3e7a8957ed8513043014a
+  metadata.gz: a68873fd908fc82273b263f0234a852bf1537e3c6cce7a0ef957652ec773b711f2b7ee28cb1f183644e8f4bb9421c1c2a60fc5caf1ba567d5cf5e5c630fb00dc
+  data.tar.gz: 53ba2171e6f6b1c4eebd3bdc6158e932fea15780a2caecc2b19d5148dfe658c11fb0627cc8bd0c46ba232f29be6d287f9669f3da48a3e595d896df550d8f6aa1

data/README.md

@@ -153,7 +153,7 @@ Then configure auth server strategy:
 
 The OAuth server must response a json with following structure.
 
-- `token`(string) - OAuth access token value.
+- `token` (string, null) - OAuth access token value.
 - `token_type` (string) - OAuth access token value. i.e. `bearer` type.
 - `scope` (string) - OAuth scopes separated by spaces. i.e. `public read_user`.
 - `application_id` (integer) - OAuth application id of the access token.

data/app/controllers/garage/docs/resources_controller.rb

@@ -86,7 +86,7 @@ class Garage::Docs::ResourcesController < Garage::ApplicationController
   def require_console_application
     @app = console_application
     if @app[:uid].blank? || @app[:secret].blank?
-      render(text: 'Configuration for console application is missing.', status: :forbidden)
+      render(plain: 'Configuration for console application is missing.', status: :forbidden)
     end
   end
 

data/lib/garage/strategy/access_token.rb

@@ -1,7 +1,8 @@
 module Garage
   module Strategy
     class AccessToken
-      attr_reader :scope, :token, :token_type, :raw_response
+      attr_accessor :token
+      attr_reader :scope, :token_type, :raw_response
 
       def initialize(attrs)
         @raw_response = attrs

data/lib/garage/strategy/auth_server.rb

@@ -58,10 +58,8 @@ module Garage
 
         def fetch
           if has_any_valid_credentials?
-            if has_cacheable_credentials?
-              fetch_with_cache
-            else
-              fetch_without_cache
+            fetch_access_token&.tap do |access_token|
+              access_token.token ||= token_string
             end
           else
             nil
@@ -144,6 +142,14 @@ module Garage
           @bearer_token ||= @request.authorization.try {|o| o.slice(/\ABearer\s+(.+)\z/, 1) }
         end
 
+        def fetch_access_token
+          if has_cacheable_credentials?
+            fetch_with_cache
+          else
+            fetch_without_cache
+          end
+        end
+
         def fetch_with_cache
           Cache.with_cache("garage_gem/token_cache/#{Garage::VERSION}/#{bearer_token}") do
             fetch_without_cache
@@ -162,6 +168,12 @@ module Garage
             end
           end
         end
+
+        def token_string
+          bearer_token.presence ||
+            @request.params[:access_token].presence ||
+            @request.params[:bearer_token].presence
+        end
       end
 
       class Response

data/lib/garage/version.rb

@@ -1,3 +1,3 @@
 module Garage
-  VERSION = '2.6.1'
+  VERSION = '2.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: the_garage
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Tatsuhiko Miyagawa
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-14 00:00:00.000000000 Z
+date: 2021-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rack-accept-default
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Garage extends your RESTful, Hypermedia APIs as a Platform
 email:
 - miyagawa@bulknews.net
@@ -255,7 +241,7 @@ homepage: https://github.com/cookpad/garage
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -271,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Garage Platform Engine
 test_files: []