zaikio-oauth_client 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35a2d3f9ebe6c1f7eadc74624d9f9f1f0f8cd34aefb6ce9fff5cccb7b5fd5bd9
-  data.tar.gz: 075dde605bc8835dc73cdfab45cf16181ab79af764105ab37a61d520d7bb2692
+  metadata.gz: 0ff245bb6a309f304b580e81ad30acc9a91916919697b2df717fdb884d3e4a25
+  data.tar.gz: c8db756a72615d02de42a58804e23b597f095e709506a6055008a8682cc72bbd
 SHA512:
-  metadata.gz: 6ecc782ef623fee48306b46e348d06225e37eaae4f02444072a79f1477ca73394a5dce80628f16ccd374bb589cd588c249312981aec17d71349660ababe72428
-  data.tar.gz: 4327a4b1f59e38fd290654485d3ab535ccb2acc9e4cc395d117025dc6865df8d2e49f1a7e9f5a29458270df26bed65d14835229199047ed218c90d4b3529fc02
+  metadata.gz: 45d03fc98118ae5c283139628d0b8b9eaf1dd9a5ddcf22a02f1a57d8052365190907627831992976d8607329e404a021516403000b54ee072fbd9bc155bb9a89
+  data.tar.gz: 6ecae0a7e65289cad9c6691dcdaf3179694db40df26cedefe93cecaf7b16b999617f7931cbbc112116744e418b333c787b4b5e426baf6f6db0591ff6a399e6e7

data/README.md

@@ -36,32 +36,34 @@ mount Zaikio::OAuthClient::Engine => "/zaikio"
 
 ```rb
 # config/initializers/zaikio_oauth_client.rb
-Zaikio::OAuthClient.configure do |config|
-  config.environment = :sandbox
-
-  config.register_client :warehouse do |warehouse|
-    warehouse.client_id       = "52022d7a-7ba2-41ed-8890-97d88e6472f6"
-    warehouse.client_secret   = "ShiKTnHqEf3M8nyHQPyZgbz7"
-    warehouse.default_scopes  = %w[directory.person.r]
-
-    warehouse.register_organization_connection do |org|
-      org.default_scopes = %w[directory.organization.r]
+Rails.application.reloader.to_prepare do
+  Zaikio::OAuthClient.configure do |config|
+    config.environment = :sandbox
+
+    config.register_client :warehouse do |warehouse|
+      warehouse.client_id       = "52022d7a-7ba2-41ed-8890-97d88e6472f6"
+      warehouse.client_secret   = "ShiKTnHqEf3M8nyHQPyZgbz7"
+      warehouse.default_scopes  = %w[directory.person.r]
+
+      warehouse.register_organization_connection do |org|
+        org.default_scopes = %w[directory.organization.r]
+      end
     end
-  end
 
-  config.register_client :warehouse_goods_call_of do |warehouse_goods_call_of|
-    warehouse_goods_call_of.client_id       = "12345-7ba2-41ed-8890-97d88e6472f6"
-    warehouse_goods_call_of.client_secret   = "secret"
-    warehouse_goods_call_of.default_scopes  = %w[directory.person.r]
+    config.register_client :warehouse_goods_call_of do |warehouse_goods_call_of|
+      warehouse_goods_call_of.client_id       = "12345-7ba2-41ed-8890-97d88e6472f6"
+      warehouse_goods_call_of.client_secret   = "secret"
+      warehouse_goods_call_of.default_scopes  = %w[directory.person.r]
 
-    warehouse_goods_call_of.register_organization_connection do |org|
-      org.default_scopes = %w[directory.organization.r]
+      warehouse_goods_call_of.register_organization_connection do |org|
+        org.default_scopes = %w[directory.organization.r]
+      end
     end
-  end
 
-  config.around_auth do |access_token, block|
-    Zaikio::Hub.with_token(access_token.token) do
-      block.call(access_token)
+    config.around_auth do |access_token, block|
+      Zaikio::Hub.with_token(access_token.token) do
+        block.call(access_token)
+      end
     end
   end
 end

data/Rakefile

@@ -35,9 +35,7 @@ require 'rubocop/rake_task'
 
 namespace :test do
   desc 'Runs RuboCop on specified directories'
-  RuboCop::RakeTask.new(:rubocop) do |task|
-    task.fail_on_error = false
-  end
+  RuboCop::RakeTask.new(:rubocop)
 end
 
 Rake::Task[:test].enhance ['test:rubocop']

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

@@ -3,7 +3,6 @@ module Zaikio
     class SubscriptionsController < ConnectionsController
       def new
         opts = params.permit(:client_name, :state, :plan, :organization_id)
-        opts[:redirect_with_error] = 1
         opts[:state] ||= session[:state] = SecureRandom.urlsafe_base64(32)
 
         plan            = opts.delete(:plan)

data/app/models/zaikio/access_token.rb

@@ -5,7 +5,7 @@ module Zaikio
   class AccessToken < ApplicationRecord
     self.table_name = "zaikio_access_tokens"
 
-    def self.build_from_access_token(access_token, requested_scopes: nil) # rubocop:disable Metrics/AbcSize
+    def self.build_from_access_token(access_token, requested_scopes: nil)
       payload = JWT.decode(access_token.token, nil, false).first rescue {} # rubocop:disable Style/RescueModifier
       scopes = access_token.params["scope"].split(",")
       new(
@@ -37,7 +37,7 @@ module Zaikio
       where("expires_at <= :now AND created_at > :created_at_max",
             now: Time.current,
             created_at_max: Time.current - refresh_token_valid_for)
-        .where("refresh_token IS NOT NULL")
+        .where.not(refresh_token: nil)
         .where.not(id: Zaikio::JWTAuth.revoked_token_ids)
     }
     scope :by_bearer, lambda { |bearer_id:, requested_scopes: [], bearer_type: "Person"|

data/lib/zaikio/oauth_client.rb

@@ -49,7 +49,7 @@ module Zaikio
                          get_access_token(**options_or_access_token)
                        end
 
-        return unless block_given?
+        return unless block
 
         if configuration.around_auth_block
           configuration.around_auth_block.call(access_token, block)
@@ -82,7 +82,7 @@ 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:)
+      def find_usable_access_token(client_name:, bearer_type:, bearer_id:, requested_scopes:)  # rubocop:disable Metrics/MethodLength
         configuration.logger.debug "Try to fetch token for client_name: #{client_name}, "\
           "bearer #{bearer_type}/#{bearer_id}, requested_scopes: #{requested_scopes}"
 
@@ -117,9 +117,9 @@ module Zaikio
 
       def get_plain_scopes(scopes)
         regex = /^((Org|Per)\.)?(.*)$/
-        scopes.map do |scope|
+        scopes.filter_map do |scope|
           (regex.match(scope) || [])[3]
-        end.compact
+        end
       end
 
       private

data/lib/zaikio/oauth_client/authenticatable.rb

@@ -4,8 +4,7 @@ module Zaikio
       extend ActiveSupport::Concern
 
       def new
-        opts = params.permit(:client_name, :show_signup, :force_login, :state, :lang)
-        opts[:redirect_with_error] = 1
+        opts = params.permit(:client_name, :show_signup, :prompt, :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)
@@ -17,7 +16,7 @@ module Zaikio
         )
       end
 
-      def approve
+      def approve  # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
         if params[:error].present?
           redirect_to send(
             respond_to?(:error_path_for) ? :error_path_for : :default_error_path_for,

data/lib/zaikio/oauth_client/client_configuration.rb

@@ -20,7 +20,7 @@ module Zaikio
           client_secret,
           authorize_url: "oauth/authorize",
           token_url: "oauth/access_token",
-          connection_opts: { headers: { "Accept": "application/json" } },
+          connection_opts: { headers: { Accept: "application/json" } },
           site: Zaikio::OAuthClient.configuration.host
         )
 

data/lib/zaikio/oauth_client/test_helper.rb

@@ -3,7 +3,7 @@ module Zaikio
     module TestHelper
       extend ActiveSupport::Concern
 
-      class TestSessionController < ActionController::Base
+      class TestSessionController < ActionController::Base # rubocop:disable Rails/ApplicationController
         def show
           if session[params[:key]].nil?
             head :no_content

data/lib/zaikio/oauth_client/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module OAuthClient
-    VERSION = "0.13.0".freeze
+    VERSION = "0.14.0".freeze
   end
 end

metadata

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