oauth-bwergemn 1.0.7 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8f5bfdb98626c73d0903e2822e6873f0c7c87e71857553dba82afccd33ceac0
-  data.tar.gz: 9a1b3d7cdd3939654fd5211dc6f44f7577522ccb1d3e280b7cc899ddc104361f
+  metadata.gz: 3f8e5aeeda88d2bca5a9498576dc71b9a2d56c7d851ae5fa73f586b10e3596ef
+  data.tar.gz: e598402a90eb83d96ced18e196d33936c6a4d00555726efcb4545683325e2124
 SHA512:
-  metadata.gz: 9328f3857d47d2bf6d9c1f447c4252c4102a06d179cfa0698696b76d8033f035c2d6614bb45a35ecb3a0da7b0c37ce16f19a4983b94d7986ffb46817184052de
-  data.tar.gz: 81b5c9f49e570bbe69962ccc8d9b34f076000f03f7fdb6cf947f6e1922941f5f5400fddfe58152cfa3b75edde78605fbe033e513f4af7690049a817f5d9525cf
+  metadata.gz: aa7deea5c24d680493bbb8be4896e06952a380722be880f538714c32a4d6fa3a99eaa3b2de378b5018994bdd17e607b0361803f848ed3842b0b24e678777ac56
+  data.tar.gz: 1cf80b2c26d650975807ce636f45097a76dea8c94d4826f436ff165be2b3c7a88c1cac1598c986c24f6a07a9e8d41ef0e2718faef95f3f166a8df101d1ea4ab9

data/Gemfile.lock

@@ -1,55 +1,66 @@
 PATH
   remote: .
   specs:
-    oauth-bwergemn (1.0.7)
-      grape (~> 1.2.0)
+    oauth-bwergemn (1.0.12)
+      grape (~> 1.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2.1)
+    activesupport (6.0.3.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    ast (2.4.0)
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    ast (2.4.1)
     builder (3.2.4)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.1.6)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.3)
-    equalizer (0.0.11)
-    grape (1.2.5)
+    concurrent-ruby (1.1.7)
+    diff-lcs (1.4.4)
+    dry-configurable (0.11.6)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.4, >= 0.4.7)
+      dry-equalizer (~> 0.2)
+    dry-container (0.7.2)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1, >= 0.1.3)
+    dry-core (0.4.9)
+      concurrent-ruby (~> 1.0)
+    dry-equalizer (0.3.0)
+    dry-inflector (0.2.0)
+    dry-logic (1.0.8)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.2)
+      dry-equalizer (~> 0.2)
+    dry-types (1.4.0)
+      concurrent-ruby (~> 1.0)
+      dry-container (~> 0.3)
+      dry-core (~> 0.4, >= 0.4.4)
+      dry-equalizer (~> 0.3)
+      dry-inflector (~> 0.1, >= 0.1.2)
+      dry-logic (~> 1.0, >= 1.0.2)
+    grape (1.3.3)
       activesupport
       builder
+      dry-types (>= 1.1)
       mustermann-grape (~> 1.0.0)
       rack (>= 1.3.0)
       rack-accept
-      virtus (>= 1.0.0)
-    i18n (1.8.2)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    ice_nine (0.11.2)
     jaro_winkler (1.5.4)
-    minitest (5.14.0)
+    minitest (5.14.2)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     mustermann-grape (1.0.1)
       mustermann (>= 1.0.0)
-    parallel (1.19.1)
-    parser (2.7.0.2)
-      ast (~> 2.4.0)
-    rack (2.0.8)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    rack (2.2.3)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rainbow (3.0.0)
-    rake (10.5.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -75,15 +86,10 @@ GEM
     ruby-progressbar (1.10.1)
     ruby2_keywords (0.0.2)
     thread_safe (0.3.6)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
-    virtus (1.0.5)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
-    zeitwerk (2.3.0)
+    unicode-display_width (1.6.1)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
@@ -91,8 +97,6 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.1.0)
   oauth-bwergemn!
-  rack (~> 2.0.8)
-  rake (~> 10.0)
   rspec (~> 3.7.0)
   rubocop (~> 0.79.0)
   rubocop-performance (~> 1.5.2)

data/lib/oauth-bwergemn.rb

@@ -22,6 +22,7 @@ module OauthBwergemn
   define_setting :auth_strategy, 'hub'
   define_setting :resources, user: 'User'
   define_setting :default_resources, :user
+  define_setting :is_custom_scopes, false
 
   def self.config_resources
     resources

data/lib/oauth_bwergemn/oauth2.rb

@@ -46,21 +46,41 @@ module OauthBwergemn
       results
     end
 
+    def sync_scopes_from resource , to:
+      to.update(scopes: resource.scopes.join(',')) rescue nil
+    end
+
     def scopes
       results = []
       auth_strategy.auth_scopes.map { |s| (results << s) unless s.is_a?(Hash) }
-      results
+      results.map! &:to_sym
+    end
+
+    def access_scopes access
+      if OauthBwergemn.is_custom_scopes
+        access.scopes.map!(&:to_sym) rescue []
+      else
+        access.scopes.all.map!(&:to_sym) rescue []
+      end
     end
 
     def is_args_include_validate?
-      if args.keys.include?(:validate) && ![true, false].include?(args[:validate])
+      if args.key?(:validate) && ![true, false].include?(args[:validate])
         raise OauthBwergemn::Errors::InvalidScope.new("Not valid scope '#{args[:validate]}' in `oauth2 scope`")
       end
-      args.keys.include?(:validate)
+      args.key?(:validate)
     end
 
     def is_args_include_as?
-      args.keys.include?(:as)
+      args.key?(:as)
+    end
+
+    def scope_authorize! access
+      if scopes.present? && access
+        unless (scopes & (access_scopes access)).present?
+          raise OauthBwergemn::Errors::InvalidScope.new('OAuth Scope is disallowed')
+        end
+      end
     end
 
     def token_optional?
@@ -77,15 +97,20 @@ module OauthBwergemn
         raise OauthBwergemn::Errors::InvalidToken
       end
       resource_as = (is_args_include_as? ? args[:as] : OauthBwergemn.default_resources)
-
       # rubocop:disable Security/Eval
-      resource = eval(OauthBwergemn.resources[resource_as.to_sym]).find_by(id: access.resource_owner_id) rescue nil
+      resource = eval(OauthBwergemn.resources[resource_as.to_sym]).where(id: access.resource_owner_id).last rescue nil
       # rubocop:enable Security/Eval
+      sync_scopes_from resource, to: access
+      if OauthBwergemn.is_custom_scopes
+        scope_authorize! resource
+      else
+        scope_authorize! access
+      end
       {
         resource_owner:      resource,
         resource_credential: {
           access_token:  access.token,
-          scopes:        scopes,
+          scopes:        (access_scopes access),
           token_type:    'bearer',
           expires_in:    access.expires_in,
           refresh_token: access.refresh_token,
@@ -112,6 +137,11 @@ module OauthBwergemn
         context.resource_token       = token
         context.resource_owner       = nil
         context.resource_credentials = nil
+        response = authorize! rescue nil
+        if response.present?
+          context.resource_owner = response[:resource_owner] rescue nil
+          context.resource_credentials = response[:resource_credentials] rescue nil
+        end
       elsif token.present? && token_required? && context.protected_endpoint?
         response               = authorize!
         context.resource_token = token

data/lib/oauth_bwergemn/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module OauthBwergemn
-  VERSION = '1.0.7'
+  VERSION = '1.0.12'
   public_constant :VERSION
 end

data/oauth-bwergemn.gemspec

@@ -34,10 +34,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 2.1.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rack', '~> 2.0.8'
   spec.add_development_dependency 'rspec', '~> 3.7.0'
   spec.add_development_dependency 'rubocop', '~> 0.79.0'
   spec.add_development_dependency 'rubocop-performance', '~> 1.5.2'
-  spec.add_dependency 'grape', '~> 1.2.0'
+  spec.add_dependency 'grape', '~> 1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oauth-bwergemn
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.12
 platform: ruby
 authors:
 - Alam Ybs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,34 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.8
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 description: Oauth Bwergemn is a Grape middleware to connect your API resources with
   your API authenticator.
 email: