oauth-bwergemn 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28680e1cabddf3a646ce5e9b58ad26b9d6e6e5d5dfbc3b7ed18a625a2b0b13a4
-  data.tar.gz: f198b7a8da14f14a5f66d3361c3ff31e3bddf6974b1d73bdcec3170022fbe524
+  metadata.gz: 9793805f550aa496f8c35c722ac4bf677abf5d2836ba0ba703f266dbcafbe0e6
+  data.tar.gz: 06445a109f6e7a99a698103e1b841e17bcbb9671f7eb4a423605d24028ce309f
 SHA512:
-  metadata.gz: 9321d12b5598bb230196e8fd73162e1e0a51208108c3610e08b5cedac8ed4719fc0210311e3502226dd29830c06bef9a945a3bb924f49bab58a8c8b161d7c5ea
-  data.tar.gz: c74d19c90247e8cea7871199ec6f8d7518970e66df2497344f672a1bd267ce4a68d260b89db18b927e440b2df795c95d9560b866dcd447cd9a95e369d4adc313
+  metadata.gz: 2dc184cb56e5d2ade4d468b18facf61d3ffb19057e0e1e438e548bef94e78c4b31e926989c00078c575c4a5f06997dba7d1e5c7e075ff79bdd4c2df91efe417d
+  data.tar.gz: 3be3b01077ed948ac3d01b6fa53103a7712ba05d9a0c837e4a41119d613896b34eff5c441ca1feb2914950eeff09f466421addf9939da9c3acc9f8a4219c2b45

data/lib/oauth-bwergemn.rb

@@ -21,6 +21,7 @@ module OauthBwergemn
   extend OauthBwergemn::Configuration
   define_setting :auth_strategy, 'hub'
   define_setting :resources, user: 'User'
+  define_setting :default_resources, :user
 
   def self.config_resources
     resources

data/lib/oauth_bwergemn/oauth2.rb

@@ -52,13 +52,34 @@ module OauthBwergemn
       results
     end
 
+    def is_args_include_validate?
+      if args.keys.include?(:validate) && ![true, false].include?(args[:validate])
+        raise OauthBwergemn::Errors::InvalidScope.new("Not valid scope '#{args[:validate]}' in `oauth2 scope`")
+      end
+      args.keys.include?(:validate)
+    end
+
+    def is_args_include_as?
+      args.keys.include?(:as)
+    end
+
+    def token_optional?
+      is_args_include_validate? && [true, false].include?(args[:validate]) && args[:validate].eql?(false)
+    end
+
+    def token_required?
+      is_args_include_validate? && [true, false].include?(args[:validate]) && args[:validate].eql?(true) || is_args_include_valudate?.blank?
+    end
+
     def authorize!
       access = Doorkeeper::AccessToken.find_by(token: token)
       unless access.present?
         raise OauthBwergemn::Errors::InvalidToken
       end
+      resource_as = (is_args_include_as? ? args[:as] : OauthBwergemn.default_resources)
+
       # rubocop:disable Security/Eval
-      resource = eval(OauthBwergemn.resources[args[:as].to_sym]).find_by(id: access.resource_owner_id) rescue nil
+      resource = eval(OauthBwergemn.resources[resource_as.to_sym]).find_by(id: access.resource_owner_id) rescue nil
       # rubocop:enable Security/Eval
       {
         resource_owner:      resource,
@@ -87,13 +108,18 @@ module OauthBwergemn
       return unless context.protected_endpoint?
 
       self.the_request = env
-
-      if token.present? && context.protected_endpoint?
+      if token_optional? && context.protected_endpoint?
+        context.resource_token       = token
+        context.resource_owner       = nil
+        context.resource_credentials = nil
+      elsif token.present? && token_required? && context.protected_endpoint?
         response               = authorize!
         context.resource_token = token
         context.resource_owner = response[:resource_owner] rescue nil
         context.resource_credentials = response[:resource_credentials] rescue nil
-      elsif token.nil? && context.protected_endpoint?
+      elsif context.resource_owner.nil? && context.protected_endpoint?
+        raise OauthBwergemn::Errors::InvalidToken
+      else
         raise OauthBwergemn::Errors::InvalidToken
       end
     end

data/lib/oauth_bwergemn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oauth-bwergemn
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Alam Ybs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-12 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler