rails_sso 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 293476ec400ac5ebb791ab9f9cbcd2295d01e615
-  data.tar.gz: 6e7b5864d01cca76d4c9fc042b582fc06f5e75f0
+  metadata.gz: 297b750c108836e79da3b03ad4cbfb84341a4854
+  data.tar.gz: e9f74bbd907a1a149327e8bce747ef3454d78aaa
 SHA512:
-  metadata.gz: f1745b2047f5ec91329f88d8a65a0b8ca16b6e0bfbf607fbb74260e6fe1433fc257cc803f7bab2fdc6f7ee5ed06674132c2bcde3c8cb3ea79b1696503552688e
-  data.tar.gz: 83798cf03f473f3425733f420d123f768d2212f6ff59e9ad2be3f34c321e1e3c14315ae9c023ca1177d6405ddedbf10eb12c1fb5dd3feadb542df3d5421cec75
+  metadata.gz: 62d7687593e7775cfa865c9bc56fcb6d49cef544da2f11ba8f7a1edac0a3a6e767784a7845a87aad73071a668d3c58d0b81828fd85cb1dbbdc6892824a91991f
+  data.tar.gz: dd07477eb293f068fccf01886dd68d225f0efda7cc0456623a402de8b08824340eafdc2b56a1d5bcbd66d9b27857a2089b69ee895f74d0edb2c7ca392eccea07

data/README.md

@@ -35,16 +35,6 @@ RailsSso.configure do |config|
   config.provider_sign_out_path = '/api/v1/session'
   # enable cache (will use Rails.cache store)
   config.use_cache = Rails.application.config.action_controller.perform_caching
-
-  # user fields to synchronize from API
-  config.user_fields = [
-    :email,
-    :name,
-    :roles
-  ]
-
-  # user repository class name
-  config.user_repository = 'UserRepository'
 end
 ```
 
@@ -62,7 +52,7 @@ end
 
 Available helpers for controllers and views:
 
-* `current_user`
+* `current_user_data`
 * `user_signed_in?`
 
 Available filters and helpers for controllers:
@@ -76,43 +66,6 @@ Available helpers for views:
 * `sso.sign_in_path`
 * `sso.sign_out_path`
 
-## User Repository
-
-Required methods:
-
-* `find_by_sso_id(id)`
-* `create_with_sso_id(id, attrs)`
-* `update(record, attrs)`
-
-Example with `ActiveRecord` user model:
-
-```ruby
-# app/repositories/user_repository.rb
-
-class UserRepository
-  attr_accessor :adapter
-
-  def initialize(adapter = User)
-    self.adapter = adapter
-  end
-
-  def find_by_sso_id(id)
-    adapter.find_by(sso_id: id)
-  end
-
-  def create_with_sso_id(id, attrs)
-    adapter.new(attrs) do |user|
-      user.sso_id = id
-      user.save!
-    end
-  end
-
-  def update(record, attrs)
-    adapter.update(record.id, attrs)
-  end
-end
-```
-
 ## Contributing
 
 1. Fork it

data/app/services/rails_sso/fetch_user.rb

@@ -5,15 +5,11 @@ module RailsSso
     end
 
     def call
-      yield(get)
+      access_token.get(RailsSso.provider_profile_path).parsed
     end
 
     private
 
     attr_reader :access_token
-
-    def get
-      access_token.get(RailsSso.provider_profile_path).parsed
-    end
   end
 end

data/lib/rails_sso/access_token.rb

@@ -26,9 +26,9 @@ module RailsSso
 
     private
 
-    def client
+    def client(cache = RailsSso.use_cache)
       strategy.client.tap do |c|
-        if RailsSso.use_cache
+        if cache
           c.options[:connection_build] = Proc.new do |conn|
             conn.use :http_cache,
               store: Rails.cache,

data/lib/rails_sso/helpers.rb

@@ -2,18 +2,16 @@ module RailsSso
   module Helpers
     def self.included(base)
       base.class_eval do
-        helper_method :current_user, :user_signed_in?
+        helper_method :current_user_data, :user_signed_in?
       end
     end
 
-    def current_user
-      @current_user ||= fetch_user do |user|
-        cache_user(user)
-      end
+    def current_user_data
+      @current_user ||= fetch_user
     end
 
     def user_signed_in?
-      !!current_user
+      !!current_user_data
     end
 
     def authenticate_user!
@@ -56,16 +54,5 @@ module RailsSso
         RailsSso::FetchUser.new(access_token).call(&block)
       end
     end
-
-    def cache_user(data)
-      RailsSso::UpdateUser.new(data, update_user_options).call
-    end
-
-    def update_user_options
-      {
-        fields: RailsSso.user_fields,
-        repository: RailsSso.user_repository.new
-      }
-    end
   end
 end

data/lib/rails_sso/version.rb

@@ -1,3 +1,3 @@
 module RailsSso
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/rails_sso.rb

@@ -9,11 +9,6 @@ module RailsSso
   mattr_accessor :provider_profile_path
   mattr_accessor :provider_sign_out_path
 
-  mattr_accessor :user_repository
-
-  mattr_accessor :user_fields
-  @@user_fields = [:email]
-
   mattr_accessor :use_cache
   @@use_cache = false
 

data/test/dummy/config/initializers/sso.rb

@@ -5,9 +5,4 @@ RailsSso.configure do |config|
   config.provider_profile_path = '/api/v1/me'
   config.provider_sign_out_path = '/api/v1/me'
   config.use_cache = false
-  config.user_fields = [
-    :email,
-    :name
-  ]
-  config.user_repository = 'UserRepository'
 end

data/test/dummy/log/test.log

@@ -2371,3 +2371,165 @@ Completed 302 Found in 0ms (ActiveRecord: 0.0ms)
 RailsSsoTest: test_truth
 ------------------------
    (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_create_should_save_access_token_and_redirect_to_root_path
+------------------------------------------------------------------------------------------------
+Processing by RailsSso::SessionsController#create as HTML
+  Parameters: {"provider"=>"developer"}
+nil
+Redirected to http://test.host/
+Completed 302 Found in 0ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------------------------------------------------------------------------
+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 (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+--------------------------------------------------------------------------------------------
+RailsSso::FetchUserTest: test_call_should_fetch_user_with_access_token_and_yield_parsed_data
+--------------------------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+--------------------------------------------------------------------------------------------
+RailsSso::UpdateUserTest: test_call_should_update_user_if_exists_in_repository_and_return_it
+--------------------------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------------------------------------------------------
+RailsSso::UpdateUserTest: test_call_should_create_user_if_not_exists_in_repository_and_return_it
+------------------------------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------
+RailsSsoTest: test_truth
+------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------
+SsoRoutesTest: test_should_route_/:provider/callback
+----------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------
+SsoRoutesTest: test_should_route_/sign_out
+------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+--------------------------------------------------------------------------------------------
+RailsSso::FetchUserTest: test_call_should_fetch_user_with_access_token_and_yield_parsed_data
+--------------------------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------
+SsoRoutesTest: test_should_route_/sign_out
+------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------
+SsoRoutesTest: test_should_route_/:provider/callback
+----------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_create_should_save_access_token_and_redirect_to_root_path
+------------------------------------------------------------------------------------------------
+Processing by RailsSso::SessionsController#create as HTML
+  Parameters: {"provider"=>"developer"}
+nil
+Redirected to http://test.host/
+Completed 302 Found in 0ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------------------------------------------------------------------
+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 (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------
+RailsSsoTest: test_truth
+------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------------------------------------------------------------------------
+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 (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_create_should_save_access_token_and_redirect_to_root_path
+------------------------------------------------------------------------------------------------
+Processing by RailsSso::SessionsController#create as HTML
+  Parameters: {"provider"=>"developer"}
+nil
+Redirected to http://test.host/
+Completed 302 Found in 0ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------------------------------------------------------------
+RailsSso::FetchUserTest: test_call_should_fetch_user_with_access_token_and_return_parsed_data
+---------------------------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------
+SsoRoutesTest: test_should_route_/:provider/callback
+----------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------
+SsoRoutesTest: test_should_route_/sign_out
+------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------
+RailsSsoTest: test_truth
+------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------
+RailsSsoTest: test_truth
+------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------------------------------------------------------------------------
+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 (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------------------------------------------------
+RailsSso::SessionsControllerTest: test_create_should_save_access_token_and_redirect_to_root_path
+------------------------------------------------------------------------------------------------
+Processing by RailsSso::SessionsController#create as HTML
+  Parameters: {"provider"=>"developer"}
+nil
+Redirected to http://test.host/
+Completed 302 Found in 0ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------------------------------------------------------------
+RailsSso::FetchUserTest: test_call_should_fetch_user_with_access_token_and_return_parsed_data
+---------------------------------------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------
+SsoRoutesTest: test_should_route_/:provider/callback
+----------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------
+SsoRoutesTest: test_should_route_/sign_out
+------------------------------------------
+   (0.1ms)  rollback transaction

data/test/services/rails_sso/fetch_user_test.rb

@@ -15,17 +15,11 @@ class RailsSso::FetchUserTest < ActiveSupport::TestCase
     @access_token = AccessToken.new(setup_access_token_client)
   end
 
-  test "call should fetch user with access token and yield parsed data" do
-    called = false
+  test "call should fetch user with access token and return parsed data" do
+    data = RailsSso::FetchUser.new(@access_token).call
 
-    RailsSso::FetchUser.new(@access_token).call do |data|
-      called = true
-
-      assert_equal data['name'], user_data['name']
-      assert_equal data['email'], user_data['email']
-    end
-
-    assert called, 'RailsSso::FetchUser#call should yield fetched data'
+    assert_equal data['name'], user_data['name']
+    assert_equal data['email'], user_data['email']
   end
 
   def setup_access_token_client
@@ -39,8 +33,7 @@ class RailsSso::FetchUserTest < ActiveSupport::TestCase
   def user_data
     {
       'name' => 'Kowalski',
-      'email' => 'jan@kowalski.pl',
-      'key' => 'value'
+      'email' => 'jan@kowalski.pl'
     }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_sso
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Jan Dudulski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -106,7 +106,6 @@ files:
 - Rakefile
 - app/controllers/rails_sso/sessions_controller.rb
 - app/services/rails_sso/fetch_user.rb
-- app/services/rails_sso/update_user.rb
 - config/initializers/omniauth.rb
 - config/routes.rb
 - lib/rails_sso.rb
@@ -156,7 +155,6 @@ files:
 - test/rails_sso_test.rb
 - test/routes/sso_routes_test.rb
 - test/services/rails_sso/fetch_user_test.rb
-- test/services/rails_sso/update_user_test.rb
 - test/test_helper.rb
 homepage: https://github.com/monterail/rails_sso
 licenses:
@@ -187,7 +185,6 @@ test_files:
 - test/rails_sso_test.rb
 - test/test_helper.rb
 - test/services/rails_sso/fetch_user_test.rb
-- test/services/rails_sso/update_user_test.rb
 - test/dummy/README.rdoc
 - test/dummy/db/test.sqlite3
 - test/dummy/public/favicon.ico

data/app/services/rails_sso/update_user.rb

@@ -1,29 +0,0 @@
-module RailsSso
-  class UpdateUser
-    def initialize(data, options = {})
-      @id, @data = data['id'], data.except('id')
-      @fields, @repository = options.values_at(:fields, :repository)
-    end
-
-    def call
-      if user = repository.find_by_sso_id(id)
-        repository.update(user, params)
-        user
-      else
-        repository.create_with_sso_id(id, params)
-      end
-    end
-
-    private
-
-    attr_reader :id, :data, :repository
-
-    def fields
-      @fields.map(&:to_s)
-    end
-
-    def params
-      data.slice(*fields)
-    end
-  end
-end

data/test/services/rails_sso/update_user_test.rb

@@ -1,79 +0,0 @@
-require 'anima'
-require 'test_helper'
-
-class RailsSso::UpdateUserTest < ActiveSupport::TestCase
-  class User
-    include Anima.new('email', 'name')
-
-    attr_accessor :id
-    attr_writer :name, :email
-  end
-
-  class Repository
-    attr_reader :storage
-
-    def initialize
-      @storage = {}
-    end
-
-    def find_by_sso_id(id)
-      storage[id]
-    end
-
-    def create_with_sso_id(id, data)
-      @storage[id] = User.new(data).tap do |user|
-        user.id = id
-      end
-    end
-
-    def update(user, params)
-      params.each do |k, v|
-        user.send("#{k}=", v)
-      end
-    end
-  end
-
-  def setup
-    @repository = Repository.new
-
-    @options = {
-      repository: @repository,
-      fields: [:name, :email]
-    }
-
-    @data = {
-      'id' => 1,
-      'name' => 'Kowalski',
-      'email' => 'jan@kowalski.pl',
-      'key' => 'value'
-    }
-  end
-
-  test "call should create user if not exists in repository and return it" do
-    output = RailsSso::UpdateUser.new(@data, @options).call
-
-    assert_equal_user(@data, output)
-
-    user = @repository.find_by_sso_id(@data['id'])
-
-    assert_equal_user(@data, user)
-  end
-
-  test "call should update user if exists in repository and return it" do
-    @repository.create_with_sso_id(@data['id'], { 'email' => 'test@example.com', 'name' => 'Nowak' })
-
-    output = RailsSso::UpdateUser.new(@data, @options).call
-
-    assert_equal_user(@data, output)
-
-    user = @repository.find_by_sso_id(@data['id'])
-
-    assert_equal_user(@data, user)
-  end
-
-  def assert_equal_user(data, user)
-    assert_equal data['id'], user.id
-    assert_equal data['email'], user.email
-    assert_equal data['name'], user.name
-  end
-end