zaikio-oauth_client 0.19.0 → 0.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d82ba1e01192f3e9fac8f47bc5ded67fb2b869f724fcdcd26ec42718c4ca53f5
-  data.tar.gz: 48a24101ed54396c68d96077c0eaf7dc16fbd317ecbae092773ae9f29a31b9bd
+  metadata.gz: 58d2e1d10678b7eddb4afc7931c94e04299b63027c3b02c5773e03bf74b29b7d
+  data.tar.gz: 44459fbc11ec98ccdd1f88819416f50b704a1d9f1a32a7a24d17a92b863563e9
 SHA512:
-  metadata.gz: 46884a09302f56b53e64e8ee2cd1172c5792a1ecf82ff6e0a8b054d979f86f3b63449a4bd79633c3f95f076e11e0f3bc5669b26d8988643232c784c92f447d5b
-  data.tar.gz: f1e5992edef1cda3bd6b68f2089c07201264d2b1e64a4713ae0d6ec84af5e708172b9b53ceb76d38245645ec41ebf79f4da7d63a40e17a6441e4d7171f9e47e8
+  metadata.gz: c4dd805f5c186d1d502afd9788b77ed7f9178672c841b03d7f9c5c97f81d5dc3243a255f1087f1e49bc312a024b4758df7599e871efcd650e34097527c927e51
+  data.tar.gz: 025cfe46f4cdc9cb9138b814d86a82f3b7590a6fba2e1261bbe420ba6d16a43392eb88306500a02a2fa5cc3047a7970a24e7c6e28fc6bf91dcc6833554d5165a

data/lib/zaikio/oauth_client/test_helper.rb

@@ -3,6 +3,24 @@ module Zaikio
     module TestHelper
       extend ActiveSupport::Concern
 
+      VirtualAccessToken = Struct.new(:id, :bearer_id, :bearer_type, :audience, :expired?, keyword_init: true)
+
+      class << self
+        def find_active_access_token(id)
+          return unless id.to_s.starts_with?("AT:")
+
+          _, audience, person_id = id.split(":")
+
+          VirtualAccessToken.new(
+            id: id,
+            bearer_id: person_id,
+            audience: audience,
+            bearer_type: "Person",
+            expired?: false
+          )
+        end
+      end
+
       class TestSessionController < ActionController::Base # rubocop:disable Rails/ApplicationController
         def show
           if session[params[:key]].nil?
@@ -43,7 +61,15 @@ module Zaikio
         get "/zaikio/oauth_client/test_helper/session", params: { id: value, key: key }
       end
 
-      def logged_in_as(person)
+      def logged_in_as(person, access_token: nil, client_name: nil)
+        client_name ||= Zaikio::OAuthClient.client_name ||
+                        Zaikio::OAuthClient.configuration.all_client_names.first
+        set_session(
+          :zaikio_access_token_id,
+          access_token&.id || "AT:#{client_name}:#{person.id}"
+        )
+
+        # Deprecated please use zaikio_access_token_id
         set_session(:zaikio_person_id, person.id)
       end
     end

data/lib/zaikio/oauth_client/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module OAuthClient
-    VERSION = "0.19.0".freeze
+    VERSION = "0.19.3".freeze
   end
 end

data/lib/zaikio/oauth_client.rb

@@ -80,10 +80,17 @@ module Zaikio
 
       # This method can be used to find an active access token by id.
       # It might refresh the access token to get an active one.
-      def find_active_access_token(id)
+      def find_active_access_token(id, valid_for: 30.seconds)
         return unless id
 
-        access_token = Zaikio::AccessToken.find_by(id: id)
+        if Rails.env.test?
+          access_token = TestHelper.find_active_access_token(id)
+          return access_token if access_token
+        end
+
+        access_token = Zaikio::AccessToken.valid(valid_for.from_now).or(
+          Zaikio::AccessToken.valid_refresh(valid_for.from_now)
+        ).find_by(id: id)
         access_token = access_token.refresh! if access_token&.expired?
 
         access_token

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-oauth_client
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.3
 platform: ruby
 authors:
 - Zaikio GmbH