db/migrate/20090824025721_adjust_user_for_twitter_sign_in.rb lib/twitter/authentication_helpers.rb public/images/twitter_sign_in.png @@ -2,12 +2,12 @@ # Likewise, all the methods added will be available for all controllers. class ApplicationController < ActionController::Base - layout :determine_layout + include Twitter::AuthenticationHelpers - include Clearance::App::Controllers::ApplicationController + layout :determine_layout helper :all - protect_from_forgery + protect_from_forgery filter_parameter_logging :password, :password_confirmation rescue_from Twitter::Unauthorized, :with => :initiate_oauth_request app/controllers/application_controller.rb @@ -1,3 +1,40 @@ class SessionsController < ApplicationController - include Clearance::App::Controllers::SessionsController + def new + end + + def create + oauth = Twitter::OAuth.new(ConsumerConfig['token'], ConsumerConfig['secret'], :sign_in => true) + oauth.set_callback_url(finalize_session_url) + + session['rtoken'] = oauth.request_token.token + session['rsecret'] = oauth.request_token.secret + + redirect_to oauth.request_token.authorize_url + end + + def destroy + reset_session + redirect_to new_session_path + end + + def finalize + oauth = Twitter::OAuth.new(ConsumerConfig['token'], ConsumerConfig['secret'], :sign_in => true) + oauth.authorize_from_request(session['rtoken'], session['rsecret'], params[:oauth_verifier]) + + session['rtoken'] = nil + session['rsecret'] = nil + + tweep = Twitter::Base.new(oauth).verify_credentials + logger.info "\n\n" + tweep.inspect + "\n\n" + + user = User.find_or_create_by_screen_name(tweep.screen_name) + + user.update_attributes({ + :atoken => oauth.access_token.token, + :asecret => oauth.access_token.secret, + }) + + sign_in(user) + redirect_to root_path + end end app/controllers/sessions_controller.rb @@ -1,26 +1,19 @@ # == Schema Information -# Schema version: 20090404062822 # # Table name: users # -# id :integer(4) not null, primary key -# email :string(255) -# encrypted_password :string(128) -# salt :string(128) -# token :string(128) -# token_expires_at :datetime -# email_confirmed :boolean(1) not null -# atoken :string(255) -# asecret :string(255) +# id :integer(4) not null, primary key +# email :string(255) +# atoken :string(255) +# asecret :string(255) +# screen_name :string(30) # class User < ActiveRecord::Base - include Clearance::App::Models::User - attr_accessible :atoken, :asecret def authorized? - !atoken.blank? && !asecret.blank? + atoken.present? && asecret.present? end def oauth app/models/user.rb @@ -1,25 +1,8 @@ <div id="login"> - <h2>Sign in</h2> + <h2>Sign In With Twitter</h2> + <p>Since this is a twitter app, go ahead and sign in with twitter.</p> - <% form_for :session, :url => session_path do |form| %> - <ul> - <li> - <%= form.label :email %> - <%= form.text_field :email %> - </li> - <li> - <%= form.label :password %> - <%= form.password_field :password %> - <%= link_to "Forgot password?", new_password_path %> - </li> - <li class="checkbox"> - <%= form.check_box :remember_me %> - <%= form.label :remember_me %> - </li> - <li class="submit"> - <%= form.submit "Sign in", :disable_with => "Please wait..." %> or - <%= link_to "Sign up", new_user_path %> - </li> - </ul> - <% end %> + <%- form_tag session_path do -%> + <p><%= image_submit_tag 'twitter_sign_in.png' %></p> + <%- end -%> </div> \ No newline at end of file app/views/sessions/new.html.erb @@ -7,21 +7,8 @@ RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION require File.join(File.dirname(__FILE__), 'boot') Rails::Initializer.run do |config| - config.gem "thoughtbot-clearance", - :lib => 'clearance', - :source => 'http://gems.github.com', - :version => '0.5.3' - - config.gem 'mislav-will_paginate', - :lib => 'will_paginate', - :source => 'http://gems.github.com', - :version => '2.3.8' - - config.gem 'twitter', :version => '0.6.15' - + config.gem 'twitter', :version => '0.6.15' config.time_zone = 'UTC' end -DO_NOT_REPLY = "donotreply@example.com" - ConsumerConfig = YAML.load(File.read(Rails.root + 'config' + 'consumer.yml')) \ No newline at end of file config/environment.rb @@ -14,6 +14,4 @@ config.action_view.debug_rjs = true config.action_controller.perform_caching = false # Don't care if the mailer can't send -config.action_mailer.raise_delivery_errors = false - -HOST = 'twitterapp.local' \ No newline at end of file +config.action_mailer.raise_delivery_errors = false \ No newline at end of file config/environments/development.rb @@ -25,6 +25,4 @@ config.action_view.cache_template_loading = true # config.action_mailer.raise_delivery_errors = false # Enable threaded mode -# config.threadsafe! - -HOST = 'localhost' \ No newline at end of file +# config.threadsafe! \ No newline at end of file config/environments/production.rb @@ -35,6 +35,4 @@ config.gem 'thoughtbot-shoulda', config.gem 'thoughtbot-factory_girl', :lib => 'factory_girl', :source => "http://gems.github.com", - :version => '1.2.0' - -HOST = 'localhost' \ No newline at end of file + :version => '1.2.0' \ No newline at end of file config/environments/test.rb @@ -9,5 +9,6 @@ ActionController::Routing::Routes.draw do |map| map.resources :friendships map.resource :session + map.finalize_session 'session/finalize', :controller => 'sessions', :action => 'finalize' map.resource :authorization end config/routes.rb @@ -1,3 +1,14 @@ +# == Schema Information +# +# Table name: users +# +# id :integer(4) not null, primary key +# email :string(255) +# atoken :string(255) +# asecret :string(255) +# screen_name :string(30) +# + require 'test_helper' class UserTest < ActiveSupport::TestCase test/unit/user_test.rb app/models/clearance_mailer.rb vendor/gems/thoughtbot-clearance-0.5.3/.specification vendor/gems/thoughtbot-clearance-0.5.3/CHANGELOG.textile vendor/gems/thoughtbot-clearance-0.5.3/KNOWN_ISSUES.textile vendor/gems/thoughtbot-clearance-0.5.3/LICENSE vendor/gems/thoughtbot-clearance-0.5.3/README.textile vendor/gems/thoughtbot-clearance-0.5.3/Rakefile vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/USAGE vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/clearance_generator.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/lib/insert_commands.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/lib/rake_commands.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/README vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/app/controllers/application.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/app/controllers/confirmations_controller.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/app/controllers/passwords_controller.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/app/controllers/sessions_controller.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/app/controllers/users_controller.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/app/models/clearance_mailer.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/app/models/user.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/app/views/clearance_mailer/change_password.html.erb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/app/views/clearance_mailer/confirmation.html.erb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/app/views/passwords/edit.html.erb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/app/views/passwords/new.html.erb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/app/views/sessions/new.html.erb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/app/views/users/_form.html.erb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/app/views/users/edit.html.erb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/app/views/users/new.html.erb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/db/migrate/create_users_with_clearance_columns.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/db/migrate/update_users_with_clearance_columns.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/test/factories/clearance.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/test/functional/confirmations_controller_test.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/test/functional/passwords_controller_test.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/test/functional/sessions_controller_test.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/test/functional/users_controller_test.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/test/unit/clearance_mailer_test.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance/templates/test/unit/user_test.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance_features/USAGE vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance_features/clearance_features_generator.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance_features/templates/features/password_reset.feature vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance_features/templates/features/sign_in.feature vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance_features/templates/features/sign_out.feature vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance_features/templates/features/sign_up.feature vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance_features/templates/features/step_definitions/clearance_steps.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance_features/templates/features/step_definitions/factory_girl_steps.rb vendor/gems/thoughtbot-clearance-0.5.3/generators/clearance_features/templates/features/support/paths.rb vendor/gems/thoughtbot-clearance-0.5.3/lib/clearance.rb vendor/gems/thoughtbot-clearance-0.5.3/lib/clearance/app/controllers/application_controller.rb vendor/gems/thoughtbot-clearance-0.5.3/lib/clearance/app/controllers/confirmations_controller.rb vendor/gems/thoughtbot-clearance-0.5.3/lib/clearance/app/controllers/passwords_controller.rb vendor/gems/thoughtbot-clearance-0.5.3/lib/clearance/app/controllers/sessions_controller.rb vendor/gems/thoughtbot-clearance-0.5.3/lib/clearance/app/controllers/users_controller.rb vendor/gems/thoughtbot-clearance-0.5.3/lib/clearance/app/models/clearance_mailer.rb vendor/gems/thoughtbot-clearance-0.5.3/lib/clearance/app/models/user.rb vendor/gems/thoughtbot-clearance-0.5.3/lib/clearance/lib/extensions/errors.rb vendor/gems/thoughtbot-clearance-0.5.3/lib/clearance/lib/extensions/rescue.rb vendor/gems/thoughtbot-clearance-0.5.3/lib/clearance/test/functional/confirmations_controller_test.rb vendor/gems/thoughtbot-clearance-0.5.3/lib/clearance/test/functional/passwords_controller_test.rb vendor/gems/thoughtbot-clearance-0.5.3/lib/clearance/test/functional/sessions_controller_test.rb vendor/gems/thoughtbot-clearance-0.5.3/lib/clearance/test/functional/users_controller_test.rb vendor/gems/thoughtbot-clearance-0.5.3/lib/clearance/test/unit/clearance_mailer_test.rb vendor/gems/thoughtbot-clearance-0.5.3/lib/clearance/test/unit/user_test.rb vendor/gems/thoughtbot-clearance-0.5.3/rails/init.rb vendor/gems/thoughtbot-clearance-0.5.3/shoulda_macros/clearance.rb 46fc084ef9854fd10058bdbac35d267c7d6b2c97 John Nunemaker nunemaker@gmail.com http://github.com/jnunemaker/twitter-app/commit/64db3c90704fd88021749e79740010f46524b380 64db3c90704fd88021749e79740010f46524b380 2009-08-23T20:37:03-07:00 2009-08-23T20:37:03-07:00 Switched from clearance to sign in with twitter. acf79ad55adb0fc5376c051cfa8f614c03c2adce John Nunemaker nunemaker@gmail.com