zaikio-oauth_client 0.20.0 → 0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 821f98a1795103278c91ca8ab8a1e22696eaafa05359be7cfeca5511efa9f125
-  data.tar.gz: d92c6e1f033ae45682192875f95a4021ce47489d5ec97fd53d4d8d725ad8344c
+  metadata.gz: 1e87deb46aa5f12ce0383be80478beeada52d8281dbc299570b6c0d7cd321068
+  data.tar.gz: 27dff67fdf8d1f02b12a28b490c1ee0b59b8832e20550608c2147d83920a9688
 SHA512:
-  metadata.gz: 6932c3a87827582e28c55540af6db76066e14fc61152ad4e50245ed916792a71545ebd40d9882c62ca6713bb40e3e7bfe4201c22fad5d364b9b8e1d61bcda640
-  data.tar.gz: 203fda493a173f5619eb32e536624848fcbd39623d35db5243c79bdbdfb3664b109b72bde6a1ee069ff1446a07931784a620588b641c9c8996aafee2d32441f7
+  metadata.gz: 25045bb111f6373f883601e6c93fc05527630f9f5b5df09c2c9f937f41c7b789a26ffd3fcba803466be7cf9d1e9e58bd26c23992175eb22fcb0a98910a7ea0eb
+  data.tar.gz: 34bc3884461e5650d9a168d9a73d521040a349b6a99ea0e35d988e14629b7a94d642622928425128421c17b685291d6cd6aac9ce369b84471e637f90e7f20d0a

data/README.md

@@ -95,7 +95,7 @@ Then run `bundle install`.
 Configure sidekiq scheduler in `config/sidekiq.yml`:
 ```yaml
 :schedule:
-  cleanup_acces_tokens_job:
+  cleanup_access_tokens_job:
     cron: '0 3 * * *'               # This will delete all expired tokens every day at 3am.
     class: 'Zaikio::CleanupAccessTokensJob'
 ```
@@ -162,7 +162,7 @@ end
 
 You can then use `Current.user` anywhere.
 
-For **logout** use: `zaikio_oauth_client.session_path, method: :delete` or build your own controller for deleting the cookie.
+For **logout** use: `zaikio_oauth_client.session_path, method: :delete` or build your own controller for deleting the cookie. If you do build your own controller, please be aware that it is possible for the access token to be nil, and you should handle this accordingly.
 
 #### Multiple clients
 

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

@@ -1,23 +1,27 @@
 module Zaikio
   module OAuthClient
     class SubscriptionsController < ConnectionsController
-      def new
-        opts = params.permit(:client_name, :state, :plan, :organization_id)
+      def new  # rubocop:disable Metrics/MethodLength
+        opts = params.permit(:client_name, :state, :plan, :organization_id, :app_name, :redirect_uri)
         opts[:state] ||= session[:state] = SecureRandom.urlsafe_base64(32)
 
         plan            = opts.delete(:plan)
         organization_id = opts.delete(:organization_id)
+        app_name        = opts.delete(:app_name)
+        redirect_uri    = opts.delete(:redirect_uri)
 
-        subscription_scope = if organization_id.present?
-                               "Org/#{organization_id}.subscription_create"
+        scope = "Org.subscription_create"
+        scope_with_org_id = "Org/#{organization_id}.subscription_create"
+        subscription_scope = if app_name.present?
+                               organization_id.present? ? "#{scope_with_org_id}_#{app_name}" : "#{scope}_#{app_name}"
                              else
-                               "Org.subscription_create"
+                               organization_id.present? ? scope_with_org_id : scope
                              end
 
         subscription_scope << ".#{plan}" if plan.present?
 
         redirect_to oauth_client.auth_code.authorize_url(
-          redirect_uri: approve_url(opts.delete(:client_name)),
+          redirect_uri: redirect_uri || approve_url(opts.delete(:client_name)),
           scope: subscription_scope,
           **opts
         ), allow_other_host: true

data/lib/zaikio/oauth_client/authenticatable.rb

@@ -66,7 +66,7 @@ module Zaikio
 
         redirect_to send(
           respond_to?(:after_destroy_path_for) ? :after_destroy_path_for : :default_after_destroy_path_for,
-          access_token.id
+          access_token&.id
         )
       end
 

data/lib/zaikio/oauth_client/version.rb

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

data/lib/zaikio/oauth_client.rb

@@ -8,8 +8,6 @@ require "zaikio/oauth_client/authenticatable"
 module Zaikio
   module OAuthClient # rubocop:disable Metrics/ModuleLength
     class << self
-      attr_reader :client_name
-
       def configure
         @configuration ||= Configuration.new
         yield(configuration)
@@ -19,6 +17,14 @@ module Zaikio
         @configuration ||= Configuration.new
       end
 
+      def client_name
+        Thread.current[:zaikio_oauth_client_name]
+      end
+
+      def client_name=(new_value)
+        Thread.current[:zaikio_oauth_client_name] = new_value
+      end
+
       def for(client_name = nil)
         client_config_for(client_name).oauth_client
       end
@@ -34,12 +40,14 @@ module Zaikio
         @oauth_scheme = :request_body
       end
 
-      def with_client(client_name)
-        original_client_name = @client_name || nil
-        @client_name = client_name
+      def with_client(new_client_name)
+        original_client_name = client_name
+
+        self.client_name = new_client_name
+
         yield
       ensure
-        @client_name = original_client_name
+        self.client_name = original_client_name
       end
 
       def with_auth(options_or_access_token, &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-oauth_client
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.1
 platform: ruby
 authors:
 - Zaikio GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack