zaikio-oauth_client 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e956bf122053d559c2dd918f4b90a23c10559bc5578442bc26dbe1530a3396b
-  data.tar.gz: 0d594a45ddf589b03d9e43817885377d963934345fa6cb936b367fe64761e08a
+  metadata.gz: 84383fd7b0b03f23cc671489124b6b8f90613cad840bd668080ea04c59a4ff54
+  data.tar.gz: e7b8f6759983ffad763780b392be0500888affd117c1ccfb9f87449ed1b1a9de
 SHA512:
-  metadata.gz: 38355e0660ea6b2fd2c1b13a23a75626b5d4ae4efd3e64eb21396893e4a2ffc39c34824f373e994f596e4064455a8ad596b63b5e595c16afa844ffcddc90e56a
-  data.tar.gz: 1cb76ea316682fc4a4394d27ad252cc67496e95fa9034ba7054ad6e9b472a211f78cb1c839c9f4c745b143804c04aef5c85616c4f6f344f378e19bf12420db53
+  metadata.gz: caae8092591d3d47a03ddf598d8da76d474cc45ff01e5799f140d8dbad3ca171294217ceddc1e0ffbc364f8efd3153c5222e51711afbd8f17d39daf1f01f409b
+  data.tar.gz: 2759d26c2826f6cf06aba7c7673eaf2ee7cf30914ca4c965eefe99409efb575916c4fe0cfdde315ed64f95e20720b83712ae2d5bb3a9820dfedb908a9e38e094

data/app/controllers/zaikio/oauth_client/subscriptions_controller.rb

@@ -2,15 +2,21 @@ module Zaikio
   module OAuthClient
     class SubscriptionsController < ConnectionsController
       def new
-        opts = params.permit(:client_name, :state, :plan)
-        client_name = opts.delete(:client_name)
-        plan = opts.delete(:plan)
+        opts = params.permit(:client_name, :state, :plan, :organization_id)
+
+        plan            = opts.delete(:plan)
+        organization_id = opts.delete(:organization_id)
+
+        subscription_scope = if organization_id.present?
+                               "Org/#{organization_id}.subscription_create"
+                             else
+                               "Org.subscription_create"
+                             end
 
-        subscription_scope = "Org.subscription_create"
         subscription_scope << ".#{plan}" if plan.present?
 
         redirect_to oauth_client.auth_code.authorize_url(
-          redirect_uri: approve_url(client_name),
+          redirect_uri: approve_url(opts.delete(:client_name)),
           scope: subscription_scope,
           **opts
         )

data/lib/zaikio/oauth_client.rb

@@ -82,14 +82,25 @@ 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:)
-        Zaikio::AccessToken
-          .where(audience: client_name)
-          .usable(
-            bearer_type: bearer_type,
-            bearer_id: bearer_id,
-            requested_scopes: requested_scopes
-          )
-          .first
+        configuration.logger.debug "Try to fetch token for client_name: #{client_name}, "\
+          "bearer #{bearer_type}/#{bearer_id}, requested_scopes: #{requested_scopes}"
+
+        fetch_access_token = lambda {
+          Zaikio::AccessToken
+            .where(audience: client_name)
+            .usable(
+              bearer_type: bearer_type,
+              bearer_id: bearer_id,
+              requested_scopes: requested_scopes
+            )
+            .first
+        }
+
+        if configuration.logger.respond_to?(:silence)
+          configuration.logger.silence { fetch_access_token.call }
+        else
+          fetch_access_token.call
+        end
       end
 
       def fetch_new_token(client_config:, bearer_type:, bearer_id:, scopes:)

data/lib/zaikio/oauth_client/configuration.rb

@@ -13,7 +13,6 @@ module Zaikio
       }.freeze
 
       attr_accessor :host
-      attr_writer :logger
       attr_reader :client_configurations, :environment, :around_auth_block,
                   :sessions_controller_name, :connections_controller_name, :subscriptions_controller_name
 
@@ -23,10 +22,16 @@ module Zaikio
         @sessions_controller_name = "sessions"
         @connections_controller_name = "connections"
         @subscriptions_controller_name = "subscriptions"
+        Zaikio::AccessToken.logger = logger
       end
 
       def logger
-        @logger ||= Logger.new($stdout)
+        @logger ||= ActiveSupport::Logger.new($stdout)
+      end
+
+      def logger=(logger)
+        @logger = logger
+        Zaikio::AccessToken.logger = @logger
       end
 
       def register_client(name)

data/lib/zaikio/oauth_client/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module OAuthClient
-    VERSION = "0.9.0".freeze
+    VERSION = "0.10.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-oauth_client
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Zaikio GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack