oauth-bwergemn 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e8c19bba150ec8ef5cf5c95e4b19fce2f3da3c2fd537490e86c0b5ad2470775
-  data.tar.gz: a493d05b12eb0e0e5a2052a3f8612139640d61c54cfae4fa5c771de48a32162e
+  metadata.gz: 99e32151695d92c0c2ef047d74d9d719a751781f196049cb7904b0ed837f0bcf
+  data.tar.gz: df02811335d7aadd9e0d04bf74c0c171dea51200cb4c9d87dcf7a97a853ba4d0
 SHA512:
-  metadata.gz: 66819befed19baf4c71331333e5fe676f39422032008791b214e998658c5d1d2eb505755472ffe5ccb67c1574ab7d494d3e583c83c79bfef0549a9224107d85a
-  data.tar.gz: 9daba36c76835a321efb791083c98aef30474792f20ae8e2be81f773c2bb8d641d85c3e56f040c51ab964922ff9f474e2a5e7ea22e901cdf5d6a1036088fd77c
+  metadata.gz: 681152cb13886f430109c5b4824a5e77807569a65018c4a1e20f3baaa049a1f089030079b305aa94d89dc526008e748ffadc5838f33589539a99895a81a5cb61
+  data.tar.gz: 934fa511ac7dcdbaf5cf1f99b7bc0ab909a4b951537c98201011bc9f695865d1449df45cf8bcc30f2fdc6adfbce9986f7a086d3936808a6e4fe0990953cff658

data/.rubocop.yml

@@ -730,8 +730,8 @@ Style/CommentedKeyword:
   Enabled: true
 
 Style/ConditionalAssignment:
-  Enabled: true
-  EnforcedStyle: assign_to_condition
+  Enabled: false
+  EnforcedStyle: assign_inside_condition
   SingleLineConditionsOnly: true
   IncludeTernaryExpressions: true
 
@@ -952,7 +952,7 @@ Style/RedundantSortBy:
   Enabled: true
 
 Style/RescueModifier:
-  Enabled: true
+  Enabled: false
 
 Style/RescueStandardError:
   Enabled: true

data/lib/oauth_bwergemn/auth_methods/auth_methods.rb

@@ -13,14 +13,6 @@ module OauthBwergemn
       @protected_endpoint || false
     end
 
-    def optional_endpoint=(opt)
-      @optional_endpoint = opt
-    end
-
-    def optional_endpoint?
-      @optional_endpoint || false
-    end
-
     # rubocop:disable Lint/DuplicateMethods
     def resource_token
       @_resource_token

data/lib/oauth_bwergemn/auth_strategies/hub.rb

@@ -3,46 +3,24 @@
 module OauthBwergemn
   module AuthStrategies
     class Hub < OauthBwergemn::BaseStrategy
-      def optional_endpoint?
-        has_authorizations? && !!optional_oauth2
-      end
-
       def endpoint_protected?
-        has_authorizations? && !!authorization_type_oauth2
+        !!endpoint_authorizations
       end
 
       def has_auth_scopes?
-        endpoint_protected? && !authorization_type_oauth2.empty?
-      rescue
-        false
+        !!endpoint_authorizations &&
+          endpoint_authorizations.key?(:scopes) &&
+          !endpoint_authorizations[:scopes].empty?
       end
 
       def auth_scopes
-        if optional_endpoint?
-          optional_oauth2.map { |s| s.is_a?(String) || s.is_a?(Symbol) ? s.to_sym : s }
-        else
-          authorization_type_oauth2.map { |s| s.is_a?(String) || s.is_a?(Symbol) ? s.to_sym : s }
-        end
+        endpoint_authorizations[:scopes].map { |s| s.is_a?(String) || s.is_a?(Symbol) ? s.to_sym : s }
       end
 
       private
 
-      def has_authorizations?
-        !!endpoint_authorizations
-      end
-
       def endpoint_authorizations
-        api_context.options[:route_options][:auth][:scopes]
-      rescue
-        nil
-      end
-
-      def authorization_type_oauth2
-        endpoint_authorizations
-      end
-
-      def optional_oauth2
-        endpoint_authorizations
+        api_context.options[:route_options][:auth]
       end
     end
   end

data/lib/oauth_bwergemn/extension.rb

@@ -3,26 +3,22 @@
 module OauthBwergemn
   module Extension
     def oauth2(*scopes)
-      description = if respond_to?(:route_setting) # >= grape-0.10.0
-        route_setting(:description) || route_setting(:description, {})
+      scopes = Doorkeeper.configuration.default_scopes.all if scopes.all? { |x| x.nil? }
+      if respond_to?(:route_setting) # >= grape-0.10.0
+        description = route_setting(:description) || route_setting(:description, {})
       else
-        @last_description ||= {}
+        description = @last_description ||= {}
       end
-
+      # case WineBouncer.configuration.auth_strategy
+      # when :default
       description[:auth] = { scopes: scopes }
+      # when :swagger
       description[:authorizations] = { oauth2: scopes.map { |x| { scope: x } } }
+      # end
     end
 
-    def optional_oauth2(*scopes)
-      description = if respond_to?(:route_setting) # >= grape-0.10.0
-        route_setting(:description) || route_setting(:description, {})
-      else
-        @last_description ||= {}
-      end
-
-      description[:authorizations] = { optional_oauth2: scopes.map { |x| { scope: x } } }
-    end
-
-    Grape::API.extend self
+    # Grape::API::Instance is defined in grape 1.2.0 or above
+    grape_api = defined?(Grape::API::Instance) ? Grape::API::Instance : Grape::API
+    grape_api.extend self
   end
 end

data/lib/oauth_bwergemn/oauth2.rb

@@ -19,16 +19,16 @@ module OauthBwergemn
     end
 
     def token
-      token = if request.headers['Authorization'].present?
+      if request.headers['Authorization'].present?
         if request.headers['Authorization'].include?('bearer')
-          request.headers['Authorization'].try('split', 'bearer').try(:last).try(:strip)
+          token = request.headers['Authorization'].try('split', 'bearer').try(:last).try(:strip)
         elsif request.headers['Authorization'].include?('Bearer')
-          request.headers['Authorization'].try('split', 'Bearer').try(:last).try(:strip)
+          token = request.headers['Authorization'].try('split', 'Bearer').try(:last).try(:strip)
         else
-          request.headers['Authorization']
+          token = request.headers['Authorization']
         end
       else
-        request.parameters['access_token']
+        token = request.parameters['access_token']
       end
       token
     end
@@ -37,14 +37,6 @@ module OauthBwergemn
     # Authorization control.
     ############
 
-    def endpoint_protected?
-      auth_strategy.endpoint_protected?
-    end
-
-    def optional_endpoint?
-      auth_strategy.optional_endpoint?
-    end
-
     def args
       results = {}
       auth_strategy.auth_scopes.map { |s| (results = results.merge(s)) if s.is_a?(Hash) }
@@ -62,13 +54,9 @@ module OauthBwergemn
       unless access.present?
         raise OauthBwergemn::Errors::InvalidToken
       end
-      resource = begin
-                   # rubocop:disable Security/Eval
-                   eval(OauthBwergemn.resources[args[:as].to_sym]).find_by(id: access.resource_owner_id)
-                 # rubocop:enable Security/Eval
-                 rescue
-                   nil
-                 end
+      # rubocop:disable Security/Eval
+      resource = eval(OauthBwergemn.resources[args[:as].to_sym]).find_by(id: access.resource_owner_id) rescue nil
+      # rubocop:enable Security/Eval
       {
         resource_owner:      resource,
         resource_credential: {
@@ -92,25 +80,16 @@ module OauthBwergemn
       context.extend(OauthBwergemn::AuthMethods)
 
       context.protected_endpoint = endpoint_protected?
-      context.optional_endpoint  = optional_endpoint?
 
-      return unless context.protected_endpoint? || context.optional_endpoint?
+      return unless context.protected_endpoint?
 
       self.the_request = env
 
-      if token.present? && (context.protected_endpoint? || context.optional_endpoint?)
-        response                     = authorize!
-        context.resource_token       = token
-        context.resource_owner       = begin
-                                         response[:resource_owner]
-                                       rescue
-                                         nil
-                                       end
-        context.resource_credentials = begin
-                                         response[:resource_credentials]
-                                       rescue
-                                         nil
-                                       end
+      if token.present? && 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?
         raise OauthBwergemn::Errors::InvalidToken
       end

data/lib/oauth_bwergemn/version.rb

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

metadata

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