app/controllers/oauth_controller.rb app/models/oauth_request.rb app/views/oauth/request_token.html.erb db/migrate/20090513063838_create_oauth_requests.rb demo/twitter.pem @@ -1,5 +1,5 @@ class AccountController < ApplicationController - before_filter :authenticate, :except=>[:front, :login, :end_session] + before_filter :authenticateUser, :except=>[:front, :login, :end_session] def index @tweets = @user.public_tweets.find(:all, :include => :user, :limit => 20 ) app/controllers/account_controller.rb @@ -21,7 +21,8 @@ class ApplicationController < ActionController::Base return true end - def authenticate + def authenticateUser + login_via_oauth() x = login_required @user = current_user x @@ -29,6 +30,20 @@ class ApplicationController < ActionController::Base private + def login_via_oauth + auth = request.headers['Authorization'] + if (auth) + if (auth=~/^OAuth.*oauth_token="(\d+)-(.*?)"/) + user_id = $1; + crypted_password = $2; + user = User.find_by_id(user_id) + if (user && user.crypted_password == crypted_password) + @current_user = user + end + end + end + end + def render_tweets(root="statuses") respond_to do |format| format.html { } app/controllers/application.rb @@ -1,5 +1,5 @@ class DirectMessagesController < ApplicationController - before_filter :authenticate + before_filter :authenticateUser def index @tweets = @user.direct_messages_received.find(:all, :include => :user,:limit => 25) app/controllers/direct_messages_controller.rb @@ -1,5 +1,5 @@ class FavoritesController < ApplicationController - before_filter :authenticate + before_filter :authenticateUser def index @tweets = @user.favorite_tweets app/controllers/favorites_controller.rb @@ -1,5 +1,5 @@ class FriendshipsController < ApplicationController - before_filter :authenticate + before_filter :authenticateUser def exists respond_to do |format| app/controllers/friendships_controller.rb @@ -1,5 +1,5 @@ class HelpController < ApplicationController - before_filter :authenticate + before_filter :authenticateUser def test respond_to do |format| app/controllers/help_controller.rb @@ -1,5 +1,5 @@ class StatusesController < ApplicationController - before_filter :authenticate, :except => [:show] + before_filter :authenticateUser, :except => [:show] def replies @tweets = @user.replies.find(:all, :include => :user,:limit => 25) app/controllers/statuses_controller.rb @@ -1,5 +1,5 @@ class UserController < ApplicationController - before_filter :authenticate, :lookup_duser + before_filter :authenticateUser, :lookup_duser def index @tweets = @duser.public_tweets.find(:all,:include => :user,:limit => 20 ) app/controllers/user_controller.rb @@ -37,11 +37,11 @@ class User < ActiveRecord::Base # This will also let us return a human error message. # def self.authenticate(login, password) + puts "authenticate(#{login},#{password})" u = fetch(login) if (!u.crypted_password) u.password = password - u.save! - return u + return u.save ? u : nil end u.authenticated?(password) ? u : nil end app/models/user.rb @@ -9,13 +9,20 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20090226213219) do +ActiveRecord::Schema.define(:version => 20090513063838) do create_table "favorites", :id => false, :force => true do |t| t.integer "user_id", :null => false t.integer "tweet_id", :null => false end + create_table "oauth_requests", :force => true do |t| + t.integer "user_id" + t.string "request_token" + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "tweets", :force => true do |t| t.string "tweet" t.string "source" db/schema.rb @@ -40,7 +40,7 @@ server.pid-file = "/var/run/lighttpd.pid" $SERVER["socket"] == ":443" { ssl.engine = "enable" - ssl.pemfile = "demo/localhost.pem" # replace with your actual filename + ssl.pemfile = "demo/twitter.pem" # replace with your actual filename # ssl.ca-file = "/etc/lighttpd/sf_intermediate_bundle.crt" # some cert providers require you add an intermediate cert. } demo/lighttpd.conf 590a3a297e1d79c195f6803f647fa791e6188f4b Rob Nielsen rob@refactor.com.au http://github.com/rnielsen/twetter/commit/cb62f8b23bc977d0e732d95a2656fefa32a06cf7 cb62f8b23bc977d0e732d95a2656fefa32a06cf7 2009-05-13T14:54:04-07:00 2009-05-13T14:54:04-07:00 added basic oauth support 0704476780ee3e863ed41284a9ae8f770ac38683 Rob Nielsen rob@refactor.com.au