registrar-rails 0.1.0.alpha → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f36923d9b6c4c211f9793f90b9d0f96c85c6911
-  data.tar.gz: d8cdd0cfb9c99d4094adf1b1b5fb36982a706145
+  metadata.gz: 63b952e593becaf35f3cdf23aca956d29bb6f38f
+  data.tar.gz: b95dbd8baac6bb446e962bbd964f2890f999a962
 SHA512:
-  metadata.gz: fc76cc7d8000abca939d10f814777e42f8a202f8a2c0221ddba802ee2248039a6e72df122cfcd3aeabe6e9ef55aaa6f26a3c78c61eff0a94d9f9c79221071714
-  data.tar.gz: b5719556812ca6c090dc9fbc75d41736ea6872951d5b7524644d72573513d9f0a9de04001d3ce7d820e8186e19c1cde96ed591ea2a3a3dcab22665993982d7fb
+  metadata.gz: 71e9b85cd98b542caacdd1aeb54c023bdb446c43b4f75c6b46ebeb87017ba7712c6234725bb14135bc5a3088a4bce96b437173adab592e6bb417f5079a0f8000
+  data.tar.gz: 6e62c6519aa9fb15529ce0fcf78f6a333dbe70a376b24791a27999b6873fefc9be263839d268565a5f894a4f39750545595e459c36d189d58673a2f1cff04310

data/app/controllers/registrar_controller.rb

@@ -0,0 +1,7 @@
+class RegistrarController < ApplicationController
+  skip_before_action :verify_authenticity_token
+
+  def callback
+    redirect_to after_auth_url
+  end
+end

data/config/routes.rb

@@ -1,8 +1,4 @@
 Rails.application.routes.draw do
-  get 'sign_up', :to => 'authentication#sign_up', :as => 'sign_up'
-  get 'sign_in', :to => 'authentication#sign_in', :as => 'sign_in'
-
-  # Auth through OmniAuth strategy
-  post 'auth/:strategy/callback' => 'authentication#authenticate'
-  get 'auth/:strategy/callback' => 'authentication#authenticate'
+  # Delegate all OmniAuth callbacks to Registrar
+  match 'auth/:strategy/callback' => 'registrar#callback', :via => [:get, :post]
 end

data/lib/registrar/rails/controller_extensions.rb

@@ -8,7 +8,7 @@ module Registrar
         klass.class_eval do
           helper_method :current_profile
           helper_method :current_profile?
-          helper_method :logout
+          helper_method :sign_out_current_profile
         end
       end
 
@@ -22,19 +22,9 @@ module Registrar
           end
         end
 
-        def logout
-          session[CURRENT_PROFILE_UID] = nil
-        end
-
         def current_profile
           return @current_profile if @current_profile
-
-          if current_profile_uid_from_session
-            @current_profile = Registrar::Middleware::config.handler.call(
-              build_current_profile
-            )
-          end
-
+          @current_profile = handle(profile) if current_profile_uid_from_session
           @current_profile
         end
 
@@ -42,8 +32,8 @@ module Registrar
           !!current_profile
         end
 
-        def authentication_phase?
-          params[:controller] == 'authentication' && params[:action] = 'callback'
+        def sign_out_current_profile
+          session[CURRENT_PROFILE_UID] = nil
         end
 
         private
@@ -56,7 +46,11 @@ module Registrar
           session[CURRENT_PROFILE_UID]
         end
 
-        def build_current_profile
+        def handle(profile)
+          Registrar::Middleware::config.handler.call(profile)
+        end
+
+        def profile
           {
             "provider" => {
               "name" => "session",

data/lib/registrar/rails/engine.rb

@@ -17,6 +17,10 @@ module Registrar
         block = lambda do |config|
           configuration.call config
           config.middleware(::Rails.application.config.middleware)
+
+          OmniAuth.config.on_failure = Proc.new { |env|
+            # noop - lat the application handle the error
+          }
         end
 
         @@configuration = lambda do

data/lib/registrar/rails/version.rb

@@ -1,5 +1,5 @@
 module Registrar
   module Rails
-    VERSION = "0.1.0.alpha"
+    VERSION = "0.2.0"
   end
 end

data/test/dummy/log/test.log

@@ -896,3 +896,39 @@ CurrentProfileTest: test_exposes_current_profile_if_registrar.profile_is_avaliab
 Started GET "/" for 127.0.0.1 at 2015-06-02 17:24:43 +0200
 Processing by SomeController#index as HTML
 Completed 200 OK in 14ms (Views: 0.2ms)
+----------------------------------------------------------------------------------
+CurrentProfileTest: test_exposes_current_profile_if_registrar.profile_is_avaliable
+----------------------------------------------------------------------------------
+Started GET "/" for 127.0.0.1 at 2015-12-02 11:00:51 +0100
+Processing by SomeController#index as HTML
+Completed 200 OK in 16ms (Views: 0.2ms)
+----------------------------------------------------------------------------------
+CurrentProfileTest: test_exposes_current_profile_if_registrar.profile_is_avaliable
+----------------------------------------------------------------------------------
+Started GET "/" for 127.0.0.1 at 2015-12-02 11:03:25 +0100
+Processing by SomeController#index as HTML
+Completed 200 OK in 14ms (Views: 0.1ms)
+----------------------------------------------------------------------------------
+CurrentProfileTest: test_exposes_current_profile_if_registrar.profile_is_avaliable
+----------------------------------------------------------------------------------
+Started GET "/" for 127.0.0.1 at 2015-12-02 11:06:23 +0100
+Processing by SomeController#index as HTML
+Completed 200 OK in 14ms (Views: 0.1ms)
+----------------------------------------------------------------------------------
+CurrentProfileTest: test_exposes_current_profile_if_registrar.profile_is_avaliable
+----------------------------------------------------------------------------------
+Started GET "/" for 127.0.0.1 at 2015-12-02 11:34:25 +0100
+Processing by SomeController#index as HTML
+Completed 200 OK in 14ms (Views: 0.1ms)
+----------------------------------------------------------------------------------
+CurrentProfileTest: test_exposes_current_profile_if_registrar.profile_is_avaliable
+----------------------------------------------------------------------------------
+Started GET "/" for 127.0.0.1 at 2015-12-02 12:37:02 +0100
+Processing by SomeController#index as HTML
+Completed 200 OK in 14ms (Views: 0.2ms)
+----------------------------------------------------------------------------------
+CurrentProfileTest: test_exposes_current_profile_if_registrar.profile_is_avaliable
+----------------------------------------------------------------------------------
+Started GET "/" for 127.0.0.1 at 2015-12-02 14:18:24 +0100
+Processing by SomeController#index as HTML
+Completed 200 OK in 14ms (Views: 0.2ms)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: registrar-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha
+  version: 0.2.0
 platform: ruby
 authors:
 - Jan Owiesniak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -46,7 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Rakefile
-- app/controllers/authentication_controller.rb
+- app/controllers/registrar_controller.rb
 - config/initializers/registrar.rb
 - config/routes.rb
 - lib/registrar-rails.rb
@@ -95,9 +95,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2

data/app/controllers/authentication_controller.rb

@@ -1,13 +0,0 @@
-class AuthenticationController < ApplicationController
-  skip_before_action :verify_authenticity_token
-
-  def sign_in
-  end
-
-  def sign_up
-  end
-
-  def authenticate
-    redirect_to '/'
-  end
-end