zaikio-oauth_client 0.15.0 → 0.15.1.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb0748eddd282729e6a9ca264b17a59d58b9822c5e900f1bc3690b2b10549567
-  data.tar.gz: 191d4f0652fa8dfb9dae28bbfcd550ef8b2114366ef41ad291f25620011e8d3e
+  metadata.gz: 5695820de8df28288feb3794016c0288e2dce2d7890a8c3bd9b11685fc39c32f
+  data.tar.gz: 2616666c8df490d153339d6953f6066a46f00669dfd037dcc2faf62873b44e9a
 SHA512:
-  metadata.gz: 21c66faa4cd6cad8b787b39f919b0e1c30ec718b912f5442ad0fd4c96b7871a0db798bdf84e798d3ddaf441f8ae96819abea31fad7b4a631b12d2983fef378be
-  data.tar.gz: acc5550981b27d38cb986e0b934d4dad992ea7f3c462d9dd1f6c202a304e4cd13bb8e202db070f66f458e3263606601943d1f078d9967125c89b068d82554126
+  metadata.gz: dd7d9785f60d8c025ec461d6ab006f714f7f9abfd83ebffcfcf261c17a386903a6d9a42eb57708fd23b23662060190be1b5fd3089f03c10e0459a5106bcf4268
+  data.tar.gz: 1a554847284740a40cd231681572c30a0ae32c441a3da4de9feafdc36ea9057ff66ec93281be4108e4e1e7683c8f550a4bdf4b63153292f295295b29d0007a3f

data/app/models/zaikio/access_token.rb

@@ -26,17 +26,17 @@ module Zaikio
     end
 
     # Scopes
-    scope :valid, lambda {
-      where("expires_at > :now", now: Time.current)
+    scope :valid, lambda { |valid_until = Time.current|
+      where("expires_at > :valid_until", valid_until: valid_until)
         .where.not(id: Zaikio::JWTAuth.revoked_token_ids)
     }
     scope :with_invalid_refresh_token, lambda {
       where("created_at <= ?", Time.current - Zaikio::AccessToken.refresh_token_valid_for)
     }
-    scope :valid_refresh, lambda {
-      where("expires_at <= :now AND created_at > :created_at_max",
-            now: Time.current,
-            created_at_max: Time.current - refresh_token_valid_for)
+    scope :valid_refresh, lambda { |valid_until = Time.current|
+      where("expires_at <= :valid_until AND created_at > :created_at_max",
+            valid_until: valid_until,
+            created_at_max: valid_until - refresh_token_valid_for)
         .where.not(refresh_token: nil)
         .where.not(id: Zaikio::JWTAuth.revoked_token_ids)
     }
@@ -44,9 +44,10 @@ module Zaikio
       where(bearer_type: bearer_type, bearer_id: bearer_id)
         .where("requested_scopes @> ARRAY[?]::varchar[]", requested_scopes)
     }
-    scope :usable, lambda { |options|
-      by_bearer(**options).valid.or(by_bearer(**options).valid_refresh)
-                          .order(expires_at: :desc)
+    scope :usable, lambda { |valid_until: Time.current, **options|
+      by_bearer(**options).valid(valid_until).or(
+        by_bearer(**options).valid_refresh
+      ).order(expires_at: :desc)
     }
 
     def expired?
@@ -72,6 +73,8 @@ module Zaikio
     end
 
     def refresh!
+      return unless refresh_token?
+
       Zaikio::OAuthClient.with_oauth_scheme(:basic_auth) do
         refreshed_token = OAuth2::AccessToken.from_hash(
           Zaikio::OAuthClient.for(audience),
@@ -80,16 +83,12 @@ module Zaikio
 
         destroy
 
-        self.class.build_from_access_token(
-          refreshed_token,
-          requested_scopes: requested_scopes
-        ).tap(&:save!)
+        self.class.build_from_access_token(refreshed_token, requested_scopes: requested_scopes).tap(&:save!)
       end
     rescue OAuth2::Error => e
       raise unless e.code == "invalid_grant"
 
       destroy
-
       nil
     end
   end

data/lib/zaikio/oauth_client.rb

@@ -69,9 +69,10 @@ module Zaikio
         token = find_usable_access_token(client_name: client_config.client_name,
                                          bearer_type: bearer_type,
                                          bearer_id: bearer_id,
-                                         requested_scopes: scopes)
+                                         requested_scopes: scopes,
+                                         valid_for: valid_for)
 
-        token = token.refresh! if token && (token.expired? || token.expires_at < valid_for.from_now)
+        token = token.refresh! if token&.expired?
 
         token ||= fetch_new_token(client_config: client_config,
                                   bearer_type: bearer_type,
@@ -82,7 +83,7 @@ module Zaikio
 
       # Finds the best usable access token. Note that this token may have expired and
       # would require refreshing.
-      def find_usable_access_token(client_name:, bearer_type:, bearer_id:, requested_scopes:)  # rubocop:disable Metrics/MethodLength
+      def find_usable_access_token(client_name:, bearer_type:, bearer_id:, requested_scopes:, valid_for: 30.seconds)  # rubocop:disable Metrics/MethodLength
         configuration.logger.debug "Try to fetch token for client_name: #{client_name}, "\
                                    "bearer #{bearer_type}/#{bearer_id}, requested_scopes: #{requested_scopes}"
 
@@ -92,7 +93,8 @@ module Zaikio
             .usable(
               bearer_type: bearer_type,
               bearer_id: bearer_id,
-              requested_scopes: requested_scopes
+              requested_scopes: requested_scopes,
+              valid_until: valid_for.from_now
             )
             .first
         }

data/lib/zaikio/oauth_client/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module OAuthClient
-    VERSION = "0.15.0".freeze
+    VERSION = "0.15.1.beta1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-oauth_client
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1.beta1
 platform: ruby
 authors:
 - Zaikio GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-13 00:00:00.000000000 Z
+date: 2021-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -183,9 +183,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.3
 signing_key: