zaikio-oauth_client 0.15.1 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '058e2e4770f5b40f128b95bd51c4b873f9beb81f4e646aad5b68d26db88929ba'
-  data.tar.gz: 5992b68e2ecf23a11b1fb17d018cf7364310c12dd528f927c00d116898fe28aa
+  metadata.gz: 605b297bfe708d26eb51ed1060bf243fc3060fd27df8f4ec481dcf94a471fcc2
+  data.tar.gz: 839bb62b7d00b272978fa3f225bd7416a7c12cf7508e4ab2242183fcb7c8d801
 SHA512:
-  metadata.gz: f20de72870d6fa6365c6a1f74e9e65c6509cb7930f5ad2af1e77cabc8e8d3c1b87a71a1785703eb6352523476e47939f8894bf7628679cdd059cc4a421327028
-  data.tar.gz: 81e593760b1664a5d15694544017cb9ad20ba9390c3d7b57d49c7bc2b18a2604d018c6f4bfa202a5ba16828116e5521102b0ae246fb30e4e18e8f6fcf07fb704
+  metadata.gz: 2c7e04798b1ca7338e30005794e2d804a90633816323f678bd2f9a7bcb7f9b8f368e3e68ac38490c44bf48761db785169f41e8f9cf22ce7cdee7b40b82e5ee05
+  data.tar.gz: 189afa394a1a0739d5a4ed60ed4fc667ee8aed698329fb7eb87cc6785bfc88ee610028d9b5fb4ac8ba389c399104e8956c8656ce0a4bbb1132b039f6b1612446

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

@@ -5,6 +5,10 @@ module Zaikio
 
       private
 
+      def new_path(options = {})
+        zaikio_oauth_client.new_connection_path(options)
+      end
+
       def approve_url(client_name = nil)
         zaikio_oauth_client.approve_connection_url(client_name)
       end

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

@@ -20,7 +20,7 @@ module Zaikio
           redirect_uri: approve_url(opts.delete(:client_name)),
           scope: subscription_scope,
           **opts
-        )
+        ), allow_other_host: true
       end
     end
   end

data/app/models/zaikio/access_token.rb

@@ -63,7 +63,7 @@ module Zaikio
     end
 
     def bearer_klass
-      return unless Zaikio.const_defined?("Hub::Models", false)
+      return unless Zaikio.const_defined?("Hub::Models", false) # rubocop:disable Performance/StringIdentifierArgument
 
       if Zaikio::Hub::Models.configuration.respond_to?(:"#{bearer_type.underscore}_class_name")
         Zaikio::Hub::Models.configuration.public_send(:"#{bearer_type.underscore}_class_name").constantize

data/lib/zaikio/oauth_client/authenticatable.rb

@@ -4,7 +4,8 @@ module Zaikio
       extend ActiveSupport::Concern
 
       def new
-        opts = params.permit(:client_name, :show_signup, :prompt, :force_login, :state, :lang)
+        opts = params.permit(:client_name, :show_signup, :prompt, :prompt_email_confirmation,
+                             :force_login, :state, :lang)
         opts[:lang] ||= I18n.locale if defined?(I18n)
         client_name = opts.delete(:client_name)
         opts[:state] ||= session[:state] = SecureRandom.urlsafe_base64(32)
@@ -13,10 +14,10 @@ module Zaikio
           redirect_uri: approve_url(client_name),
           scope: oauth_scope,
           **opts
-        )
+        ), allow_other_host: true
       end
 
-      def approve  # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
+      def approve  # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         if params[:error].present?
           redirect_to send(
             respond_to?(:error_path_for) ? :error_path_for : :default_error_path_for,
@@ -36,6 +37,7 @@ module Zaikio
 
         origin = session[:origin]
         session.delete(:origin)
+        session.delete(:oauth_attempts)
 
         session[:zaikio_access_token_id] = access_token.id unless access_token.organization?
 
@@ -43,6 +45,13 @@ module Zaikio
           respond_to?(:after_approve_path_for) ? :after_approve_path_for : :default_after_approve_path_for,
           access_token, origin
         )
+      rescue OAuth2::Error => e
+        raise e unless e.code == "invalid_grant" || e.code == "invalid_request"
+        raise e if session[:oauth_attempts].to_i >= 3
+
+        session[:oauth_attempts] = session[:oauth_attempts].to_i + 1
+
+        redirect_to new_path(client_name: params[:client_name])
       end
 
       def destroy
@@ -58,6 +67,10 @@ module Zaikio
 
       private
 
+      def new_path(options = {})
+        zaikio_oauth_client.new_session_path(options)
+      end
+
       def approve_url(client_name = nil)
         zaikio_oauth_client.approve_session_url(client_name)
       end

data/lib/zaikio/oauth_client/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module OAuthClient
-    VERSION = "0.15.1".freeze
+    VERSION = "0.17.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-oauth_client
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.17.2
 platform: ruby
 authors:
 - Zaikio GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack