incline 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cfbf17b26c16120554b3867cb1ce1f33d3bc39d
-  data.tar.gz: 8fdfd9a49f863281010e5c0a50e373a11a984b09
+  metadata.gz: 96abfaafca9bf6706a2f20c026892324ed54535e
+  data.tar.gz: 774487236771970729fe63b66f01051c0186635b
 SHA512:
-  metadata.gz: 886b0af6a73cd3e11dd8485a36d73f353d512ed49ea1b38f89352e5ccf4f7ab15444c4d011eeae49b679c005e15f0e6844acb68ce1524e7b8704b8d68889eb4a
-  data.tar.gz: 6239c29b73ef51dc972f489bd9d67c1e75211a3cdd09cb7776270d8f56fef89352e1aa7e4206762cea20e4fd658a1499cff216889db2aa9a392a7ad2835b7a0c
+  metadata.gz: c7c8dfba5bbbb8dd7098d1a0471b369990b50f955577c4240254d7fd7aa16c7353ef25352438e5a55bd321f415d5f20fce1dbab3decf2d69537c1d0cdc5c5637
+  data.tar.gz: ce534a4d60ebb59f9b7c00aecb9389a23bedfb6e0f9b82fec5610e25ef8eeee3fb2cd9e42928370bedab947a4a2395bdae95bd92a934ddce46189e2b3c955eed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    incline (0.2.7)
+    incline (0.2.8)
       ansi (~> 1.5.0)
       bcrypt
       bootstrap-sass
@@ -58,7 +58,7 @@ GEM
       tzinfo (~> 1.1)
     ansi (1.5.0)
     arel (6.0.4)
-    autoprefixer-rails (7.1.2.6)
+    autoprefixer-rails (7.1.3)
       execjs
     bcrypt (3.1.11)
     bootstrap-sass (3.3.7)

data/app/controllers/incline/sessions_controller.rb

@@ -44,8 +44,14 @@ module Incline
     ##
     # DELETE /incline/logout
     def destroy
-      log_out if logged_in?
-      redirect_to main_app.root_url
+      # Check to see if an external auth system should be used.
+      auth_url = ::Incline::UserManager.end_external_authentication(request)
+      if auth_url.blank?
+        log_out if logged_in?
+        redirect_to main_app.root_url
+      else
+        redirect_to auth_url
+      end
     end
 
   end

data/lib/incline/auth_engine_base.rb

@@ -18,12 +18,19 @@ module Incline
     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.
+    # The begin_external_authentication method takes a request object to determine if it should process a login
+    # or return nil.  If it decides to process authentication, it should return a URL to redirect to.
     def begin_external_authentication(request)
       nil
     end
 
+    ##
+    # The end_external_authentication method takes a request object to determine if it should process a logout
+    # or return nil.  If it decides to process authentication, it should return a URL to redirect to.
+    def end_external_authentication(request)
+      nil
+    end
+
     protected
 
     ##

data/lib/incline/user_manager.rb

@@ -109,8 +109,8 @@ module Incline
     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.
+    # The begin_external_authentication method takes a request object to determine if it should process a login
+    # 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.
@@ -124,6 +124,22 @@ module Incline
       nil
     end
 
+    ##
+    # The end_external_authentication method takes a request object to determine if it should process a logout
+    # or return nil.  If it decides to process authentication, it should return a URL to redirect to.
+    def end_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.end_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)
@@ -131,11 +147,16 @@ module Incline
     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.
+    # Returns a URL if an external login is to be used, or nil to use local authentication.
     def self.begin_external_authentication(request)
       default.begin_external_authentication request
     end
+
+    ##
+    # Returns a URL if an external logout is to be used, or nil to use local authentication.
+    def self.end_external_authentication(request)
+      default.end_external_authentication request
+    end
     
     ##
     # Registers an authentication engine for one or more domains.

data/lib/incline/version.rb

@@ -1,3 +1,3 @@
 module Incline
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: incline
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Beau Barker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -604,7 +604,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A gem designed to get off to an even quicker start with Rails.