zaikio-oauth_client 0.19.3 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58d2e1d10678b7eddb4afc7931c94e04299b63027c3b02c5773e03bf74b29b7d
-  data.tar.gz: 44459fbc11ec98ccdd1f88819416f50b704a1d9f1a32a7a24d17a92b863563e9
+  metadata.gz: 24be71a3c75d9524e109cab652442d2a229ca14281a0fc3604256382eb01cf60
+  data.tar.gz: 3e289f86bbaa43b2d6dadfd6d239aef561e39376500cde3f560f9a5838dec851
 SHA512:
-  metadata.gz: c4dd805f5c186d1d502afd9788b77ed7f9178672c841b03d7f9c5c97f81d5dc3243a255f1087f1e49bc312a024b4758df7599e871efcd650e34097527c927e51
-  data.tar.gz: 025cfe46f4cdc9cb9138b814d86a82f3b7590a6fba2e1261bbe420ba6d16a43392eb88306500a02a2fa5cc3047a7970a24e7c6e28fc6bf91dcc6833554d5165a
+  metadata.gz: 4caa7219b4ad019bd813dccc7939f8558122169fd8196edf6deedc720ae6554aba1f651ac69e5dc689ed7b6dcada682cd7bc0bb92353e49722116b179c54132c
+  data.tar.gz: 5a3501038b5471dd8018a71f4399892ecdc80c1fba4d30e3a6d332bfd624381463994ecef6de5575de7fff0c33a7a445add000c1b12155516e715cde9c133547

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'
 ```

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

@@ -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/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module OAuthClient
-    VERSION = "0.19.3".freeze
+    VERSION = "0.21.0".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.19.3
+  version: 0.21.0
 platform: ruby
 authors:
 - Zaikio GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-03 00:00:00.000000000 Z
+date: 2022-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack