oauth-bwergemn 1.0.10 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e46c6acfa64976a4efd66ac4e880f2b82c83354d275b81edadbd66632563c0db
-  data.tar.gz: 813e8774a700ed3225a3a5065928d39500b1110b2ee54e68dd6d229ed374ffc9
+  metadata.gz: f0dc04cb4bc04a086e05e9895713ec7e0c29926ebbf7af0b30c124b253f62a9d
+  data.tar.gz: 50a0a431bab667664a8b0feddd9230ecdb307df9c285ad235976f2158173e614
 SHA512:
-  metadata.gz: 28f9010d626ed0d8e1c4d51cb6fe370eb95eed73485077cbd1146caf1504cf8579c66d6725514c8b161d3f334464fdb7f98c9488898531ac4ee3890e7dbe010c
-  data.tar.gz: 05ecce137a71d52d379dbbb72674abd5b54c731ffa2c42d394720002f7344f544612fb2a644338e1d8f8d0b57bd6a01ac552e8c7fb0634b6746086cf3a99de80
+  metadata.gz: d6ad24f9e5d7b02ba4b8b5537de6ff281be16999862a4bec85e1e0c7b34c5ec2ada5261593bf6642a3e2a35749c4cb2a3bcd847c1f87ecff6dc3263e02e7420a
+  data.tar.gz: 04b379d31270ecc5bb15f55f4d1e5acf06d29477b62a32b4b8d3e70b5f0527d32b3ddc26db228bbdc00b3619cb9299ff32af910987a36992434fcf16558e7921

data/.ruby-version

@@ -0,0 +1 @@
+3.0.0

data/Gemfile.lock

@@ -1,105 +1,58 @@
 PATH
   remote: .
   specs:
-    oauth-bwergemn (1.0.8)
-      grape (~> 1.3.0)
+    oauth-bwergemn (1.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    ast (2.4.1)
-    builder (3.2.4)
-    concurrent-ruby (1.1.6)
+    ast (2.4.2)
     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.6)
-      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
-    i18n (1.8.3)
-      concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    minitest (5.14.1)
-    mustermann (1.1.1)
-      ruby2_keywords (~> 0.0.1)
-    mustermann-grape (1.0.1)
-      mustermann (>= 1.0.0)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    parallel (1.20.1)
+    parser (3.0.0.0)
       ast (~> 2.4.1)
-    rack (2.2.3)
-    rack-accept (0.4.5)
-      rack (>= 0.4)
     rainbow (3.0.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    regexp_parser (2.1.1)
+    rexml (3.2.4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    rubocop (0.79.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.8.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.5.2)
-      rubocop (>= 0.71.0)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.6.1)
-    zeitwerk (2.3.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.9.2)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.11.0)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.1.0)
+  bundler (~> 2.2.4)
   oauth-bwergemn!
-  rspec (~> 3.7.0)
-  rubocop (~> 0.79.0)
-  rubocop-performance (~> 1.5.2)
+  rspec (~> 3.10.0)
+  rubocop (~> 1.8.0)
+  rubocop-performance (~> 1.9.2)
 
 BUNDLED WITH
-   2.1.0
+   2.2.14

data/lib/generators/templates/initializer.rb

@@ -1,5 +1,7 @@
 OauthBwergemn.setup do |config|
   # your authentication server
-  config.auth_strategy = "hub"
-  config.resources = { user: "Models::User" }  # { admin: "Models::Admin", user: "Models::User" , moderator: "Models::Moderator" }
-end
+  config.auth_strategy     = "hub"
+  config.is_custom_scopes  = false
+  config.resources         = { user: "Models::Auth" } # { admin: "Models::Admin", user: "Models::User" , moderator: "Models::Moderator" }
+  config.default_resources = :user
+end

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/errors/expired_token.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module OauthBwergemn
+  module Errors
+    class ExpiredToken < StandardError
+      def initialize msg = 'Expired token'
+        super
+      end
+    end
+  end
+end

data/lib/oauth_bwergemn/oauth2.rb

@@ -46,6 +46,10 @@ 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) }
@@ -53,7 +57,11 @@ module OauthBwergemn
     end
 
     def access_scopes access
-      access.scopes.all.map!(&:to_sym) rescue []
+      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?
@@ -85,14 +93,26 @@ module OauthBwergemn
 
     def authorize!
       access = Doorkeeper::AccessToken.find_by(token: token)
-      unless access.present?
+      if access.present?
+        if access.expired?
+          raise OauthBwergemn::Errors::ExpiredToken
+        end
+        if access.revoked?
+          raise OauthBwergemn::Errors::InvalidToken
+        end
+      else
         raise OauthBwergemn::Errors::InvalidToken
       end
-      scope_authorize! access
       resource_as = (is_args_include_as? ? args[:as] : OauthBwergemn.default_resources)
       # rubocop:disable Security/Eval
       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: {

data/lib/oauth_bwergemn/version.rb

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

data/oauth-bwergemn.gemspec

@@ -33,9 +33,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 2.1.0'
-  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.3.0'
+  spec.add_development_dependency 'bundler', '~> 2.2.4'
+  spec.add_development_dependency 'rspec', '~> 3.10.0'
+  spec.add_development_dependency 'rubocop', '~> 1.8.0'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.9.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oauth-bwergemn
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.1.1
 platform: ruby
 authors:
 - Alam Ybs
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,70 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
-- !ruby/object:Gem::Dependency
-  name: grape
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.9.2
 description: Oauth Bwergemn is a Grape middleware to connect your API resources with
   your API authenticator.
 email:
@@ -91,6 +77,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -107,6 +94,7 @@ files:
 - lib/oauth_bwergemn/auth_strategies/hub.rb
 - lib/oauth_bwergemn/base_strategy.rb
 - lib/oauth_bwergemn/configuration.rb
+- lib/oauth_bwergemn/errors/expired_token.rb
 - lib/oauth_bwergemn/errors/invalid_scope.rb
 - lib/oauth_bwergemn/errors/invalid_token.rb
 - lib/oauth_bwergemn/extension.rb
@@ -119,7 +107,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org/
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -134,8 +122,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.1
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Oauth Bwergemn is a Grape middleware for your API authenticator
 test_files: []