exvo-auth 0.7.9 → 0.7.10

data/VERSION

@@ -1 +1 @@
-0.7.9
+0.7.10

data/exvo-auth.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{exvo-auth}
-  s.version = "0.7.9"
+  s.version = "0.7.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jacek Becela"]

data/lib/exvo_auth/controllers/base.rb

@@ -2,7 +2,7 @@ module ExvoAuth::Controllers::Base
   def self.included(base)
     raise "Please define a #root_url method in #{base.name} (or in routes)" unless base.method_defined? :root_url
   end
-
+  
   # A before filter to protect your sensitive actions.
   def authenticate_user!
     if !signed_in?
@@ -41,6 +41,21 @@ module ExvoAuth::Controllers::Base
     @current_user = nil
     redirect_to sign_out_url(return_to)
   end
+
+  def authenticate_app_in_scope!(scope)    
+    raise("SSL not configured") unless request.ssl?
+
+    send(basic_authentication_method_name) do |consumer_id, access_token|
+      current_scopes = ExvoAuth::Autonomous::Provider.new(
+        :consumer_id  => consumer_id,
+        :access_token => access_token
+      ).scopes
+
+      @current_consumer_id = consumer_id
+      
+      current_scopes.include?(scope)
+    end
+  end
   
   def sign_in_path
     "/auth/interactive"
@@ -62,7 +77,7 @@ module ExvoAuth::Controllers::Base
   def signed_in?
     !!current_user
   end
-  
+
   protected
 
   def store_location!

data/lib/exvo_auth/controllers/merb.rb

@@ -9,34 +9,11 @@ module ExvoAuth::Controllers::Merb
       super
       throw :halt unless signed_in?
     end
-
-    def authenticate_app_in_scope!(scope)    
-      basic_authentication do |consumer_id, access_token|
-        current_scopes = ExvoAuth::Autonomous::Provider.new(
-          :consumer_id  => consumer_id,
-          :access_token => access_token
-        ).scopes
-
-        @current_consumer_id = consumer_id
-        
-        if !request.ssl?
-          error("Auth: SSL not configured")
-          return false
-        end
-        
-        if !current_scopes.include?(scope)
-          error("Auth: Requested scope (#{scope}) not in a list: #{current_scopes.join(', ')}")
-          return false
-        end
-        
-        true
-      end
-    end
     
     protected
-    
-    def error(message)
-      Merb.logger.error(message) if defined?(Merb.logger)
+
+    def basic_authentication_method_name
+      :basic_authentication
     end
 
     def redirect_to(*args)

data/lib/exvo_auth/controllers/rails.rb

@@ -6,21 +6,12 @@ module ExvoAuth::Controllers::Rails
   end
     
   module InstanceMethods
-    def authenticate_app_in_scope!(scope)
-      authenticate_or_request_with_http_basic do |consumer_id, access_token|
-        current_scopes = ExvoAuth::Autonomous::Provider.new(
-          :consumer_id  => consumer_id, 
-          :access_token => access_token
-        ).scopes
-        
-        @current_consumer_id = consumer_id
-        
-        current_scopes.include?(scope) && request.ssl?
-      end
-    end
-
     protected
-    
+
+    def basic_authentication_method_name
+      :authenticate_or_request_with_http_basic
+    end    
+
     def find_user_by_id(id)
       User.find(id)
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 9
-  version: 0.7.9
+  - 10
+  version: 0.7.10
 platform: ruby
 authors: 
 - Jacek Becela