oauth-bwergemn 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e46c6acfa64976a4efd66ac4e880f2b82c83354d275b81edadbd66632563c0db
-  data.tar.gz: 813e8774a700ed3225a3a5065928d39500b1110b2ee54e68dd6d229ed374ffc9
+  metadata.gz: 2693a4a7425ecbcd52df5b7e5cda3bbe0797c40af3f089d5a78a88f2fb80932d
+  data.tar.gz: 543449662afc954c055fad61a73ac3e748ca882e2eb4dc370ecf639df81dbddb
 SHA512:
-  metadata.gz: 28f9010d626ed0d8e1c4d51cb6fe370eb95eed73485077cbd1146caf1504cf8579c66d6725514c8b161d3f334464fdb7f98c9488898531ac4ee3890e7dbe010c
-  data.tar.gz: 05ecce137a71d52d379dbbb72674abd5b54c731ffa2c42d394720002f7344f544612fb2a644338e1d8f8d0b57bd6a01ac552e8c7fb0634b6746086cf3a99de80
+  metadata.gz: b47c2291394b8306621f73a025325acd2a063cee6c4d66b12f5bedfd092c4e3bb6833eb6090cef6bc109fc73a9ac122a9170d2cb0783c10f9f1a4085550e9587
+  data.tar.gz: 22a22898d1e0dd75ccb6ae86a5eba9ffcd7766075dfce6b0a9be08ee5bc8c4bf2f65f580f8047a080b637e06361a0568df6a8fe217b857c760ea8f1c841a9e05

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

@@ -53,7 +53,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?
@@ -88,11 +92,15 @@ module OauthBwergemn
       unless access.present?
         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
+      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.0.11'
   public_constant :VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oauth-bwergemn
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Alam Ybs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler