zaikio-oauth_client 0.19.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd5390d254c886ad8c082def82463c6653bdb91b4f08433bf138b872e9fb54ff
-  data.tar.gz: b9bca34becf29861bd4e5f57d88492a9dfb7aecb8ad6ed2306c2007ee75740e5
+  metadata.gz: 821f98a1795103278c91ca8ab8a1e22696eaafa05359be7cfeca5511efa9f125
+  data.tar.gz: d92c6e1f033ae45682192875f95a4021ce47489d5ec97fd53d4d8d725ad8344c
 SHA512:
-  metadata.gz: 61f6e1657014daa3b0cc5efb2e5a0ac97c0d81708d68ad7a98b030e24ce5fd2e3918c2613371dc7f9ed64f5546dad84e8f189e996fe1db113a5a295137cba74c
-  data.tar.gz: 38e9e845d6bae276a28ef32d6fab275ae0539598c1f7c85680ba87554e3ac0f5619261cb9346435b787c06526d0a87ca2ddfbb502a299027d1b81ea75bc424af
+  metadata.gz: 6932c3a87827582e28c55540af6db76066e14fc61152ad4e50245ed916792a71545ebd40d9882c62ca6713bb40e3e7bfe4201c22fad5d364b9b8e1d61bcda640
+  data.tar.gz: 203fda493a173f5619eb32e536624848fcbd39623d35db5243c79bdbdfb3664b109b72bde6a1ee069ff1446a07931784a620588b641c9c8996aafee2d32441f7

data/lib/zaikio/oauth_client/authenticatable.rb

@@ -1,11 +1,13 @@
 module Zaikio
   module OAuthClient
-    module Authenticatable
+    module Authenticatable # rubocop:disable Metrics/ModuleLength
       extend ActiveSupport::Concern
 
       def new
         opts = params.permit(:client_name, :show_signup, :prompt, :prompt_email_confirmation,
-                             :force_login, :state, :lang)
+                             :force_login, :state, :lang,
+                             person: %i[first_name name email],
+                             organization: [:name, :country_code, { kinds: [] }])
         opts[:lang] ||= I18n.locale if defined?(I18n)
         client_name = opts.delete(:client_name)
         opts[:state] ||= session[:state] = SecureRandom.urlsafe_base64(32)

data/lib/zaikio/oauth_client/test_helper.rb

@@ -3,7 +3,7 @@ module Zaikio
     module TestHelper
       extend ActiveSupport::Concern
 
-      VirtualAccessToken = Struct.new(:bearer_id, :bearer_type, :audience, :expired?, keyword_init: true)
+      VirtualAccessToken = Struct.new(:id, :bearer_id, :bearer_type, :audience, :expired?, keyword_init: true)
 
       class << self
         def find_active_access_token(id)
@@ -12,6 +12,7 @@ module Zaikio
           _, audience, person_id = id.split(":")
 
           VirtualAccessToken.new(
+            id: id,
             bearer_id: person_id,
             audience: audience,
             bearer_type: "Person",

data/lib/zaikio/oauth_client/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module OAuthClient
-    VERSION = "0.19.1".freeze
+    VERSION = "0.20.0".freeze
   end
 end

data/lib/zaikio/oauth_client.rb

@@ -80,7 +80,7 @@ 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
 
         if Rails.env.test?
@@ -88,7 +88,9 @@ module Zaikio
           return access_token if access_token
         end
 
-        access_token = Zaikio::AccessToken.find_by(id: id)
+        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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-oauth_client
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
 platform: ruby
 authors:
 - Zaikio GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-03 00:00:00.000000000 Z
+date: 2022-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack