multiauth 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/app/controllers/multiauth/sessions_controller.rb

@@ -0,0 +1,33 @@
+module Multiauth
+  class SessionsController < ApplicationController
+    def new
+    end
+
+    def auth
+      # see http://github.com/intridea/omniauth/wiki/Auth-Hash-Schema
+      if logged_in?
+        self.current_user.connect(params['auth'] || request.env['rack.auth'])
+      else
+        self.current_user = User.authenticate(params['auth'] || request.env['rack.auth'])
+      end
+
+      if logged_in?
+        redirect_to root_path
+      else
+        render 'new'
+      end
+    end
+
+    def failure
+      flash.now[:error] = params[:message]
+      render 'new'
+    end
+
+    def destroy
+      self.current_user = nil
+      redirect_to root_path
+    end
+
+    protected
+  end
+end

data/app/views/multiauth/_box.html.erb

@@ -14,7 +14,7 @@
             <% providers.each_slice(3) do |column| %>
               <div class="column">
                 <% column.each do |provider, config| %>
-                  <a id="btn_<%= count+=1 %>" class="<%= provider %> openid_btn <%= config[:class] %>" title="<%= provider %>" href="<%= config[:url].kind_of?(Proc) ? instance_exec(&config[:url]) : config[:url] %>" data-real="<%= config[:real] || false %>"></a>
+                  <a id="btn_<%= count+=1 %>" class="<%= provider %> openid_btn <%= config[:class] %>" title="<%= provider %>" href="/auth/<%= config["openid"] ? "open_id?openid_url=#{config["openid"]}" : "#{provider.downcase}" %>"></a>
                 <% end %>
               </div>
             <% end %>

data/app/views/multiauth/sessions/new.html.haml

@@ -0,0 +1 @@
+= multiauth_box

data/lib/generators/multiauth/multiauth_generator.rb

@@ -11,8 +11,8 @@ module Multiauth
         copy_file "multiauth.js", "public/javascripts/multiauth.js"
       end
 
-      def copy_twitter
-        copy_file "devise_twitter.rb", "config/initializers/devise_twitter.rb"
+      def copy_config_file
+        copy_file "auth_providers.yml", "config/auth_providers.yml"
       end
 
       def show_readme

data/lib/generators/templates/README

@@ -3,98 +3,57 @@
 
 Some setup you must do manually if you haven't yet:
 
-  1. configure your model, for example:
-
-     class User
-       devise :database_authenticatable, :openid_authenticatable, :rememberable,
-              :trackable, :validatable, :twitter_oauth, :oauthable
-
-       def self.find_for_github_oauth(access_token, signed_in_resource=nil)
-        data = ActiveSupport::JSON.decode(access_token.get('/api/v2/json/user/show'))["user"]
-
-        if user = User.find_by_email(data["email"])
-          user
-        else
-          User.create!(:name => data["name"], :email => data["email"],
-                       :github_id => data["id"])
+1. configure your User model (mongo_mapper example):
+
+    class User
+      ...
+      key :auth_keys, Array
+
+      def self.authenticate(fields)
+        auth_key = "#{fields["provider"]}_#{fields["uid"]}"
+        user = User.first(:auth_keys => auth_key)
+        if user.nil?
+          user = User.new(:auth_keys => [auth_key])
+          user.send(:auth_fields=, fields["user_info"])
+          user.save!
         end
-      end
-
-      def self.find_for_facebook_oauth(access_token, signed_in_resource=nil)
-        data = ActiveSupport::JSON.decode(access_token.get('/me'))
 
-        if user = User.find_by_email(data["email"])
-          user
-        else
-          User.create!(:name => data["name"], :email => data["email"],
-                       :facebook_id => data["id"], :facebook_profile => data["link"])
-        end
+        user
       end
 
-      def self.create_from_identity_url(identity_url)
-        self.create(:identity_url => identity_url)
-      end
+      def connect(fields)
+        auth_key = "#{fields["provider"]}_#{fields["uid"]}"
+        user = User.first(:auth_keys => auth_key, :select => [:id])
+        if user.present? && user.id != self.id
+          user.destroy if merge_account(user)
+        end
 
-      def self.openid_required_fields
-        ["fullname", "email", "http://axschema.org/pref/language", "http://axschema.org/contact/email"]
+        self.push_uniq(:auth_keys => auth_key)
       end
 
-      def self.openid_optional_fields
-        %w[
-          http://axschema.org/namePerson/friendly
-          http://axschema.org/namePerson
-          http://axschema.org/birthDate
-          gender
-          http://axschema.org/person/gender
-          http://axschema.org/contact/postalCode/home
-          country
-          http://axschema.org/contact/country/home
-          language
-          http://axschema.org/pref/language
-          http://axschema.org/pref/timezone
-        ]
+      def merge_account(other_user)
+        # return true to delete the old user
+        true
       end
 
-      def openid_fields=(fields)
-        logger.info "OPENID FIELDS: #{fields.inspect}"
-        fields.each do |key, value|
-          if value.is_a? Array
-            value = value.first
-          end
-
-          case key.to_s
-          when "fullname", "http://axschema.org/namePerson"
-            self.full_name = value
-          when "email", "http://axschema.org/contact/email"
-            self.email = value
-          when "gender", "http://axschema.org/person/gender"
-            self.gender = value
-          else
-            logger.error "Unknown OpenID field: #{key}"
-          end
+      def auth_fields=(info)
+        Rails.logger.info "FIELDS: #{info.inspect}"
+        info.each_pair do |k, v|
+          self[k] = v
         end
       end
+    end
 
-      def password_required?
-        return false if self[:identity_url].present? || self[:facebook_id].present? || self[:github_id].present?
-
-        (encrypted_password.blank? || !password.blank?)
-      end
-     end
-
-  2. to include the javascripts do
-       <%= multiauth_assets %>
-
-     to render the multiauth box do
-       <%= multiauth_box %>
+2. configure the service keys at config/auth_providers.yml
 
-  3. configure your twitter, facebook and github keys
 
-You can config providers in an initializer, for example:
+Default routes:
+  /sessions/sign_in
+  /sessions/sign_out
 
-  Multiauth::PROVIDERS.delete("Vidoop")
-  Multiauth::PROVIDERS.delete("Github")
-  Multiauth::PROVIDERS["Google"][:class] = "selected"
+you can override them using the following routes:
+  match "/login" => "multiauth/sessions#new", :as => :new_session
+  match "/logout" => "multiauth/sessions#destroy", :method => :get, :as => :destroy_session
 
 
 ===============================================================================

data/lib/generators/templates/auth_providers.yml

@@ -0,0 +1,47 @@
+base: &common
+  Twitter:
+    id: <TWITTER ID>
+    token: <TWITTER TOKEN>
+  Facebook:
+    id: <FACEBOOK ID>
+    token: <FACEBOOK TOKEN>
+  Github:
+    id: <GITHUB ID>
+    token: <GITHUB TOKEN>
+  Google:
+    openid: https://www.google.com/accounts/o8/id
+  Yahoo:
+    openid: http://yahoo.com
+  AOL:
+    openid: http://openid.aol.com/{user_name}
+  MySpace:
+    openid: http://www.myspace.com/{user_name}
+  MyOpenID:
+    openid: http://{user_name}.myopenid.com/
+  Wordpress:
+    openid: http://{user_name}.wordpress.com/
+  Blogger:
+    openid: http://{user_name}.blogspot.com/
+  Flickr:
+    openid: http://flickr.com/{user_name}/
+  Launchpad:
+    openid: https://launchpad.net/~{user_name}
+  Vidoop:
+    openid: http://{user_name}.myvidoop.com/
+  ClaimID:
+    openid: http://claimid.com/{user_name}
+  Technorati:
+    openid: http://technorati.com/people/technorati/{user_name}/
+  Verisign:
+    openid: http://{user_name}.pip.verisignlabs.com/
+  LiveJournal:
+    openid: http://{user_name}.livejournal.com
+  OpenId:
+    openid: {user_name}
+
+development:
+  <<: *common
+production:
+  <<: *common
+test:
+  <<: *common

data/lib/multiauth/helpers.rb

@@ -0,0 +1,22 @@
+module Multiauth
+  module Helpers
+    def self.included(base)
+      base.class_eval do
+        helper_method :current_user, :logged_in?
+      end
+    end
+
+    def current_user=(new_user)
+      session[:user] = (new_user.nil? || new_user.is_a?(Symbol)) ? nil : new_user.id
+      @current_user = new_user
+    end
+
+    def current_user
+      @current_user ||= User.first(:_id => session[:user]) if session[:user]
+    end
+
+    def logged_in?
+      !!self.current_user
+    end
+  end
+end

data/lib/multiauth/rails.rb

@@ -1 +1,37 @@
-ActionController::Base.append_view_path File.expand_path("../../../app/views", __FILE__)
+::ActionView::Base.send :include, Multiauth::ViewsHelper
+
+module Multiauth
+  class Engine < ::Rails::Engine
+    paths.app.controllers = File.expand_path("../../../app/controllers", __FILE__)
+    paths.app.views       = File.expand_path("../../../app/views", __FILE__)
+    paths.config.routes   = File.expand_path("../routes.rb", __FILE__)
+
+    initializer "multiauth" do |app|
+      config_file = Rails.root+"config/auth_providers.yml"
+      providers = YAML::load(ERB.new(File.read(config_file)).result)
+      if providers[Rails.env].nil?
+        raise ArgumentError, "cannot find section for #{Rails.env} environment in #{config_file}"
+      end
+
+      Multiauth.providers = providers[Rails.env]
+
+      require 'omniauth/openid'
+      require 'openid/store/filesystem'
+
+      app.config.middleware.use OmniAuth::Strategies::OpenID, OpenID::Store::Filesystem.new('/tmp') # FIXME: mm store
+
+      app.config.middleware.use OmniAuth::Builder do
+        Multiauth.providers.each do |provider, config|
+          next if config["token"].blank?
+
+          puts ">> Setting up #{provider} provider"
+          provider provider.downcase.to_sym, config["id"], config["token"]
+        end
+      end
+    end
+
+    config.to_prepare do
+      ApplicationController.send(:include, Multiauth::Helpers)
+    end
+  end
+end

data/lib/multiauth/routes.rb

@@ -0,0 +1,6 @@
+Rails::Application.routes.draw do
+  match '/sessions/sign_in' => "multiauth/sessions#new", :as => :new_session
+  match '/sessions/sign_out' => "multiauth/sessions#destroy", :method => :get, :as => :destroy_session
+
+  match "/auth/:provider/callback" => "multiauth/sessions#auth"
+end

data/lib/multiauth/views_helper.rb

@@ -10,9 +10,8 @@ module Multiauth
     end
 
     def multiauth_providers
-      Multiauth::PROVIDERS
+      Multiauth.providers || []
     end
   end
 end
 
-::ActionView::Base.send :include, Multiauth::ViewsHelper

data/lib/multiauth.rb

@@ -1,64 +1,14 @@
-require 'multiauth/rails'
 require 'multiauth/views_helper'
+require 'multiauth/helpers'
+require 'multiauth/rails'
+
 
 module Multiauth
-  PROVIDERS = {
-    'Google' => {
-      :url => '/auth/open_id?openid_url=https://www.google.com/accounts/o8/id'
-    },
-    'Twitter' => {
-      :url => '/auth/twitter',
-      :real => true
-    },
-    'Facebook' => {
-      :url => '/auth/facebook',
-      :real => true
-    },
-    'Yahoo' => {
-      :url => '/auth/open_id?openid_url=http://yahoo.com/'
-    },
-    'AOL' => {
-      :url => '/auth/open_id?openid_url=http://openid.aol.com/{user_name}'
-    },
-    'MySpace' => {
-      :url => '/auth/open_id?openid_url=http://www.myspace.com/{user_name}'
-    },
-    'Github' => {
-      :url => '/auth/github',
-      :real => true
-    },
-    'MyOpenID' => {
-      :url => '/auth/open_id?openid_url=http://{user_name}.myopenid.com/'
-    },
-    'Wordpress' => {
-      :url => '/auth/open_id?openid_url=http://{user_name}.wordpress.com/'
-    },
-    'Blogger' => {
-      :url => '/auth/open_id?openid_url=http://{user_name}.blogspot.com/'
-    },
-    'Flickr' => {
-      :url => '/auth/open_id?openid_url=http://flickr.com/{user_name}/'
-    },
-    'Launchpad' => {
-      :url => '/auth/open_id?openid_url=https://launchpad.net/~{user_name}'
-    },
-    'Vidoop' => {
-      :url => '/auth/open_id?openid_url=http://{user_name}.myvidoop.com/'
-    },
-    'ClaimID' => {
-      :url => '/auth/open_id?openid_url=http://claimid.com/{user_name}'
-    },
-    'Technorati' => {
-      :url => '/auth/open_id?openid_url=http://technorati.com/people/technorati/{user_name}/'
-    },
-    'Verisign' => {
-      :url => '/auth/open_id?openid_url=http://{user_name}.pip.verisignlabs.com/'
-    },
-    'LiveJournal' => {
-      :url => '/auth/open_id?openid_url=http://{user_name}.livejournal.com'
-    },
-    'OpenID' => {
-      :url => '/auth/open_id'
-    }
-  }
+  def self.providers=(providers)
+    @providers = providers
+  end
+
+  def self.providers
+    @providers
+  end
 end

data/multiauth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{multiauth}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David A. Cuadrado"]
-  s.date = %q{2010-10-05}
+  s.date = %q{2010-10-06}
   s.description = %q{multi authentication gem using devise & co}
   s.email = %q{krawek@gmail.com}
   s.extra_rdoc_files = [
@@ -25,9 +25,12 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "app/controllers/multiauth/sessions_controller.rb",
      "app/views/multiauth/_box.html.erb",
+     "app/views/multiauth/sessions/new.html.haml",
      "lib/generators/multiauth/multiauth_generator.rb",
      "lib/generators/templates/README",
+     "lib/generators/templates/auth_providers.yml",
      "lib/generators/templates/devise_twitter.rb",
      "lib/generators/templates/images/arrow.gif",
      "lib/generators/templates/images/balloon.png",
@@ -36,7 +39,9 @@ Gem::Specification.new do |s|
      "lib/generators/templates/multiauth.css",
      "lib/generators/templates/multiauth.js",
      "lib/multiauth.rb",
+     "lib/multiauth/helpers.rb",
      "lib/multiauth/rails.rb",
+     "lib/multiauth/routes.rb",
      "lib/multiauth/views_helper.rb",
      "multiauth.gemspec",
      "spec/multiauth_spec.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - David A. Cuadrado
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -05:00
+date: 2010-10-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,9 +80,12 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- app/controllers/multiauth/sessions_controller.rb
 - app/views/multiauth/_box.html.erb
+- app/views/multiauth/sessions/new.html.haml
 - lib/generators/multiauth/multiauth_generator.rb
 - lib/generators/templates/README
+- lib/generators/templates/auth_providers.yml
 - lib/generators/templates/devise_twitter.rb
 - lib/generators/templates/images/arrow.gif
 - lib/generators/templates/images/balloon.png
@@ -91,7 +94,9 @@ files:
 - lib/generators/templates/multiauth.css
 - lib/generators/templates/multiauth.js
 - lib/multiauth.rb
+- lib/multiauth/helpers.rb
 - lib/multiauth/rails.rb
+- lib/multiauth/routes.rb
 - lib/multiauth/views_helper.rb
 - multiauth.gemspec
 - spec/multiauth_spec.rb