ae_users_legacy 0.6.11 → 0.6.12

data/README

@@ -23,9 +23,6 @@ update accounts, people set accounts.person_id=people.id
   where accounts.id = people.account_id;
 alter table people drop column account_id;
 
-create table open_id_identities (id int not null auto_increment primary key, 
-                                 person_id int, identity_url varchar(4000));
-
 You'll also want to run this command in each of your application databases:
 
 create table auth_tickets (id int not null auto_increment primary key, 

data/ae_users_legacy.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
-  gem.version       = "0.6.11"
+  gem.version       = "0.6.12"
 
   gem.authors       = ["Nat Budin"]
   gem.email         = ["natbudin@gmail.com"]
@@ -15,5 +15,4 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   
   gem.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-  gem.add_runtime_dependency(%q<ruby-openid>, [">= 2.0.4"])
 end

data/app/controllers/account_controller.rb

@@ -1,6 +1,6 @@
 class AccountController < ApplicationController
   unloadable
-  require_login :only => [:edit_profile, :edit_email_addresses, :change_password, :add_openid, :delete_openid]
+  require_login :only => [:edit_profile, :edit_email_addresses, :change_password]
   before_filter :check_signup_allowed, :only => [:signup, :signup_success]
   
   filter_parameter_logging :password
@@ -107,48 +107,6 @@ class AccountController < ApplicationController
   def signup_success
   end
   
-  def add_openid
-    if using_open_id?
-      authenticate_with_open_id(params[:openid_url]) do |result, identity_url|
-        if result.successful?
-          id = OpenIdIdentity.find_by_identity_url(identity_url)
-          if id.nil?
-            id = OpenIdIdentity.new :person => logged_in_person, :identity_url => identity_url
-          else
-            if id.person.nil?
-              id.person = logged_in_person
-            elsif id.person != logged_in_person
-              flash[:error_messages] = ["That OpenID belongs to a different person (#{id.person.name})."]
-              return
-            end
-          end
-          if not id.save
-            flash[:error_messages] = id.errors.collect { |e| e[0].humanize + " " + e[1] }
-          end
-        else
-          flash[:error_messages] = [result.message]
-        end
-        redirect_to :action => 'edit_profile'
-      end
-    else
-      flash[:error_messages] = ["Please enter an OpenID url."]
-    end
-  end
-  
-  def delete_openid
-    id = OpenIdIdentity.find(params[:id])
-    if id.person == logged_in_person
-      if logged_in_person.account or logged_in_person.open_id_identities.length > 1
-        id.destroy
-      else
-        flash[:error_messages] = ["Deleting that OpenID would leave you no way of logging in!"]
-      end
-    else
-      flash[:error_messages] = ["That OpenID does not belong to you!"]
-    end
-    redirect_to :action => 'edit_profile'
-  end
-  
   def signup
     ret = create_account_and_person()
     if ret == :success

data/app/controllers/auth_controller.rb

@@ -1,7 +1,7 @@
 class AuthController < ApplicationController
   unloadable
   filter_parameter_logging :password
-  before_filter :construct_login, :only => [:login, :openid_login, :forgot_form]
+  before_filter :construct_login, :only => [:login, :forgot_form]
   
   def index
     respond_to do |format|
@@ -9,15 +9,6 @@ class AuthController < ApplicationController
     end
   end
   
-  def openid_login
-    params[:openid_url] ||= cookies['openid_url']    
-    if using_open_id?
-      if attempt_open_id_login(@login.return_to)
-        successful_login_redirect
-      end
-    end
-  end
-  
   def login
     if request.post?
       unless @login.password or @login.have_password
@@ -31,75 +22,6 @@ class AuthController < ApplicationController
       end
     end
   end
-  
-  def needs_person
-    @open_id_identity = OpenIdIdentity.find_or_create_by_identity_url(session[:identity_url])
-    @person = Person.new
-    if not AeUsers.profile_class.nil?
-      @app_profile = AeUsers.profile_class.send(:new, :person => @person)
-    end
-    
-    if params[:registration]
-      person_map = HashWithIndifferentAccess.new(Person.sreg_map)
-      profile_map = if AeUsers.profile_class and AeUsers.profile_class.respond_to?("sreg_map")
-        HashWithIndifferentAccess.new(AeUsers.profile_class.sreg_map)
-      else
-        nil
-      end
-        
-      params[:registration].each_pair do |key, value|
-        if key == 'email'
-          params[:email] = value
-        elsif person_map.has_key?(key.to_s)
-          mapper = person_map[key]
-          attrs = mapper.call(value)
-          @person.attributes = attrs
-        elsif (profile_map and profile_map.has_key?(key))
-          mapper = profile_map[key]
-          @app_profile.attributes = mapper.call(value)
-        end
-      end
-    end
-    if params[:person]
-      @person.attributes = params[:person]
-    end
-    if params[:app_profile] and @app_profile
-      @app_profile.attributes = params[:app_profile]
-    end
-    
-    if request.post?
-      error_messages = []
-      error_fields = []
-      
-      ["firstname", "lastname", "gender"].each do |field|
-        if not @person.send(field)
-          error_fields.push field
-          error_messages.push "You must enter a value for #{field}."
-        end
-      end
-      
-      if not params[:email]
-        error_fields.push("email")
-        error_messages.push "You must enter a value for email."
-      end
-      
-      if error_messages.length > 0
-        flash[:error_fields] = error_fields
-        flash[:error_messages] = error_messages
-      else
-        @person.save
-        @person.primary_email_address = params[:email]
-        @open_id_identity.person = @person
-        @open_id_identity.save
-        if @app_profile
-          @app_profile.save
-        end
-        
-        session[:person] = @person
-        redirect_to session[:return_to]
-      end
-    end
-  end
 
   def auth_form  
     respond_to do |format|

data/app/models/person.rb

@@ -1,7 +1,6 @@
 class Person < ActiveRecord::Base
   establish_connection :users
   has_one :account
-  has_many :open_id_identities
   has_and_belongs_to_many :roles
   has_many :permissions, :dependent => :destroy, :include => :permissioned
   has_many :email_addresses, :dependent => :destroy

data/app/views/account/edit_profile.rhtml

@@ -34,31 +34,6 @@ form {
   <% end %>
 <% end -%>
 
-<h2>OpenID Identities</h2>
-
-<p>OpenID is a free and easy way to use a single digital identity across the Internet.  For more information,
-<%= link_to "visit the OpenID web site", "http://www.openid.net" %>.</p>
-
-<table>
-  <% @person.open_id_identities.each do |id| -%>
-    <tr>
-      <td></td>
-      <td>
-        <%= image_tag "ae_users/openid.gif" %>
-        <i><%=h id.identity_url %></i>
-      </td>
-      <td><%= button_to "Delete", {:action => "delete_openid", :id => id.id}, {:confirm => "Are you sure you wish to remove this OpenID?"} %></td>
-    </tr>
-  <% end -%>
-  <tr>
-    <% form_for("add_openid", nil, :url => {:action => "add_openid"}) do |f| -%>
-      <td>Add new OpenID:</td>
-      <td><%= text_field_tag "openid_url", @openid_url, :style => "background: #FFFFFF url('#{image_path "ae_users/openid.gif"}') no-repeat scroll 0pt 50%; padding-left: 18px; width: 60%;" %></td>
-      <td><%= submit_tag "Add" %></td>
-    <% end -%>
-  </tr>
-</table>
-
 <% form_for("email_addresses", nil, :url => {:action => 'edit_email_addresses'}, 
 	:html => {:id => 'edit_email_addresses_form'}) do |f| %>
     
@@ -114,4 +89,4 @@ form {
   <% else -%>
       <%= submit_tag "Edit profile" %>
   <% end -%>
-<% end %>
+<% end %>

data/app/views/auth/_auth_form.rhtml

@@ -4,7 +4,7 @@
         :html => {:class => 'auth_form'} ) do |f| -%>
     <% if not logged_in? %>
       <script type="text/javascript" src="<%=url_for :controller => 'auth', :action => "auth_form", 
-        :format => "js", :openid_url => params[:openid_url] %>"></script>
+        :format => "js" %>"></script>
       
       <%= f.hidden_field "return_to" %>
 	  
@@ -51,4 +51,4 @@
         </p>
       </div>
     <% end %>
-<% end -%>
+<% end -%>

data/app/views/auth/_other_login_options.html.erb

@@ -5,20 +5,5 @@
       <%= link_to "I forgot my password", :controller => "auth", :action => "forgot_form" %>
     </li>
   <% end -%>
-  <% if params[:action] == "openid_login" -%>
-  	<li>
-  		<%= link_to "What's OpenID?", "http://www.openid.net", :target => "_blank" %>
-	</li>
-  <% end -%>
-  <% unless params[:action] == "openid_login" -%>
-  <li>
-    <%= link_to "Log in with OpenID", :controller => "auth", :action => "openid_login", :return_to => @login.return_to %>
-  </li>
-  <% end -%>
-  <% unless params[:action] == "login" -%>
-  <li>
-    <%= link_to "Log in with a password", :controller => "auth", :action => "login", :return_to => @login.return_to %>
-  </li>
-  <% end -%>
 </ul>
-<% end -%>
+<% end -%>

data/app/views/auth/index.css.erb

@@ -12,12 +12,4 @@
   margin-left: -0.5em;
   font-weight: bold;
   display: block;
-}
-#openid_url {
-	background-color: #fff;
-	background-image: url(<%= image_path "ae_users/openid.gif" %>);
-	background-position: left;
-	background-repeat: no-repeat;
-	padding-left: 18px;
-	width: 90%;
 }

data/generators/ae_users/USAGE

@@ -9,6 +9,5 @@ Example:
       public/images/ae_users/admin.png
       public/images/ae_users/group.png
       public/images/ae_users/logout.png
-      public/images/ae_users/openid.gif
       public/images/ae_users/remove.png
       public/images/ae_users/user.png

data/generators/ae_users/ae_users_generator.rb

@@ -5,7 +5,6 @@ class AeUsersGenerator < Rails::Generator::Base
       %w{add admin group logout remove user}.each do |img|
         m.file "#{img}.png", "public/images/ae_users/#{img}.png"
       end
-      m.file "openid.gif", "public/images/ae_users/openid.gif"
       m.migration_template 'migration.rb', "db/migrate", :migration_file_name => 'ae_users_local_tables'
     end
   end

data/lib/ae_users.rb

@@ -62,10 +62,6 @@ module AeUsers
     END_FUNC
   end
 
-  def self.map_openid(map)
-    map.open_id_complete 'auth', :controller => "auth", :action => "login", :requirements => { :method => :get }
-  end
-
   class PermissionCache
     def initialize
       @cache = {}
@@ -342,53 +338,6 @@ module AeUsers
         end
       end
       
-      def attempt_open_id_login(return_to)
-        if return_to
-          session[:return_to] = return_to
-        else
-          return_to = session[:return_to]
-        end
-        
-        openid_url = params[:openid_url]
-        params.delete(:openid_url)
-        
-        optional_fields = Person.sreg_map.keys
-        if AeUsers.profile_class and AeUsers.profile_class.respond_to?('sreg_map')
-          optional_fields += AeUsers.profile_class.sreg_map.keys
-        end
-        authenticate_with_open_id(openid_url, :optional => optional_fields) do |result, identity_url, registration|
-          if result.successful?
-            id = OpenIdIdentity.find_by_identity_url(identity_url)
-            if not id.nil?
-              @person = id.person
-            end
-            if id.nil? or @person.nil?
-              if AeUsers.signup_allowed?
-                session[:identity_url] = identity_url
-                redirect_to :controller => 'auth', :action => :needs_person, :return_to => return_to, :registration => registration.data
-                return false
-              else
-                flash[:error_messages] = ["Sorry, you are not registered with this site."]
-                return false
-              end
-            else
-              if (not AeUsers.profile_class.nil? and AeUsers.profile_class.find_by_person_id(@person.id).nil?)
-                session[:provisional_person] = @person.id
-                redirect_to :controller => 'auth', :action => :needs_profile, :return_to => return_to
-                return false
-              else
-                session[:person] = @person.id
-                return true
-              end
-            end
-          else
-            flash[:error_messages] = result.message
-            return false
-          end
-        end
-        return session[:person]
-      end
-      
       def attempt_ticket_login(secret)
         t = AuthTicket.find_ticket(secret)
         if t.nil?
@@ -406,8 +355,6 @@ module AeUsers
         if not params[:ae_email].blank? and not params[:ae_password].blank?
           login = Login.new(:email => params[:ae_email], :password => params[:ae_password], :return_to => return_to)
           attempt_login(login)
-        elsif not params[:openid_url].blank?
-          attempt_open_id_login(return_to)
         elsif not params[:ae_ticket].blank?
           attempt_ticket_login(params[:ae_ticket])
         end

data/schema.sql

@@ -19,13 +19,6 @@ CREATE TABLE `email_addresses` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=791 DEFAULT CHARSET=latin1;
 
-CREATE TABLE `open_id_identities` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `person_id` int(11) DEFAULT NULL,
-  `identity_url` varchar(4000) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=latin1;
-
 CREATE TABLE `people` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `firstname` varchar(255) DEFAULT NULL,

metadata

@@ -1,55 +1,44 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ae_users_legacy
-version: !ruby/object:Gem::Version
-  version: 0.6.11
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 12
+  version: 0.6.12
 platform: ruby
-authors:
+authors: 
 - Nat Budin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-10-15 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-openid
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.4
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
 description: Don't use this gem.  Use something written in the last couple years instead.
-email:
+email: 
 - natbudin@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE
@@ -68,7 +57,6 @@ files:
 - app/models/auth_ticket.rb
 - app/models/email_address.rb
 - app/models/login.rb
-- app/models/open_id_identity.rb
 - app/models/permission.rb
 - app/models/person.rb
 - app/models/role.rb
@@ -85,7 +73,6 @@ files:
 - app/views/auth/_auth_form.rhtml
 - app/views/auth/_forgot_form.html.erb
 - app/views/auth/_mini_auth_form.rhtml
-- app/views/auth/_openid_auth_form.html.erb
 - app/views/auth/_other_login_options.html.erb
 - app/views/auth/auth_form.js.erb
 - app/views/auth/forgot.rhtml
@@ -93,9 +80,7 @@ files:
 - app/views/auth/index.css.erb
 - app/views/auth/login.rhtml
 - app/views/auth/needs_activation.rhtml
-- app/views/auth/needs_person.html.erb
 - app/views/auth/needs_profile.rhtml
-- app/views/auth/openid_login.html.erb
 - app/views/auth/resend_activation.rhtml
 - app/views/auth_notifier/account_activation.rhtml
 - app/views/auth_notifier/generated_password.rhtml
@@ -134,29 +119,35 @@ files:
 - tasks/ae_users_tasks.rake
 - test/ae_users_test.rb
 - uninstall.rb
-homepage: ''
+has_rdoc: true
+homepage: ""
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: An obsolete authentication and authorization system which you shouldn't use.
-test_files:
+test_files: 
 - test/ae_users_test.rb

data/app/models/open_id_identity.rb

@@ -1,5 +0,0 @@
-class OpenIdIdentity < ActiveRecord::Base
-  establish_connection :users
-  belongs_to :person
-  validates_uniqueness_of :identity_url
-end

data/app/views/auth/_openid_auth_form.html.erb

@@ -1,14 +0,0 @@
-<%= auth_stylesheet %>
-
-<% form_for('login', @login, :url => {:action => 'openid_login', :controller => 'auth'},
-            :html => {:class => 'auth_form'} ) do |f| -%>
-			
-   <%= f.hidden_field "return_to" %>
-   
-   <label for="openid_url" class="block">OpenID</label>
-   <%= text_field_tag "openid_url" %>
-   
-   <p style="text-align: center;">
-     <%= submit_tag "Log in with OpenID", :style => "width: 50%; display: inline" %>
-   </p>
-<% end -%>

data/app/views/auth/needs_person.html.erb

@@ -1,32 +0,0 @@
-<h2>Welcome!</h2>
-
-<p>This is the first time you've visited this site.  We just need a few pieces of information
-from you before we can log you in.  We've attempted to get as much of it as possible from your
-OpenID provider, but some of it may be missing and/or incorrect.  Please check the following form
-before pressing "Save changes" below.</p>
-
-<%= auth_stylesheet %>
-
-<% form_for("person", @person, :url => {:action => 'needs_person'}, 
-	:html => {:id => 'edit_profile_form', :style => "max-width: 800px;"}) do |f| %>
-  <%= hidden_field_tag "return_to", params[:return_to] %>
-  <%= render :partial => 'account/personal_info', :locals => {:f => f} %>
-  
-  <p>
-  	<label for="email" class="block">Email:</label>
-  	<%= text_field_tag "email", params[:email] %>
-  </p>
-  
-  <% if @app_profile -%>
-  
-  <% form_for("app_profile", @app_profile) do |profile_form| %>
-          <%= render :partial => "account/#{@app_profile.class.name.tableize.singularize}", 
-				:locals => {:f => profile_form}%>
-          <label></label>
-          <%= submit_tag %>
-      <% end %>
-  <% else -%>
-      <label></label>
-      <%= submit_tag %>
-  <% end -%>
-<% end %>

data/app/views/auth/openid_login.html.erb

@@ -1,6 +0,0 @@
-<div id="openid_login">
-    <h2>Log in with OpenID</h2>
-    <%= render :partial => 'openid_auth_form' %>
-</div>
-
-<%= render :partial => "other_login_options" %>