sso_client 0.0.8 → 0.0.9

data/app/controllers/sso_client/omniauth_callbacks_controller.rb

@@ -0,0 +1,8 @@
+class SsoClient::OmniauthCallbacksController < Devise::OmniauthCallbacksController
+  def identity
+    user = User.from_omniauth(request.env['omniauth.auth'])
+    flash[:notice] = I18n.t "devise.omniauth_callbacks.success", :kind => "Identity"
+    sign_in user, :event => :authentication
+    redirect_to stored_location_for(:user) || main_app.root_path
+  end
+end

data/app/controllers/sso_client/sessions_controller.rb

@@ -0,0 +1,19 @@
+class SsoClient::SessionsController < Devise::SessionsController
+  def new
+    redirect_to '/sso/auth/identity'
+  end
+  def destroy
+    sign_out :user
+    redirect_to "#{Settings['sso_provider.host']}/users/sign_out?redirect_uri=#{CGI.escape(redirect_uri)}"
+  end
+
+  protected
+
+    def redirect_uri
+      URI.parse(request.url).tap do | uri |
+        uri.path = main_app.root_path
+        uri.query = nil
+      end.to_s
+    end
+
+end

data/app/models/user.rb

@@ -0,0 +1,32 @@
+class User < ActiveRecord::Base
+  devise :omniauthable, :trackable, :timeoutable
+
+  def self.from_omniauth(hash)
+    User.find_or_initialize_by_uid(hash['uid']).tap do |user|
+      user.update_attributes hash['info']
+    end
+  end
+end
+
+
+
+# == Schema Information
+#
+# Table name: users
+#
+#  id                     :integer         not null, primary key
+#  email                  :string(255)     default(""), not null
+#  encrypted_password     :string(128)     default(""), not null
+#  reset_password_token   :string(255)
+#  reset_password_sent_at :datetime
+#  remember_created_at    :datetime
+#  sign_in_count          :integer         default(0)
+#  current_sign_in_at     :datetime
+#  last_sign_in_at        :datetime
+#  current_sign_in_ip     :string(255)
+#  last_sign_in_ip        :string(255)
+#  created_at             :datetime
+#  updated_at             :datetime
+#  name                   :string(255)
+#
+

data/config/initializers/devise.rb

@@ -0,0 +1,75 @@
+# Use this hook to configure devise mailer, warden hooks and so forth.
+# Many of these configuration options can be set straight in your model.
+Devise.setup do |config|
+  # ==> ORM configuration
+  # Load and configure the ORM. Supports :active_record (default) and
+  # :mongoid (bson_ext recommended) by default. Other ORMs may be
+  # available as additional gems.
+  require 'devise/orm/active_record'
+
+  # ==> Configuration for :timeoutable
+  # The time you want to timeout the user session without activity. After this
+  # time the user will be asked for credentials again. Default is 30 minutes.
+  # config.timeout_in = 30.minutes
+
+  # ==> Configuration for :lockable
+  # Defines which strategy will be used to lock an account.
+  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
+  # :none            = No lock strategy. You should handle locking by yourself.
+  # config.lock_strategy = :failed_attempts
+
+  # Defines which key will be used when locking and unlocking an account
+  # config.unlock_keys = [ :email ]
+
+  # Defines which strategy will be used to unlock an account.
+  # :email = Sends an unlock link to the user email
+  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
+  # :both  = Enables both strategies
+  # :none  = No unlock strategy. You should handle unlocking by yourself.
+  # config.unlock_strategy = :both
+
+  # Number of authentication tries before locking an account if lock_strategy
+  # is failed attempts.
+  # config.maximum_attempts = 20
+
+  # Time interval to unlock the account if :time is enabled as unlock_strategy.
+  # config.unlock_in = 1.hour
+
+  # ==> Configuration for :token_authenticatable
+  # Defines name of the authentication token params key
+  # config.token_authentication_key = :auth_token
+
+  # If true, authentication through token does not store user in session and needs
+  # to be supplied on each request. Useful if you are using the token as API token.
+  # config.stateless_token = false
+
+  # ==> Scopes configuration
+  # Turn scoped views on. Before rendering "sessions/new", it will first check for
+  # "users/sessions/new". It's turned off by default because it's slower if you
+  # are using only default views.
+  # config.scoped_views = false
+
+  # Configure the default scope given to Warden. By default it's the first
+  # devise role declared in your routes (usually :user).
+  # config.default_scope = :user
+
+  # Configure sign_out behavior.
+  # Sign_out action can be scoped (i.e. /users/sign_out affects only :user scope).
+  # The default is true, which means any logout action will sign out all active scopes.
+  # config.sign_out_all_scopes = true
+
+  # ==> Navigation configuration
+  # Lists the formats that should be treated as navigational. Formats like
+  # :html, should redirect to the sign in page when the user does not have
+  # access, but formats like :xml or :json, should return 401.
+  #
+  # If you have any extra navigational formats, like :iphone or :mobile, you
+  # should add them to the navigational formats lists.
+  #
+  # The :"*/*" and "*/*" formats below is required to match Internet
+  # Explorer requests.
+  # config.navigational_formats = [:"*/*", "*/*", :html]
+
+  # The default HTTP method used to sign out a resource. Default is :delete.
+  config.sign_out_via = :delete
+end

data/config/routes.rb

@@ -1,14 +1,12 @@
-SsoClient::Engine.routes.draw do
-  root :to => 'home#show'
-
-  # omniauth
-  get "/:provider/callback", :to => 'user_sessions#create'
-  get "/failure", :to => 'user_sessions#failure'
-
-  # logout
-  get "/logout", :to => 'user_sessions#destroy', :as => :logout
-end
-
 Rails.application.routes.draw do
-  mount SsoClient::Engine => "/sso"
+  devise_for :users,
+             :path => 'sso',
+             :skip => [:registrations, :passwords, :confirmations],
+             :controllers => {:omniauth_callbacks => "sso_client/omniauth_callbacks"} do
+    get '/sso/sign_in' => redirect('/sso/auth/identity'), :as => :new_user_session
+    get "/sso/sign_out", :to => "sso_client/sessions#destroy"
+  end
+
+  get '/sso/auth/identity', :as => :sign_on
+  get "/sso/sign_out", :as => :sign_out
 end

data/db/migrate/20111212032401_recreate_users.rb

@@ -0,0 +1,24 @@
+class RecreateUsers < ActiveRecord::Migration
+  def change
+    drop_table :users rescue nil
+
+    create_table :users do | t |
+      t.string  :uid            # omniauth[:uid]
+      t.text    :name,          # omniauth[:info]
+                :email,
+                :nickname,
+                :first_name,
+                :last_name,
+                :location,
+                :description,
+                :image,
+                :phone,
+                :urls
+      t.text    :raw_info       # omniauth[:extra]
+      t.trackable
+      t.timestamps
+    end
+
+    add_index :users, :uid
+  end
+end

data/lib/sso_client/engine.rb

@@ -1,4 +1,4 @@
-require 'omniauth'
+require 'devise'
 require File.expand_path("../../../lib/omniauth/strategies/identity", __FILE__)
 
 module SsoClient
@@ -9,11 +9,10 @@ module SsoClient
       raise 'Please specify sso_provider.host in settings.yml' unless defined?(Settings) && Settings[:sso_provider]
     end
 
-    middleware.use OmniAuth::Builder do
-      configure do | config |
-        config.path_prefix = ''
+    initializer "sso_client.devise", :before => 'devise.omniauth' do |app|
+      Devise.setup do |config|
+        config.omniauth :identity, Settings['sso_provider.app_id'], Settings['sso_provider.app_secret'], :client_options => {:site => Settings['sso_provider.host']}
       end
-      provider :identity, Settings['sso_provider.app_id'], Settings['sso_provider.app_secret'], :client_options => {:site => Settings['sso_provider.host']}
     end
   end
 end

data/lib/sso_client/version.rb

@@ -1,3 +1,3 @@
 module SsoClient
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sso_client
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-12 00:00:00.000000000 Z
+date: 2011-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &14446380 !ruby/object:Gem::Requirement
+  requirement: &5090740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *14446380
+  version_requirements: *5090740
 - !ruby/object:Gem::Dependency
   name: configliere
-  requirement: &14445540 !ruby/object:Gem::Requirement
+  requirement: &5090100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,32 +32,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14445540
+  version_requirements: *5090100
 - !ruby/object:Gem::Dependency
-  name: omniauth
-  requirement: &14443960 !ruby/object:Gem::Requirement
+  name: devise
+  requirement: &5088780 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14443960
+  version_requirements: *5088780
 - !ruby/object:Gem::Dependency
-  name: omniauth-oauth2
-  requirement: &14442980 !ruby/object:Gem::Requirement
+  name: omniauth
+  requirement: &5085300 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *14442980
+  version_requirements: *5085300
 - !ruby/object:Gem::Dependency
-  name: openteam-modest_model
-  requirement: &14457800 !ruby/object:Gem::Requirement
+  name: omniauth-oauth2
+  requirement: &5122140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14457800
+  version_requirements: *5122140
 - !ruby/object:Gem::Dependency
   name: fabrication
-  requirement: &14456400 !ruby/object:Gem::Requirement
+  requirement: &5121140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14456400
+  version_requirements: *5121140
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &14455620 !ruby/object:Gem::Requirement
+  requirement: &5120280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14455620
+  version_requirements: *5120280
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &14454740 !ruby/object:Gem::Requirement
+  requirement: &5119600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14454740
+  version_requirements: *5119600
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &14453720 !ruby/object:Gem::Requirement
+  requirement: &5118640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14453720
+  version_requirements: *5118640
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &14452880 !ruby/object:Gem::Requirement
+  requirement: &5117420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14452880
+  version_requirements: *5117420
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &14451660 !ruby/object:Gem::Requirement
+  requirement: &5116020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *14451660
+  version_requirements: *5116020
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &14466900 !ruby/object:Gem::Requirement
+  requirement: &5114540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14466900
+  version_requirements: *5114540
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &14465940 !ruby/object:Gem::Requirement
+  requirement: &5149020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.9.0.rc9
   type: :development
   prerelease: false
-  version_requirements: *14465940
+  version_requirements: *5149020
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &14465160 !ruby/object:Gem::Requirement
+  requirement: &5147260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14465160
+  version_requirements: *5147260
 description: Client gem for connecting to SSO server (http://github.com/openteam/sso_server)
 email:
 - lda@openteam.ru
@@ -172,15 +172,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/stylesheets/sso_client/application.css
-- app/helpers/sso_client/application_helper.rb
-- app/models/sso_client/user.rb
-- app/controllers/sso_client/home_controller.rb
-- app/controllers/sso_client/application_controller.rb
-- app/controllers/sso_client/user_sessions_controller.rb
-- app/views/sso_client/home/show.html.erb
-- app/views/layouts/sso_client/application.html.erb
+- app/models/user.rb
+- app/controllers/sso_client/sessions_controller.rb
+- app/controllers/sso_client/omniauth_callbacks_controller.rb
+- config/initializers/devise.rb
 - config/routes.rb
+- db/migrate/20111212032401_recreate_users.rb
 - lib/omniauth/strategies/identity.rb
 - lib/sso_client/engine.rb
 - lib/sso_client/version.rb
@@ -203,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2428864371954815916
+      hash: 1651071190687628169
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -212,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2428864371954815916
+      hash: 1651071190687628169
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11

data/app/assets/stylesheets/sso_client/application.css

@@ -1,7 +0,0 @@
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
- *= require_self
- *= require_tree . 
-*/

data/app/controllers/sso_client/application_controller.rb

@@ -1,25 +0,0 @@
-module SsoClient
-  class ApplicationController < ActionController::Base
-    protect_from_forgery
-    helper_method :current_user
-
-    protected
-
-    def login_required
-      if !current_user
-        respond_to do |format|
-          format.html  {
-            redirect_to "#{sso_client.root_path}identity"
-          }
-          format.json {
-            render :json => { 'error' => 'Access Denied' }.to_json
-          }
-        end
-      end
-    end
-
-    def current_user
-      session[:user]
-    end
-  end
-end

data/app/controllers/sso_client/home_controller.rb

@@ -1,8 +0,0 @@
-module SsoClient
-  class HomeController < ApplicationController
-    before_filter :login_required
-
-    def show
-    end
-  end
-end

data/app/controllers/sso_client/user_sessions_controller.rb

@@ -1,30 +0,0 @@
-module SsoClient
-  class UserSessionsController < ApplicationController
-    before_filter :login_required, :only => :destroy
-
-    respond_to :html
-
-    # Omniauth callback method
-    def create
-      session[:user] = User.from_omniauth(request.env['omniauth.auth'])
-
-      flash[:notice] = "Successfully logged in"
-      redirect_to main_app.root_path
-    end
-
-    # Omniauth failure callback
-    def failure
-      flash[:notice] = params[:message]
-      redirect_to main_app.root_path
-    end
-
-    # logout - Clear our rack session BUT essentially redirect to the provider
-    # to clean up the Devise session from there too !
-    def destroy
-      session[:user] = nil
-
-      flash[:notice] = 'You have successfully signed out!'
-      redirect_to "#{Settings['sso_provider.host']}/users/sign_out"
-    end
-  end
-end

data/app/helpers/sso_client/application_helper.rb

@@ -1,4 +0,0 @@
-module SsoClient
-  module ApplicationHelper
-  end
-end

data/app/models/sso_client/user.rb

@@ -1,39 +0,0 @@
-require 'modest_model'
-require 'modest_model/tenacity'
-
-module SsoClient
-  class User < ModestModel::Base
-    include ModestModel::Tenacity
-
-    attributes :id, :name, :nickname, :email, :first_name, :last_name, :raw_info
-
-    class << self
-      def from_omniauth(omniauth)
-        User.new(omniauth['info']).tap do | user |
-          user.attributes = omniauth['extra']
-          user.id = omniauth['uid']
-        end
-      end
-
-      def current
-        Thread.current[:user]
-      end
-
-      def current_id
-        current.id if current
-      end
-
-      def current=(user)
-        Thread.current[:user] = user
-      end
-    end
-
-    def new_record?
-      false
-    end
-
-    def persisted?
-      !new_record?
-    end
-  end
-end

data/app/views/layouts/sso_client/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>SsoClient</title>
-  <%= stylesheet_link_tag    "sso_client/application" %>
-  <%= javascript_include_tag "sso_client/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>

data/app/views/sso_client/home/show.html.erb

@@ -1,10 +0,0 @@
-<% if flash[:notice] %>
-  <p><%=flash[:notice] %> </p>
-  <% flash[:notice] = nil %>
-<% end %>
-<% if not current_user %>
-  <%= link_to 'login', login_path %>
-<% else %>
-  <h1>Hello <%= current_user.name %>!</h1>
-  <%= link_to 'logout', logout_path %>
-<% end %>