incline 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 065df6ffb292cb4efbfdbeeedb604e55f945d69c
-  data.tar.gz: 23822bbc55ccad1a75bfa6cdbdaa1198f8aa30d4
+  metadata.gz: f31fe3757e3d195e25dd9154513c4b95fcfc22df
+  data.tar.gz: 66e93d328a2e53e716358e15f1aae7135444859c
 SHA512:
-  metadata.gz: b84ed7084d1c1fe23e47d7ddc9db46d0488921dcff442aa5be93e96c112d744780c4eff804330e94c19bfcbf779fab8e077fd14d74b405a52197063cf1cf09da
-  data.tar.gz: 64abec92b9d281e89daf05c4f93f9a83a5c979b9a407a74380a0bef69f6a75168273f80a98c9b39d6ca8255a60c51980ed8fe66935e11d34d6f034267f1e4519
+  metadata.gz: 117ffcbea8af8913b31e0c82292cc5a3dcc106c489a10d6c5521aaf6d066cd0bceeff284261b5d006a278be42a4c5e26210ec2fa5cce77a8a0de8c080c2f6320
+  data.tar.gz: 89c97c19037309d49ca8cc7816a3dfd8b306265e68288e8b8aa375397cf8de02ead1f5d63270685b705fc4180c99898d68325c664f2765de3c7699bb3052a036

data/.gitignore

@@ -2,6 +2,7 @@
 log/*.log
 pkg/
 tmp/
+.ssl/
 config/secrets.yml
 test/dummy/db/*.sqlite3
 test/dummy/db/*.sqlite3-journal

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    incline (0.2.5)
+    incline (0.2.6)
       ansi (~> 1.5.0)
       bcrypt
       bootstrap-sass

data/app/controllers/incline/sessions_controller.rb

@@ -12,6 +12,7 @@ module Incline
     ##
     # GET /incline/login
     def new
+      
     end
 
     ##

data/lib/incline/auth_engine_base.rb

@@ -16,6 +16,13 @@ module Incline
     def authenticate(email, password, client_ip)
       nil
     end
+    
+    ##
+    # The begin_external_authentication method takes a request object to determine if it should process authentication or
+    # return nil.  If it decides to process authentication, it should return a URL to redirect to.
+    def begin_external_authentication(request)
+      nil
+    end
 
     protected
 

data/lib/incline/extensions/action_controller_base.rb

@@ -284,6 +284,13 @@ module Incline::Extensions
 
         # an authenticated user must exist.
         unless logged_in?
+          
+          if (auth_url = ::Incline::UserManager.begin_external_authentication(request))
+            ::Incline::Log.debug 'Redirecting for external authentication.'
+            redirect_to auth_url
+            return false
+          end
+          
           store_location
 
           raise_not_logged_in "You need to login to access '#{request.fullpath}'.",
@@ -323,9 +330,9 @@ module Incline::Extensions
         end
 
       rescue ::Incline::NotAuthorized => err
-
         flash[:danger] = err.message
-        redirect_to main_app.root_url and return false
+        redirect_to main_app.root_url
+        return false
       end
       true
 

data/lib/incline/user_manager.rb

@@ -108,20 +108,46 @@ module Incline
       nil
     end
 
+    ##
+    # The begin_external_authentication method takes a request object to determine if it should process authentication or
+    # return nil.  If it decides to process authentication, it should return a URL to redirect to.
+    def begin_external_authentication(request)
+      # We don't have an email domain to work from.
+      # Instead, we'll call each engine's authenticate_external method.
+      # If one of them returns a user, then we return that value and skip further processing.
+      auth_engines.each do |dom,engine|
+        unless engine.nil?
+          url = engine.begin_external_authentication(request)
+          return url unless url.blank?
+        end
+      end
+      nil
+    end
+
     ##
     # Attempts to authenticate the user and returns the model on success.
     def self.authenticate(email, password, client_ip)
       default.authenticate email, password, client_ip
     end
 
+    ##
+    # The begin_external_authentication method takes a request object to determine if it should process authentication or
+    # return nil.  If it decides to process authentication, it should return a URL to redirect to.
+    def self.begin_external_authentication(request)
+      default.begin_external_authentication request
+    end
+    
     ##
     # Registers an authentication engine for one or more domains.
     #
     # The +engine+ passed in should take an options hash as the only argument to +initialize+
     # and should provide an +authenticate+ method that takes the +email+, +password+, and
-    # +client_ip+.
+    # +client_ip+.  You can optionally define an +authenticate_external+ method that takes the
+    # current +request+ as the only parameter.
     #
     # The +authenticate+ method of the engine should return an Incline::User object on success or nil on failure.
+    # The +begin_external_authentication+ method of the engine should return a URL to redirect to on success
+    # or nil on failure.
     #
     #   class MyAuthEngine
     #     def initialize(options = {})
@@ -131,6 +157,10 @@ module Incline
     #     def authenticate(email, password, client_ip)
     #       ...
     #     end
+    #     
+    #     def begin_external_authentication(request)
+    #       ...
+    #     end
     #   end
     #
     #   Incline::UserManager.register_auth_engine(MyAuthEngine, 'example.com', 'example.net', 'example.org')

data/lib/incline/version.rb

@@ -1,3 +1,3 @@
 module Incline
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/test/dummy/app/views/dummy/hello.html.erb

@@ -1 +1,3 @@
 <h1>Congrats, this is the DUMMY root.</h1>
+
+<%= console if Rails.env.development? %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: incline
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Beau Barker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails