zaikio-oauth_client 0.15.1.beta1 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5695820de8df28288feb3794016c0288e2dce2d7890a8c3bd9b11685fc39c32f
-  data.tar.gz: 2616666c8df490d153339d6953f6066a46f00669dfd037dcc2faf62873b44e9a
+  metadata.gz: 237bdb03b2ab2870ef2c0b9a92c9dac64fb2c67df2bba8e9234831eb14954f42
+  data.tar.gz: ae977109316a023585e008e669958775534eef2ecea309ede9b373d44f368fd4
 SHA512:
-  metadata.gz: dd7d9785f60d8c025ec461d6ab006f714f7f9abfd83ebffcfcf261c17a386903a6d9a42eb57708fd23b23662060190be1b5fd3089f03c10e0459a5106bcf4268
-  data.tar.gz: 1a554847284740a40cd231681572c30a0ae32c441a3da4de9feafdc36ea9057ff66ec93281be4108e4e1e7683c8f550a4bdf4b63153292f295295b29d0007a3f
+  metadata.gz: 44945aba1999049638cca10555d4dc192e191fa1fdf81965fa43fe31d1ab01c5e6054769a94efe0e862feee171a24b6d9a50853395628e497e30fb4629295ddf
+  data.tar.gz: b97fe832a40614ef14da36d12492e368c86460b0dde1867f411d0360d581fb3fe60256b3efea8d1653d744a1598908d9636d1a97c7043a59de56f6b87deb23ee

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)
 
       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.beta1".freeze
+    VERSION = "0.17.1".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.beta1
+  version: 0.17.1
 platform: ruby
 authors:
 - Zaikio GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -183,11 +183,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Zaikio Platform Connectivity