wcc-auth 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bc56638e90e9493a8597d939bf7e900144778c1
-  data.tar.gz: 22521e91a15775f883d3b62d646022f6db62b585
+  metadata.gz: 30cefb293a49a140ccb55259ec4b21847846a38e
+  data.tar.gz: 2afe1e95678a63aa1691633148f6f365ea928e47
 SHA512:
-  metadata.gz: 94534a55209d7f2878cefea1304ee72c120f393bdb4b369dec603cf2772c134fdd07737081aca520fc9fdc4ffe9aee0e5b4e36cd9f011409ab0379a6b89cd3ad
-  data.tar.gz: 938bde42ae68c3d0cc56c3e626124cc2c9f54be8e4c92887d66a23f96f72d79e56d561d5b546438908a3101bdf65e03c8c247d363a74430e562710aa5bbf26af
+  metadata.gz: ed9d8da4a6e92b04975ec4a77c7a0c248c75648a980c18ffde275b33bc97cee60fca4ceb471910c9f2c73ee40f456b8f3a0a2e602557d73d755b09d4a06af3e6
+  data.tar.gz: 820d51c3779ea249bfe8a6fb3f31aa6e4e460a0a482cbed6c55d31371672724f70584b8bca6434057f8c7111f38a61af8f85be25b8b6eceaee464ac952f30313

data/lib/wcc/auth/devise.rb

@@ -1,22 +1,37 @@
-require "wcc/auth"
-require "devise"
+# frozen_string_literal: true
+
+require 'wcc/auth'
+require 'devise'
 
 module WCC
   module Auth
     module Devise
-      autoload :WatermarkCallbacksController, 'wcc/auth/devise/watermark_callbacks_controller'
+      autoload :WatermarkCallbacksController,
+               'wcc/auth/devise/watermark_callbacks_controller'
     end
+
+    SetupOAuth = lambda { |env|
+      request = Rack::Request.new(env)
+
+      env['omniauth.strategy'].options[:client_id] = config.app_id
+      env['omniauth.strategy'].options[:client_secret] = config.app_secret
+      auth_params = config.authorize_params.merge(
+        request.params['authorize_params'] || {}
+      )
+
+      auth_params.each do |k, v|
+        env['omniauth.strategy'].options[:authorize_params][k] = v
+      end
+    }
   end
 end
 
-WCC::Auth.finalize_callbacks << -> {
-  require "omniauth/strategies/watermark"
+WCC::Auth.finalize_callbacks << lambda {
+  require 'omniauth/strategies/watermark'
+
   Devise.setup do |config|
-    config.omniauth :watermark,
-      WCC::Auth.config.app_id,
-      WCC::Auth.config.app_secret
+    config.omniauth :watermark, setup: WCC::Auth::SetupOAuth
   end
 
   OmniAuth.config.full_host = WCC::Auth.config.app_url
 }
-

data/lib/wcc/auth/version.rb

@@ -1,5 +1,5 @@
 module WCC
   module Auth
-    VERSION = '0.7.2'.freeze
+    VERSION = '0.7.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-auth
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Watermark Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancancan