grape_simple_auth 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 514832426298a7161edf6a2ee9eecc2744da6c345f5f5abb0a0c2f2bc0f7849d
-  data.tar.gz: 925214598e994294a61ef684a08b9b385d8e6d1ae437128b658f89621a87de5d
+  metadata.gz: b68d123a84af65f59b0b60725fdbd3dfc7b9929a39d61d4b44a128690e0122ec
+  data.tar.gz: e0d237a3775a09b5a40206ee42f9c84baa61cf98209a54eb5e8c39bae464a4cf
 SHA512:
-  metadata.gz: 3300fdfa4bfbfdfd7f82449ca3ebb7584392d707bb4752b885c20f337afdc7860a159dfabaf11b23afd0cfe5a67f62cece011cf91455fa91df49ce74745ca38c
-  data.tar.gz: 7bb618d60232690f1923744dccb5bdaf4603ca8c5038f7fe2f6135906bb9410f93e9ee0e361d596d291f763e42f2c07821b60e8e27509e8d0ffdaaf362693dd4
+  metadata.gz: 909788b220f755a20544bbc7d3c2a84056c17b7b9cb3282bb88ca5ae1cffa4547bc35d746d56a36ba2bfd45e6f771c856d018958d466e71662a8281588592f53
+  data.tar.gz: 745d15bdcb80b2f3db01c62d71081ff778d4087abfd4aacc914f18aa43f677a00160fb2184ca20c80709c508bb40019a8ba42a3dcf9bed53eba3933e52fed610

data/lib/grape_simple_auth/auth_methods/auth_methods.rb

@@ -10,6 +10,14 @@ module GrapeSimpleAuth
       @protected_endpoint || false
     end
 
+    def optional_endpoint=(opt)
+      @optional_endpoint = opt
+    end
+
+    def optional_endpoint?
+      @optional_endpoint || false
+    end
+
     def the_access_token
       @_the_access_token
     end

data/lib/grape_simple_auth/auth_strategies/swagger.rb

@@ -2,6 +2,10 @@ module GrapeSimpleAuth
   module AuthStrategies
     class Swagger < GrapeSimpleAuth::BaseStrategy
 
+      def optional_endpoint?
+        has_authorizations? && !!optional_oauth2
+      end
+
       def endpoint_protected?
         has_authorizations? && !!authorization_type_oauth2
       end
@@ -11,7 +15,11 @@ module GrapeSimpleAuth
       end
 
       def auth_scopes
-        authorization_type_oauth2.map { |hash| hash[:scope].to_sym }
+        if optional_endpoint?
+          optional_oauth2.map { |hash| hash[:scope].to_sym }
+        else
+          authorization_type_oauth2.map { |hash| hash[:scope].to_sym }
+        end
       end
 
       private
@@ -28,6 +36,10 @@ module GrapeSimpleAuth
         endpoint_authorizations[:oauth2]
       end
 
+      def optional_oauth2
+        endpoint_authorizations[:optional_oauth2]
+      end
+
     end
   end
 end

data/lib/grape_simple_auth/extension.rb

@@ -12,6 +12,16 @@ module GrapeSimpleAuth
       description[:authorizations] = { oauth2: scopes.map { |x| { scope: x } } }
     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
   end
 end

data/lib/grape_simple_auth/oauth2.rb

@@ -39,6 +39,10 @@ module GrapeSimpleAuth
       auth_strategy.endpoint_protected?
     end
 
+    def optional_endpoint?
+      auth_strategy.optional_endpoint?
+    end
+
     def auth_scopes
       return *nil unless auth_strategy.has_auth_scopes?
       auth_strategy.auth_scopes
@@ -66,13 +70,20 @@ module GrapeSimpleAuth
       context.extend(GrapeSimpleAuth::AuthMethods)
 
       context.protected_endpoint = endpoint_protected?
-      return unless context.protected_endpoint?
+      context.optional_endpoint = optional_endpoint?
 
+      return unless context.protected_endpoint? || context.optional_endpoint?
+      
       self.the_request = env
-      resp = authorize!(*auth_scopes)
-      context.the_access_token = token
-      context.current_user = resp.parsed_response["data"]["info"] rescue nil
-      context.credentials = resp.parsed_response["data"]["credential"] rescue nil
+      
+      if token.present? && (context.protected_endpoint? || context.optional_endpoint?)
+        resp = authorize!(*auth_scopes)
+        context.the_access_token = token
+        context.current_user = resp.parsed_response["data"]["info"] rescue nil
+        context.credentials = resp.parsed_response["data"]["credential"] rescue nil
+      elsif token.nil? && context.protected_endpoint?
+        raise GrapeSimpleAuth::Errors::InvalidToken
+      end
     end
 
 

data/lib/grape_simple_auth/version.rb

@@ -1,3 +1,3 @@
 module GrapeSimpleAuth
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape_simple_auth
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Yunan Helmy