sso-auth 0.0.1 → 0.0.1.1

data/app/controllers/sso_auth/omniauth_callbacks_controller.rb

@@ -2,17 +2,8 @@
 
 class SsoAuth::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def identity
-    user = User.find_or_initialize_by_uid(request.env['omniauth.auth']['uid']).tap do |user|
-      attributes = request.env['omniauth.auth']['extra']['raw_info']['user']
-      attributes = attributes.merge(request.env['omniauth.auth']['info'])
-      attributes.each do |attribute, value|
-        user.send("#{attribute}=", value) if user.respond_to?("#{attribute}=")
-      end
-      user.save(:validate => false)
-    end
-
-    flash[:notice] = I18n.t "devise.omniauth_callbacks.success", :kind => "системы аутентификации"
-    sign_in user, :event => :authentication
+    sign_in User.find_or_create_by_omniauth_hash(request.env['omniauth.auth']), :event => :authentication
+    flash[:notice] = I18n.t('devise.omniauth_callbacks.success', :kind => I18n.t('sso-auth.provider.title'))
     redirect_to stored_location_for(:user) || main_app.root_path
   end
 

data/config/locales/en.yml

@@ -1,4 +1,8 @@
-ru:
+en:
+  sso-auth:
+    provider:
+      title:                  Identity
+
   activerecord:
     attributes:
       permission:

data/config/locales/ru.yml

@@ -1,4 +1,8 @@
 ru:
+  sso-auth:
+    provider:
+      title:                  Системы аутентификации
+
   activerecord:
     attributes:
       permission:

data/lib/generators/sso-auth/install/templates/db/migrate/create_permissions.rb

@@ -6,6 +6,6 @@ class CreatePermissions < ActiveRecord::Migration
       t.string :role
       t.timestamps
     end
-    add_index :permissions, [:user_id, :role, :context_id, :context_type], :name => 'by_user_and_role_and_context'
+    add_index :permissions, [:user_id, :role, :context_id, :context_type], :name => 'by_user_and_role_and_context', :uniq => true
   end
 end

data/lib/sso-auth/engine.rb

@@ -23,18 +23,22 @@ module SsoAuth
 
     config.to_prepare do
       ActionController::Base.class_eval do
-        define_singleton_method :sso_load_and_authorize_resource do
+        define_singleton_method :sso_authenticate_and_authorize do
           before_filter :authenticate_user!
-          before_filter :authorize_user_can_manage_application!
-          load_and_authorize_resource
+          before_filter :authorize_manage_application!
           rescue_from CanCan::AccessDenied do |exception|
             render :file => "#{Rails.root}/public/403", :formats => [:html], :status => 403, :layout => false
           end
         end
 
+        define_singleton_method :sso_load_and_authorize_resource do
+          sso_authenticate_and_authorize
+          load_and_authorize_resource
+        end
+
         protected
 
-        define_method :authorize_user_can_manage_application! do
+        define_method :authorize_manage_application! do
           authorize! :manage, :application
         end
       end
@@ -56,6 +60,19 @@ module SsoAuth
           define_method :sso_auth_name do
             email? ? "#{name} <#{email}>" : name
           end
+
+          define_singleton_method :find_or_create_by_omniauth_hash do |omniauth_hash|
+            user = User.find_by_uid(omniauth_hash[:uid])
+            user ||= User.find_by_email(omniauth_hash[:info][:email]) if omniauth_hash[:info][:email].present?
+            user ||= User.new { |user| user.uid = omniauth_hash[:uid] }
+            attributes = omniauth_hash[:extra][:raw_info][:user] || {}
+            attributes = attributes.merge(omniauth_hash[:info])
+            attributes.each do |attribute, value|
+              user.send("#{attribute}=", value) if user.respond_to?("#{attribute}=")
+            end
+            user.save(:validate => false)
+            user
+          end
         end
 
         def self.sso_auth_permission(options)

data/lib/sso-auth/spec_helper.rb

@@ -8,7 +8,10 @@ module SsoAuth
     def create_user
       @sequence ||= 0
       @sequence += 1
-      User.create! :uid => @sequence, :name => "user #{@sequence}"
+      User.new.tap do |user|
+        user.uid = @sequence
+        user.save(:validate => false)
+      end
     end
 
     def user_with_role(role, context=nil, prefix=nil)

data/lib/sso-auth/version.rb

@@ -1,3 +1,3 @@
 module SsoAuth
-  VERSION = "0.0.1"
+  VERSION = "0.0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sso-auth
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancan
@@ -217,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4589756721612764360
+      hash: 2057994539849800836
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4589756721612764360
+      hash: 2057994539849800836
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24