rails_sso 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 137bd49e5e81047d8cf47ca7381e38d41abba79e
-  data.tar.gz: 622652dc407b3304d6128a14031ac5d9063f334e
+  metadata.gz: 170c6345095e886214afff31d808cdbbba60d2c0
+  data.tar.gz: 3647503ec6439121f4a86b6279c191add1d55d69
 SHA512:
-  metadata.gz: f1e5ecd958a06f25df036cab1ab05dc693f29b7fb5b9b4a1dc6743d59a3f30cc0c387b77837804cf9f1ed9e56dcbf74c034b263bfd6a0d3de8612bc9e9d2acba
-  data.tar.gz: 90b4185586475bebf98010ae4e413ba3c65bc20dcb67a1809fcdf40b80500e144bdba86167769d9e196254ff79b83f2f1181b27e2bca07a635791ee11a431f73
+  metadata.gz: fb0ff27da239e77ef5918f73af3d43be096280bf2eaa0d94208f758099ec37854cd014778f18929fefd6af9a04f2d44ff10e78a0fe812613be379d53b0836776
+  data.tar.gz: 39c3f78d9edb3d289e8dad0b365df98cc9fb51b2423b2704f82fd3f5c8b30dbdf72e48c417beec21c31f1161df433112927aa2c2f7628f43c2e9bcf7f0f18eea

data/README.md

@@ -53,7 +53,7 @@ RailsSso.configure do |config|
   # test & development mode
   config.test_mode = ENV['mock_sso']
   config.access_token_mock = ENV['access_token_mock']
-  config.profiles_mock = {
+  config.profile_mocks = {
     '169783' => {
       user: 'John Blacksmith',
       uid: '169783'
@@ -113,18 +113,32 @@ RailsSso.configure do
 end
 ```
 
-Mock data should be passed to `profile_mock` configuration.
+Mock data should be passed to `profile_mocks` configuration with dummy access token as a key.
 
 ```ruby
 RailsSso.configure do |config|
-  config.profile_mock = {
-    name: 'John Kowalski',
-    uid: '42'
+  config.profile_mocks = {
+    "kowalski_uid" => {
+      "name" => "John Kowalski",
+      "uid" => "42"
+    },
+    "nowak_uid" => {
+      "name" => "Pawel Nowak",
+      "uid" => "23"
+    }
   }
 end
 ```
 
-To mock signed out state set `profile_mock = nil`.
+Finally you have to select which token to use.
+
+```ruby
+RailsSso.configure do |config|
+  config.access_token_mock = "kowalski_uid"
+end
+```
+
+To mock signed out state set `nil` to access token value.
 
 ## Contributing
 

data/app/controllers/rails_sso/sessions_controller.rb

@@ -1,5 +1,5 @@
 module RailsSso
-  class SessionsController < RailsSso.application_controller.constantize
+  class SessionsController < RailsSso.config.application_controller.constantize
     skip_before_action :authenticate_user!, only: [:create]
 
     def create

data/app/services/rails_sso/fetch_user.rb

@@ -7,7 +7,7 @@ module RailsSso
     end
 
     def call
-      response = client.get(RailsSso.provider_profile_path)
+      response = client.get(RailsSso.config.provider_profile_path)
 
       case response.status
       when 200

data/config/routes.rb

@@ -3,6 +3,6 @@ RailsSso::Engine.routes.draw do
     get '/:provider/callback', to: 'sessions#create'
     delete '/sign_out', to: 'sessions#destroy', as: :sign_out
 
-    root to: redirect("/auth/#{RailsSso.provider_name}"), as: :sign_in
+    root to: redirect("/auth/#{RailsSso.config.provider_name}"), as: :sign_in
   end
 end

data/lib/rails_sso.rb

@@ -1,56 +1,12 @@
 module RailsSso
-  mattr_accessor :application_controller
-  mattr_accessor :magic_enabled
+  class Error < RuntimeError; end
 
-  mattr_accessor :provider_url
-  mattr_accessor :provider_name
-  mattr_accessor :provider_key
-  mattr_accessor :provider_secret
-
-  mattr_accessor :provider_profile_path
-  mattr_accessor :provider_sign_out_path
-
-  mattr_accessor :use_cache
-
-  mattr_accessor :test_mode
-  mattr_accessor :profile_mocks
-  mattr_accessor :access_token_mock
-
-  mattr_accessor :failure_app
+  mattr_accessor :config
 
   def self.configure
-    self.application_controller = "ApplicationController"
-    self.magic_enabled = true
-    self.use_cache = false
-    self.test_mode = false
-    self.profile_mocks = {}
-    self.access_token_mock = nil
-    self.failure_app = RailsSso::FailureApp
-
-    yield self
-  end
-
-  def self.user_repository
-    @@user_repository.constantize
-  end
-
-  def self.provider_callback_path
-    "/sso/#{self.provider_name}/callback"
-  end
-
-  def self.oauth2_strategy_class
-    OmniAuth::Strategies.const_get("#{OmniAuth::Utils.camelize(provider_name.to_s)}")
-  end
-
-  def self.test_mode=(value)
-    @@test_mode = value
-    OmniAuth.config.test_mode = value
-  end
+    self.config = Configuration.new
 
-  def self.profile_mock
-    @@profile_mocks.fetch(@@access_token_mock) do
-      fail %Q{Mock "#{@@access_token_mock}" has not beed setup!}
-    end
+    yield config
   end
 end
 
@@ -58,6 +14,7 @@ require "warden"
 require "omniauth-oauth2"
 require "rails_sso/version"
 require "rails_sso/app"
+require "rails_sso/configuration"
 require "rails_sso/engine"
 require "rails_sso/helpers"
 require "rails_sso/client"

data/lib/rails_sso/app.rb

@@ -7,10 +7,10 @@ module RailsSso
     end
 
     def fetch_user_data
-      FetchUser.new(provider_client.token!(session[:access_token])).call
+      FetchUser.new(provider_client.token!(current_access_token_value)).call
     rescue ResponseError => e
       refresh_access_token! do
-        FetchUser.new(provider_client.token!(session[:access_token])).call
+        FetchUser.new(provider_client.token!(current_access_token_value)).call
       end if e.code == :unauthenticated
     end
 
@@ -30,7 +30,7 @@ module RailsSso
     end
 
     def access_token
-      return token_mock if RailsSso.test_mode
+      return token_mock if RailsSso.config.test_mode?
 
       OAuth2::AccessToken.new(strategy.client, session[:access_token], {
         refresh_token: session[:refresh_token]
@@ -38,15 +38,25 @@ module RailsSso
     end
 
     def invalidate_access_token!
-      if RailsSso.provider_sign_out_path
-        access_token.delete(RailsSso.provider_sign_out_path)
+      if RailsSso.config.provider_sign_out_path
+        access_token.delete(RailsSso.config.provider_sign_out_path)
       end
     end
 
     private
 
+    def current_access_token_value
+      session[:access_token] or current_access_token_mock
+    end
+
+    def current_access_token_mock
+      if RailsSso.config.test_mode?
+        token_mock.token
+      end
+    end
+
     def token_mock
-      RailsSso::TokenMock.new
+      @token_mock ||= RailsSso::TokenMock.new
     end
   end
 end

data/lib/rails_sso/client.rb

@@ -10,7 +10,7 @@ module RailsSso
 
     def self.build_real(url)
       build(url) do |conn|
-        if RailsSso.use_cache
+        if RailsSso.config.use_cache
           conn.use :http_cache,
             store: Rails.cache,
             logger: Rails.logger,
@@ -25,13 +25,13 @@ module RailsSso
     def self.build_fake(url)
       build(url) do |conn|
         conn.adapter :test do |stub|
-          RailsSso.profile_mocks.each do |token, profile|
+          RailsSso.config.profile_mocks.each do |token, profile|
             headers = {
               "Content-Type" => "application/json",
               "Authorization" => "Bearer #{token}"
             }
 
-            stub.get(RailsSso.provider_profile_path, headers) do |env|
+            stub.get(RailsSso.config.provider_profile_path, headers) do |env|
               if profile.nil?
                 [401, { "Content-Type" => "application/json" }, ""]
               else

data/lib/rails_sso/configuration.rb

@@ -0,0 +1,61 @@
+module RailsSso
+  class Configuration
+    attr_accessor :application_controller
+    attr_accessor :magic_enabled
+
+    attr_writer :provider_url
+    attr_accessor :provider_name
+    attr_accessor :provider_key
+    attr_accessor :provider_secret
+
+    attr_accessor :provider_profile_path
+    attr_accessor :provider_sign_out_path
+
+    attr_accessor :use_cache
+
+    attr_reader :test_mode
+    attr_accessor :profile_mocks
+    attr_accessor :access_token_mock
+
+    attr_accessor :failure_app
+
+    def initialize
+      self.application_controller = "ApplicationController"
+      self.magic_enabled = true
+      self.use_cache = false
+      self.test_mode = false
+      self.profile_mocks = {}
+      self.access_token_mock = nil
+      self.failure_app = RailsSso::FailureApp
+    end
+
+    def provider_callback_path
+      "/sso/#{provider_name}/callback"
+    end
+
+    def oauth2_strategy_class
+      OmniAuth::Strategies.const_get("#{OmniAuth::Utils.camelize(provider_name.to_s)}")
+    end
+
+    def test_mode=(value)
+      @test_mode = value
+      OmniAuth.config.test_mode = value
+    end
+
+    def profile_mock
+      profile_mocks.fetch(access_token_mock) do
+        fail %Q{Mock "#{access_token_mock}" has not been setup!}
+      end
+    end
+
+    def test_mode?
+      @test_mode
+    end
+
+    def provider_url
+      fail RailsSso::Error, "Provider url not set!" if @provider_url.nil?
+
+      @provider_url
+    end
+  end
+end

data/lib/rails_sso/engine.rb

@@ -1,7 +1,7 @@
 module RailsSso
   class Engine < Rails::Engine
     initializer "sso.helpers" do
-      if RailsSso.magic_enabled
+      if RailsSso.config.magic_enabled
         ActiveSupport.on_load(:action_controller) do
           include RailsSso::Helpers
         end
@@ -9,8 +9,8 @@ module RailsSso
     end
 
     initializer "sso.omniauth", after: :load_config_initializers, before: :build_middleware_stack do |app|
-      if RailsSso.provider_name
-        RailsSso.oauth2_strategy_class.class_eval do
+      if RailsSso.config.provider_name
+        RailsSso.config.oauth2_strategy_class.class_eval do
           def setup_phase
             setup_sso!
 
@@ -34,24 +34,24 @@ module RailsSso
           end
 
           def sso_client
-            if RailsSso.test_mode
-              RailsSso::Client.build_fake(RailsSso.provider_url)
+            if RailsSso.config.test_mode
+              RailsSso::Client.build_fake(RailsSso.config.provider_url)
             else
-              RailsSso::Client.build_real(RailsSso.provider_url)
+              RailsSso::Client.build_real(RailsSso.config.provider_url)
             end
           end
         end
 
         app.config.middleware.use OmniAuth::Builder do
-          provider RailsSso.provider_name,
-            RailsSso.provider_key,
-            RailsSso.provider_secret,
-            callback_path: RailsSso.provider_callback_path
+          provider RailsSso.config.provider_name,
+            RailsSso.config.provider_key,
+            RailsSso.config.provider_secret,
+            callback_path: RailsSso.config.provider_callback_path
         end
 
         app.config.middleware.insert_after OmniAuth::Builder, Warden::Manager do |manager|
           manager.default_strategies :sso
-          manager.failure_app = RailsSso.failure_app
+          manager.failure_app = RailsSso.config.failure_app
         end
       end
     end

data/lib/rails_sso/sso_strategy.rb

@@ -22,7 +22,7 @@ module RailsSso
     private
 
     def access_token_mock
-      RailsSso.access_token_mock if RailsSso.test_mode
+      RailsSso.config.access_token_mock if RailsSso.config.test_mode
     end
   end
 end

data/lib/rails_sso/token_mock.rb

@@ -9,9 +9,17 @@ module RailsSso
     def initialize(*)
       @connection = Faraday.new do |builder|
         builder.adapter :test do |stub|
-          stub.delete(RailsSso.provider_sign_out_path) { |env| [200, {}, ''] }
+          stub.delete(RailsSso.config.provider_sign_out_path) { |env| [200, {}, ''] }
         end
       end
     end
+
+    def token
+      RailsSso.config.access_token_mock
+    end
+
+    def refresh_token
+      nil
+    end
   end
 end

data/lib/rails_sso/version.rb

@@ -1,3 +1,3 @@
 module RailsSso
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/test/dummy/log/test.log

@@ -709,3 +709,105 @@ RailsSso::AppTest: test_#fetch_user_data_when_invalid_token_returns_nil_and_rese
 ------------------------------------------------------------------------------------------
 RailsSso::AppTest: test_#fetch_user_data_when_stale_token_refreshes_token_and_returns_data
 ------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_create_should_save_access_token_and_redirect_to_root_path
+------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_destroy_should_invalidate_access_token_and_redirect_to_root_path
+-------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_create_should_save_access_token_and_redirect_to_root_path
+------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_destroy_should_invalidate_access_token_and_redirect_to_root_path
+-------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_create_should_save_access_token_and_redirect_to_root_path
+------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_destroy_should_invalidate_access_token_and_redirect_to_root_path
+-------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_create_should_save_access_token_and_redirect_to_root_path
+------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_destroy_should_invalidate_access_token_and_redirect_to_root_path
+-------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_create_should_save_access_token_and_redirect_to_root_path
+------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_destroy_should_invalidate_access_token_and_redirect_to_root_path
+-------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_create_should_save_access_token_and_redirect_to_root_path
+------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_destroy_should_invalidate_access_token_and_redirect_to_root_path
+-------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_create_should_save_access_token_and_redirect_to_root_path
+------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_destroy_should_invalidate_access_token_and_redirect_to_root_path
+-------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_create_should_save_access_token_and_redirect_to_root_path
+------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_destroy_should_invalidate_access_token_and_redirect_to_root_path
+-------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_create_should_save_access_token_and_redirect_to_root_path
+------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_destroy_should_invalidate_access_token_and_redirect_to_root_path
+-------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_destroy_should_invalidate_access_token_and_redirect_to_root_path
+-------------------------------------------------------------------------------------------------------
+Processing by RailsSso::SessionsController#destroy as HTML
+Redirected to http://test.host/
+Completed 302 Found in 0ms
+------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_create_should_save_access_token_and_redirect_to_root_path
+------------------------------------------------------------------------------------------------
+Processing by RailsSso::SessionsController#create as HTML
+  Parameters: {"provider"=>"developer"}
+Redirected to http://test.host/
+Completed 302 Found in 0ms
+------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_create_should_save_access_token_and_redirect_to_root_path
+------------------------------------------------------------------------------------------------
+Processing by RailsSso::SessionsController#create as HTML
+  Parameters: {"provider"=>"developer"}
+Redirected to http://test.host/
+Completed 302 Found in 0ms
+-------------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_destroy_should_invalidate_access_token_and_redirect_to_root_path
+-------------------------------------------------------------------------------------------------------
+Processing by RailsSso::SessionsController#destroy as HTML
+Redirected to http://test.host/
+Completed 302 Found in 0ms
+------------------------
+RailsSsoTest: test_truth
+------------------------
+-------------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_destroy_should_invalidate_access_token_and_redirect_to_root_path
+-------------------------------------------------------------------------------------------------------
+Processing by RailsSso::SessionsController#destroy as HTML
+Redirected to http://test.host/
+Completed 302 Found in 0ms
+------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_create_should_save_access_token_and_redirect_to_root_path
+------------------------------------------------------------------------------------------------
+Processing by RailsSso::SessionsController#create as HTML
+  Parameters: {"provider"=>"developer"}
+Redirected to http://test.host/
+Completed 302 Found in 0ms
+-------------------------------------------------------------------------
+RailsSso::ConfigurationTest: test_#provider_url_fails_if_not_yet_provided
+-------------------------------------------------------------------------
+-------------------------------------------------------------------------
+RailsSso::ConfigurationTest: test_#provider_url_fails_if_not_yet_provided
+-------------------------------------------------------------------------

data/test/lib/rails_sso/configuration_test.rb

@@ -0,0 +1,11 @@
+require "test_helper"
+
+class RailsSso::ConfigurationTest < ActiveSupport::TestCase
+  test "#provider_url fails if not yet provided" do
+    config = RailsSso::Configuration.new
+
+    assert_raises RailsSso::Error, "Provider url not set!" do
+      config.provider_url
+    end
+  end
+end

data/test/lib/rails_sso/sso_strategy_test.rb

@@ -18,8 +18,8 @@ class RailsSso::SsoStrategyTest < ActiveSupport::TestCase
   test "is valid when in test mode with access token mock" do
     env = { "rack.session" => {} }
     strategy = RailsSso::SsoStrategy.new(env)
-    RailsSso.stubs(:test_mode).returns(true)
-    RailsSso.stubs(:access_token_mock).returns("169783")
+    RailsSso.config.stubs(:test_mode).returns(true)
+    RailsSso.config.stubs(:access_token_mock).returns("169783")
 
     assert strategy.valid?
   end
@@ -27,8 +27,8 @@ class RailsSso::SsoStrategyTest < ActiveSupport::TestCase
   test "is invalid when in test mode without access token mock" do
     env = { "rack.session" => {} }
     strategy = RailsSso::SsoStrategy.new(env)
-    RailsSso.stubs(:test_mode).returns(true)
-    RailsSso.stubs(:access_token_mock).returns(nil)
+    RailsSso.config.stubs(:test_mode).returns(true)
+    RailsSso.config.stubs(:access_token_mock).returns(nil)
 
     refute strategy.valid?
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_sso
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Jan Dudulski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -141,6 +141,7 @@ files:
 - lib/rails_sso.rb
 - lib/rails_sso/app.rb
 - lib/rails_sso/client.rb
+- lib/rails_sso/configuration.rb
 - lib/rails_sso/engine.rb
 - lib/rails_sso/failure_app.rb
 - lib/rails_sso/helpers.rb
@@ -187,6 +188,7 @@ files:
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/lib/rails_sso/app_test.rb
+- test/lib/rails_sso/configuration_test.rb
 - test/lib/rails_sso/failure_app_test.rb
 - test/lib/rails_sso/response_error_test.rb
 - test/lib/rails_sso/sso_strategy_test.rb
@@ -224,6 +226,7 @@ test_files:
 - test/lib/rails_sso/sso_strategy_test.rb
 - test/lib/rails_sso/response_error_test.rb
 - test/lib/rails_sso/failure_app_test.rb
+- test/lib/rails_sso/configuration_test.rb
 - test/rails_sso_test.rb
 - test/test_helper.rb
 - test/routes/sso_routes_test.rb